Skip to content
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

Jump to bottom

fix: fix id_or_name property of key class #115

Merged
merged 3 commits into from Nov 13, 2020
Merged

fix: fix id_or_name property of key class #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b2779d
fix: fix id_or_name property of key class
HemangChothani Nov 9, 2020
d15dd3b
fix: unit test added
HemangChothani Nov 12, 2020
60d5396
Merge branch 'master' of https://github.com/googleapis/python-datasto…
HemangChothani Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion google/cloud/datastore/key.py
View file
Open in desktop
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
tseaver marked this conversation as resolved.
Show resolved Hide resolved

@property
def project(self):
Expand Down
5 changes: 5 additions & 0 deletions tests/unit/test_key.py
View file
Open in desktop
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