Skip to content

Fix #81 getting a datastore.entity by key or path #393

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 5 commits into from
Dec 3, 2014
Merged

Fix #81 getting a datastore.entity by key or path #393

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e1b026
getting a datastore.entity by key or path
bryanyang0528 Nov 27, 2014
1806341
del space
bryanyang0528 Nov 27, 2014
e47ccc1
coding style revised
bryanyang0528 Nov 27, 2014
e75899b
add a test for odd list and nonetype
bryanyang0528 Nov 28, 2014
fd0f674
del unused code
bryanyang0528 Nov 29, 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
Next Next commit
getting a datastore.entity by key or path
  • Loading branch information
@bryanyang0528
bryanyang0528 committed Nov 27, 2014
commit 2e1b026da562cfce1e1e9cced7c4e6e8b204f7e5
19 changes: 15 additions & 4 deletions gcloud/datastore/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from gcloud.datastore.entity import Entity
from gcloud.datastore.query import Query
from gcloud.datastore.transaction import Transaction
from gcloud.datastore.key import Key


class Dataset(object):
Expand Down Expand Up @@ -107,16 +108,26 @@ def transaction(self, *args, **kwargs):
kwargs['dataset'] = self
return Transaction(*args, **kwargs)

def get_entity(self, key):
def get_entity(self, key_or_path):
"""Retrieves entity from the dataset, along with its attributes.

:type key: :class:`gcloud.datastore.key.Key`
:param item_name: The name of the item to retrieve.
:type key_or_path: :class:`gcloud.datastore.key.Key` or path
:param key_or_path: The name of the item to retrieve or sequence of
even length, where the first of each pair is a
string representing the 'kind' of the path element,
and the second of the pair is either a string (for
the path element's name) or an integer (for its id).

:rtype: :class:`gcloud.datastore.entity.Entity` or ``None``
:return: The requested entity, or ``None`` if there was no match found.
"""
entities = self.get_entities([key])

if isinstance(key_or_path, Key):
entities = self.get_entities([key_or_path])
else:
key = Key.from_path(*key_or_path)

This comment was marked as spam.

Sign in to view

entities = self.get_entities([key])

if entities:
return entities[0]

Expand Down
22 changes: 22 additions & 0 deletions gcloud/datastore/test_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,28 @@ def test_get_entity_hit(self):
self.assertEqual(list(result), ['foo'])
self.assertEqual(result['foo'], 'Foo')

def test_get_entity_path(self):
from gcloud.datastore.connection import datastore_pb
DATASET_ID = 'DATASET'
KIND = 'Kind'
ID = 1234
PATH = [{'kind': KIND, 'id': ID}]
entity_pb = datastore_pb.Entity()
entity_pb.key.partition_id.dataset_id = DATASET_ID
path_element = entity_pb.key.path_element.add()
path_element.kind = KIND
path_element.id = ID
prop = entity_pb.property.add()
prop.name = 'foo'
prop.value.string_value = 'Foo'
connection = _Connection(entity_pb)
dataset = self._makeOne(DATASET_ID, connection)
result = dataset.get_entity([KIND, ID])
key = result.key()
self.assertEqual(key._dataset_id, DATASET_ID)
self.assertEqual(key.path(), PATH)
self.assertEqual(list(result), ['foo'])
self.assertEqual(result['foo'], 'Foo')

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

class _Connection(object):
_called_with = None
Expand Down