Reorder 'Query.__init__' paramters to match Entity.

Author: tseaver

gcloud/datastore/__init__.py

@@ -9,7 +9,7 @@
 >>> # Then do other things...
 >>> from gcloud.datastore.entity import Entity
 >>> from gcloud.datastore.query import Query
->>> query = Query('EntityKind', dataset)
+>>> query = Query(dataset, 'EntityKind')
 >>> entity = Entity(dataset, 'EntityKind')
 
 The main concepts with this API are:
@@ -83,7 +83,7 @@ def get_dataset(dataset_id, client_email, private_key_path):
     >>> dataset = datastore.get_dataset('dataset-id', email, key_path)
     >>> # Now you can do things with the dataset.
     >>> from gcloud.datastore.query import Query
-    >>> query = Query('TestKind', dataset)
+    >>> query = Query(dataset, 'TestKind')
     >>> query.fetch()
     [...]
 

gcloud/datastore/connection.py

@@ -213,7 +213,7 @@ def run_query(self, dataset_id, query_pb, namespace=None):
         >>> from gcloud.datastore.query import Query
         >>> connection = datastore.get_connection(email, key_path)
         >>> dataset = connection.dataset('dataset-id')
-        >>> query = Query('MyKind', dataset).filter('property =', 'val')
+        >>> query = Query(dataset, 'MyKind').filter('property =', 'val')
 
         Using the `fetch`` method...
 

gcloud/datastore/demo/demo.py

@@ -29,7 +29,7 @@
 
 # Now let's try a more advanced query.
 # We'll start by look at all Thing entities:
-query = Query('Thing', dataset)
+query = Query(dataset, 'Thing')
 
 # Let's look at the first two.
 print query.limit(2).fetch()

gcloud/datastore/query.py

@@ -42,7 +42,7 @@ class Query(object):
     }
     """Mapping of operator strings and their protobuf equivalents."""
 
-    def __init__(self, kind=None, dataset=None, namespace=None):
+    def __init__(self, dataset=None, kind=None, namespace=None):
         self._dataset = dataset
         self._namespace = namespace
         self._pb = datastore_pb.Query()

gcloud/datastore/test_connection.py

@@ -329,7 +329,7 @@ def test_run_query_wo_namespace_empty_result(self):
 
         DATASET_ID = 'DATASET'
         KIND = 'Nonesuch'
-        q_pb = Query(KIND, DATASET_ID).to_protobuf()
+        q_pb = Query(kind=KIND).to_protobuf()
         rsp_pb = datastore_pb.RunQueryResponse()
         conn = self._makeOne()
         URI = '/'.join([
@@ -368,7 +368,7 @@ def test_run_query_w_namespace_nonempty_result(self):
         DATASET_ID = 'DATASET'
         KIND = 'Kind'
         entity = datastore_pb.Entity()
-        q_pb = Query(KIND, DATASET_ID).to_protobuf()
+        q_pb = Query(kind=KIND).to_protobuf()
         rsp_pb = datastore_pb.RunQueryResponse()
         rsp_pb.batch.entity_result.add(entity=entity)
         rsp_pb.batch.entity_result_type = 1  # FULL

gcloud/datastore/test_query.py

@@ -8,8 +8,8 @@ def _getTargetClass(self):
 
         return Query
 
-    def _makeOne(self, kind=None, dataset=None, namespace=None):
-        return self._getTargetClass()(kind, dataset, namespace)
+    def _makeOne(self, dataset=None, kind=None, namespace=None):
+        return self._getTargetClass()(dataset, kind, namespace)
 
     def test_ctor_defaults(self):
         query = self._getTargetClass()()
@@ -25,7 +25,7 @@ def test_ctor_explicit(self):
         _KIND = 'KIND'
         _NAMESPACE = 'NAMESPACE'
         dataset = Dataset(_DATASET)
-        query = self._makeOne(_KIND, dataset, _NAMESPACE)
+        query = self._makeOne(dataset, _KIND, _NAMESPACE)
         self.assertTrue(query.dataset() is dataset)
         kq_pb, = list(query.kind())
         self.assertEqual(kq_pb.name, _KIND)
@@ -39,7 +39,7 @@ def test__clone(self):
         _CURSOR = 'DEADBEEF'
         _NAMESPACE = 'NAMESPACE'
         dataset = Dataset(_DATASET)
-        query = self._makeOne(_KIND, dataset, _NAMESPACE)
+        query = self._makeOne(dataset, _KIND, _NAMESPACE)
         query._cursor = _CURSOR
         clone = query._clone()
         self.assertFalse(clone is query)
@@ -58,7 +58,7 @@ def test_to_protobuf_empty(self):
 
     def test_to_protobuf_w_kind(self):
         _KIND = 'KIND'
-        query = self._makeOne(_KIND)
+        query = self._makeOne(kind=_KIND)
         q_pb = query.to_protobuf()
         kq_pb, = list(q_pb.kind)
         self.assertEqual(kq_pb.name, _KIND)
@@ -189,7 +189,7 @@ def test_kind_setter_wo_existing(self):
         _DATASET = 'DATASET'
         _KIND = 'KIND'
         dataset = Dataset(_DATASET)
-        query = self._makeOne(dataset=dataset)
+        query = self._makeOne(dataset)
         after = query.kind(_KIND)
         self.assertFalse(after is query)
         self.assertTrue(isinstance(after, self._getTargetClass()))
@@ -203,7 +203,7 @@ def test_kind_setter_w_existing(self):
         _KIND_BEFORE = 'KIND_BEFORE'
         _KIND_AFTER = 'KIND_AFTER'
         dataset = Dataset(_DATASET)
-        query = self._makeOne(_KIND_BEFORE, dataset)
+        query = self._makeOne(dataset, _KIND_BEFORE)
         after = query.kind(_KIND_AFTER)
         self.assertFalse(after is query)
         self.assertTrue(isinstance(after, self._getTargetClass()))
@@ -218,7 +218,7 @@ def test_limit_setter_wo_existing(self):
         _KIND = 'KIND'
         _LIMIT = 42
         dataset = Dataset(_DATASET)
-        query = self._makeOne(_KIND, dataset)
+        query = self._makeOne(dataset, _KIND)
         after = query.limit(_LIMIT)
         self.assertFalse(after is query)
         self.assertTrue(isinstance(after, self._getTargetClass()))
@@ -232,7 +232,7 @@ def test_dataset_setter(self):
         _DATASET = 'DATASET'
         _KIND = 'KIND'
         dataset = Dataset(_DATASET)
-        query = self._makeOne(_KIND)
+        query = self._makeOne(kind=_KIND)
         after = query.dataset(dataset)
         self.assertFalse(after is query)
         self.assertTrue(isinstance(after, self._getTargetClass()))
@@ -254,7 +254,7 @@ def test_fetch_default_limit(self):
         prop.value.string_value = u'Foo'
         connection = _Connection(entity_pb)
         dataset = _Dataset(_DATASET, connection)
-        query = self._makeOne(_KIND, dataset)
+        query = self._makeOne(dataset, _KIND)
         entities = query.fetch()
         self.assertEqual(len(entities), 1)
         self.assertEqual(entities[0].key().path(),
@@ -283,7 +283,7 @@ def test_fetch_explicit_limit(self):
         connection = _Connection(entity_pb)
         connection._cursor = _CURSOR
         dataset = _Dataset(_DATASET, connection)
-        query = self._makeOne(_KIND, dataset, _NAMESPACE)
+        query = self._makeOne(dataset, _KIND, _NAMESPACE)
         limited = query.limit(13)
         entities = query.fetch(13)
         self.assertEqual(query._cursor, _CURSOR)
@@ -302,7 +302,7 @@ def test_cursor_not_fetched(self):
         _KIND = 'KIND'
         connection = _Connection()
         dataset = _Dataset(_DATASET, connection)
-        query = self._makeOne(_KIND, dataset)
+        query = self._makeOne(dataset, _KIND)
         self.assertRaises(RuntimeError, query.cursor)
 
     def test_cursor_fetched(self):
@@ -312,7 +312,7 @@ def test_cursor_fetched(self):
         _KIND = 'KIND'
         connection = _Connection()
         dataset = _Dataset(_DATASET, connection)
-        query = self._makeOne(_KIND, dataset)
+        query = self._makeOne(dataset, _KIND)
         query._cursor = _CURSOR
         self.assertEqual(query.cursor(), base64.b64encode(_CURSOR))
 
@@ -321,7 +321,7 @@ def test_with_cursor_neither(self):
         _KIND = 'KIND'
         connection = _Connection()
         dataset = _Dataset(_DATASET, connection)
-        query = self._makeOne(_KIND, dataset)
+        query = self._makeOne(dataset, _KIND)
         self.assertTrue(query.with_cursor(None) is query)
 
     def test_with_cursor_w_start(self):
@@ -332,7 +332,7 @@ def test_with_cursor_w_start(self):
         _KIND = 'KIND'
         connection = _Connection()
         dataset = _Dataset(_DATASET, connection)
-        query = self._makeOne(_KIND, dataset)
+        query = self._makeOne(dataset, _KIND)
         after = query.with_cursor(_CURSOR_B64)
         self.assertFalse(after is query)
         q_pb = after.to_protobuf()
@@ -347,7 +347,7 @@ def test_with_cursor_w_end(self):
         _KIND = 'KIND'
         connection = _Connection()
         dataset = _Dataset(_DATASET, connection)
-        query = self._makeOne(_KIND, dataset)
+        query = self._makeOne(dataset, _KIND)
         after = query.with_cursor(None, _CURSOR_B64)
         self.assertFalse(after is query)
         q_pb = after.to_protobuf()
@@ -364,7 +364,7 @@ def test_with_cursor_w_both(self):
         _KIND = 'KIND'
         connection = _Connection()
         dataset = _Dataset(_DATASET, connection)
-        query = self._makeOne(_KIND, dataset)
+        query = self._makeOne(dataset, _KIND)
         after = query.with_cursor(_START_B64, _END_B64)
         self.assertFalse(after is query)
         q_pb = after.to_protobuf()
@@ -373,15 +373,15 @@ def test_with_cursor_w_both(self):
 
     def test_order_empty(self):
         _KIND = 'KIND'
-        before = self._makeOne(_KIND)
+        before = self._makeOne(kind=_KIND)
         after = before.order()
         self.assertFalse(after is before)
         self.assertTrue(isinstance(after, self._getTargetClass()))
         self.assertEqual(before.to_protobuf(), after.to_protobuf())
 
     def test_order_single_asc(self):
         _KIND = 'KIND'
-        before = self._makeOne(_KIND)
+        before = self._makeOne(kind=_KIND)
         after = before.order('field')
         after_pb = after.to_protobuf()
         order_pb = list(after_pb.order)
@@ -392,7 +392,7 @@ def test_order_single_asc(self):
 
     def test_order_single_desc(self):
         _KIND = 'KIND'
-        before = self._makeOne(_KIND)
+        before = self._makeOne(kind=_KIND)
         after = before.order('-field')
         after_pb = after.to_protobuf()
         order_pb = list(after_pb.order)
@@ -403,7 +403,7 @@ def test_order_single_desc(self):
 
     def test_order_multiple(self):
         _KIND = 'KIND'
-        before = self._makeOne(_KIND)
+        before = self._makeOne(kind=_KIND)
         after = before.order('foo', '-bar')
         after_pb = after.to_protobuf()
         order_pb = list(after_pb.order)