diff --git a/gcloud/datastore/query.py b/gcloud/datastore/query.py index fd11b168602bb..081cb3eb077ef 100644 --- a/gcloud/datastore/query.py +++ b/gcloud/datastore/query.py @@ -332,7 +332,10 @@ def fetch(self, limit=None): end_cursor, more_results, skipped_results) = self.dataset().connection().run_query( - query_pb=clone.to_protobuf(), dataset_id=self.dataset().id()) + query_pb=clone.to_protobuf(), + dataset_id=self.dataset().id(), + namespace=self._namespace, + ) self._cursor = end_cursor return [Entity.from_protobuf(entity, dataset=self.dataset()) diff --git a/gcloud/datastore/test_query.py b/gcloud/datastore/test_query.py index d1c014a98f8ba..d7a6d1294b68a 100644 --- a/gcloud/datastore/test_query.py +++ b/gcloud/datastore/test_query.py @@ -263,6 +263,7 @@ def test_fetch_default_limit(self): self.assertEqual(connection._called_with, {'dataset_id': _DATASET, 'query_pb': query.to_protobuf(), + 'namespace': None, }) def test_fetch_explicit_limit(self): @@ -271,6 +272,7 @@ def test_fetch_explicit_limit(self): _DATASET = 'DATASET' _KIND = 'KIND' _ID = 123 + _NAMESPACE = 'NAMESPACE' entity_pb = Entity() path_element = entity_pb.key.path_element.add() path_element.kind = _KIND @@ -281,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) + query = self._makeOne(_KIND, dataset, _NAMESPACE) limited = query.limit(13) entities = query.fetch(13) self.assertEqual(query._cursor, _CURSOR) @@ -291,6 +293,7 @@ def test_fetch_explicit_limit(self): self.assertEqual(connection._called_with, {'dataset_id': _DATASET, 'query_pb': limited.to_protobuf(), + 'namespace': _NAMESPACE, }) def test_cursor_not_fetched(self):