Merge branch 'master' into 168_169-connection_delete_entities

tseaver · tseaver · commit 63b08a512e78 · 2014-10-17T16:12:48.000-04:00
diff --git a/gcloud/datastore/connection.py b/gcloud/datastore/connection.py
@@ -338,6 +338,11 @@ def commit(self, dataset_id, mutation_pb):
     def save_entity(self, dataset_id, key_pb, properties):
         """Save an entity to the Cloud Datastore with the provided properties.
 
+        .. note::
+           Any existing properties for the entity identified by 'key_pb'
+           will be replaced by those passed in 'properties';  properties
+           not passed in 'properties' no longer be set for the entity.
+
         :type dataset_id: string
         :param dataset_id: The dataset in which to save the entity.
 
diff --git a/gcloud/datastore/entity.py b/gcloud/datastore/entity.py
@@ -168,7 +168,7 @@ def from_protobuf(cls, pb, dataset=None):  # pylint: disable=invalid-name
 
     @property
     def _must_key(self):
-        """Return our key.
+        """Return our key, or raise NoKey if not set.
 
         :rtype: :class:`gcloud.datastore.key.Key`.
         :returns: our key
@@ -200,6 +200,12 @@ def reload(self):
     def save(self):
         """Save the entity in the Cloud Datastore.
 
+        .. note::
+           Any existing properties for the entity will be replaced by those
+           currently set on this instance.  Already-stored properties which do
+           not correspond to keys set on this instance will be removed from
+           the datastore.
+
         :rtype: :class:`gcloud.datastore.entity.Entity`
         :returns: The entity with a possibly updated Key.
         """
diff --git a/gcloud/datastore/query.py b/gcloud/datastore/query.py
@@ -1,7 +1,6 @@
 """Create / interact with gcloud datastore queries."""
 
 import base64
-import copy
 
 from gcloud.datastore import datastore_v1_pb2 as datastore_pb
 from gcloud.datastore import _helpers
@@ -67,8 +66,9 @@ def _clone(self):
         :rtype: :class:`gcloud.datastore.query.Query`
         :returns: a copy of 'self'.
         """
-        clone = copy.deepcopy(self)
-        clone._dataset = self._dataset  # Shallow copy the dataset.
+        clone = self.__class__(dataset=self._dataset)
+        clone._pb.CopyFrom(self._pb)
+        clone._cursor = self._cursor
         return clone
 
     def to_protobuf(self):
diff --git a/gcloud/datastore/test_query.py b/gcloud/datastore/test_query.py
@@ -33,14 +33,17 @@ def test__clone(self):
 
         _DATASET = 'DATASET'
         _KIND = 'KIND'
+        _CURSOR = 'DEADBEEF'
         dataset = Dataset(_DATASET)
         query = self._makeOne(_KIND, dataset)
+        query._cursor = _CURSOR
         clone = query._clone()
         self.assertFalse(clone is query)
         self.assertTrue(isinstance(clone, self._getTargetClass()))
         self.assertTrue(clone.dataset() is dataset)
         kq_pb, = list(clone.kind())
         self.assertEqual(kq_pb.name, _KIND)
+        self.assertEqual(clone._cursor, _CURSOR)
 
     def test_to_protobuf_empty(self):
         query = self._makeOne()
