Skip to content

Fix datastore: unprefixed ids in client #1226

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
dhermes merged 3 commits into from
Nov 18, 2015
Merged

Fix datastore: unprefixed ids in client #1226

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c549677
Fix datastore: unprefixed ids in client
mpeg Nov 18, 2015
2a212a5
Fix datastore: unprefixed ids in client test
mpeg Nov 18, 2015
c32656e
Fix datastore: unprefixed ids in client test (pep8)
mpeg Nov 18, 2015
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
8 changes: 5 additions & 3 deletions gcloud/datastore/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from gcloud.datastore.batch import Batch
from gcloud.datastore.entity import Entity
from gcloud.datastore.key import Key
from gcloud.datastore.key import _dataset_ids_equal
from gcloud.datastore.query import Query
from gcloud.datastore.transaction import Transaction
from gcloud.environment_vars import DATASET
Expand Down Expand Up @@ -288,9 +289,10 @@ def get_multi(self, keys, missing=None, deferred=None):
if not keys:
return []

ids = list(set([key.dataset_id for key in keys]))
if ids != [self.dataset_id]:
raise ValueError('Keys do not match dataset ID')
ids = set(key.dataset_id for key in keys)
for ds_id in ids:

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

if not _dataset_ids_equal(ds_id, self.dataset_id):
raise ValueError('Keys do not match dataset ID')

transaction = self.current_transaction

Expand Down