Skip to content

#295 let entity save accept null value for attribute #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tseaver merged 3 commits into from
Oct 28, 2014
Merged

#295 let entity save accept null value for attribute #296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3753821
#295 let entity save accept null value for attribute
lucemia Oct 27, 2014
014b658
fix an issue that protoc buff will raise exception if a _pb object cr…
lucemia Oct 27, 2014
a208132
fix the helper function and test case while checking null value
lucemia Oct 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix the helper function and test case while checking null value
  • Loading branch information
@lucemia
lucemia committed Oct 28, 2014
commit a208132dd67a41a6f9fd67effdb3659f3ddb82ec
10 changes: 1 addition & 9 deletions gcloud/datastore/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,7 @@ def _set_protobuf_value(value_pb, val):
:param val: The value to be assigned.
"""
if val is None:
value_pb.ClearField('boolean_value')
value_pb.ClearField('integer_value')
value_pb.ClearField('double_value')
value_pb.ClearField('timestamp_microseconds_value')
value_pb.ClearField('key_value')
value_pb.ClearField('blob_key_value')
value_pb.ClearField('string_value')
value_pb.ClearField('blob_value')
value_pb.ClearField('entity_value')
value_pb.Clear()
return

attr, val = _get_protobuf_attribute_and_value(val)
Expand Down
25 changes: 15 additions & 10 deletions gcloud/datastore/test_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,18 +362,23 @@ def test_key(self):
self.assertEqual(value, key.to_protobuf())

def test_none(self):
from gcloud.datastore.entity import Entity

entity = Entity()
pb = self._makePB()

self._callFUT(pb, False)
self._callFUT(pb, 3.1415926)
self._callFUT(pb, 42)
self._callFUT(pb, (1 << 63) - 1)
self._callFUT(pb, 'str')
self._callFUT(pb, b'str')
self._callFUT(pb, u'str')
self._callFUT(pb, entity)
self._callFUT(pb, [u'a', 0, 3.14])

self._callFUT(pb, None)

This comment was marked as spam.

Sign in to view

self.assertEqual(pb.HasField('boolean_value'), False)
self.assertEqual(pb.HasField('integer_value'), False)
self.assertEqual(pb.HasField('double_value'), False)
self.assertEqual(pb.HasField('timestamp_microseconds_value'), False)
self.assertEqual(pb.HasField('key_value'), False)
self.assertEqual(pb.HasField('blob_key_value'), False)
self.assertEqual(pb.HasField('string_value'), False)
self.assertEqual(pb.HasField('blob_value'), False)
self.assertEqual(pb.HasField('entity_value'), False)
self.assertEqual(len(pb.list_value), 0)
self.assertEqual(len(pb.ListFields()), 0)

def test_bool(self):
pb = self._makePB()
Expand Down