Skip to content

Commit

Permalink
fix: fix id_or_name property of key class (#115)
Browse files Browse the repository at this point in the history
* fix: fix id_or_name property of key class

* fix: unit test added
  • Loading branch information
HemangChothani committed Nov 13, 2020
1 parent 5851522 commit 6f28b84
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 3 additions & 1 deletion google/cloud/datastore/key.py
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,9 @@ def id_or_name(self):
:returns: The last element of the key's path if it is either an ``id``
or a ``name``.
"""
return self.id or self.name
if self.id is None:
return self.name
return self.id

@property
def project(self):
Expand Down
5 changes: 5 additions & 0 deletions tests/unit/test_key.py
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,11 @@ def test_id_or_name_w_name_only(self):
key = self._make_one("KIND", _NAME, project=self._DEFAULT_PROJECT)
self.assertEqual(key.id_or_name, _NAME)

def test_id_or_name_w_id_zero(self):
_ID = 0
key = self._make_one("KIND", _ID, project=self._DEFAULT_PROJECT)
self.assertEqual(key.id_or_name, _ID)

def test_parent_default(self):
key = self._make_one("KIND", project=self._DEFAULT_PROJECT)
self.assertIsNone(key.parent)
Expand Down

0 comments on commit 6f28b84

Please sign in to comment.