Skip to content

Fix #439: split query vs. iterator apart. #487

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 12 commits into from
Jan 6, 2015
Merged

Fix #439: split query vs. iterator apart. #487

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
50e7e10
Don't rely on 'Query.to_protobuf' to test connection.
tseaver Jan 3, 2015
9cfb5b0
Rip out 'dataset.query' factory.
tseaver Jan 3, 2015
d74a02d
Split 'Query' (abstract constraints) from excution/iteration (cursor,…
tseaver Jan 3, 2015
539c418
Accomodate regression tests to new query-iterator split.
tseaver Jan 3, 2015
4645b72
(Temporarily) restore top-level dataset import.
tseaver Jan 5, 2015
72a9520
Note discrepancy btwn protobuf spec and current implementation.
tseaver Jan 5, 2015
537e868
Move helper function after class defs.
tseaver Jan 5, 2015
9c37ad8
Add coverage for out-of-bounds enum.
tseaver Jan 5, 2015
704f115
Appease lint.
tseaver Jan 5, 2015
0aeb691
Typo.
tseaver Jan 5, 2015
2832ce5
Rip out 'Query.clone' method.
tseaver Jan 5, 2015
2516ff8
Make query iterator class public.
tseaver Jan 6, 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
Prev Previous commit
Next Next commit
Add coverage for out-of-bounds enum. 
See:
#487 (comment).
  • Loading branch information
@tseaver
tseaver committed Jan 5, 2015
commit 9c37ad8d5bca20015acfd99527dfd7486a81936c
2 changes: 1 addition & 1 deletion gcloud/datastore/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ def next_page(self):
self._more_results = True
elif more_results_enum in self._FINISHED:
self._more_results = False
else: # pragma: NO COVER
else:
raise ValueError('Unexpected value returned for `more_results`.')

dataset = self._query.dataset
Expand Down
10 changes: 10 additions & 0 deletions gcloud/datastore/test_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,16 @@ def test_next_page_w_cursors_w_more(self):
}
self.assertEqual(connection._called_with, [EXPECTED])

def test_next_page_w_cursors_w_bogus_more(self):
dataset, connection = self._makeDataset()
query = _Query(self._KIND, dataset, self._NAMESPACE)
self._addQueryResults(dataset, cursor=self._END, more=True)
conn = dataset.connection()
epb, cursor, _ = conn._results.pop()
conn._results.append((epb, cursor, 4)) # invalid enum
iterator = self._makeOne(query)
self.assertRaises(ValueError, iterator.next_page)

def test___iter___no_more(self):
from gcloud.datastore.query import _pb_from_query
self._KIND = 'KIND'
Expand Down