Skip to content

#1054: Set query cursor to 'None' when returned as empty string. #1060

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 1 commit into from
Aug 12, 2015
Merged

#1054: Set query cursor to 'None' when returned as empty string. #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion gcloud/datastore/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,10 @@ def next_page(self):
# for discussion.
entity_pbs, cursor_as_bytes, more_results_enum = query_results[:3]

self._start_cursor = base64.b64encode(cursor_as_bytes)
if cursor_as_bytes == b'':

This comment was marked as spam.

Sign in to view

self._start_cursor = None
else:
self._start_cursor = base64.b64encode(cursor_as_bytes)
self._end_cursor = None

if more_results_enum == self._NOT_FINISHED:
Expand Down
10 changes: 4 additions & 6 deletions gcloud/datastore/test_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,16 +363,15 @@ def test_ctor_explicit(self):
self.assertEqual(iterator._offset, 29)

def test_next_page_no_cursors_no_more(self):
from base64 import b64encode
from gcloud.datastore.query import _pb_from_query
connection = _Connection()
client = self._makeClient(connection)
query = _Query(client, self._KIND, self._DATASET, self._NAMESPACE)
self._addQueryResults(connection)
self._addQueryResults(connection, cursor=b'')
iterator = self._makeOne(query, client)
entities, more_results, cursor = iterator.next_page()

self.assertEqual(cursor, b64encode(self._END))
self.assertEqual(cursor, None)
self.assertFalse(more_results)
self.assertFalse(iterator._more_results)
self.assertEqual(len(entities), 1)
Expand All @@ -390,16 +389,15 @@ def test_next_page_no_cursors_no_more(self):
self.assertEqual(connection._called_with, [EXPECTED])

def test_next_page_no_cursors_no_more_w_offset_and_limit(self):
from base64 import b64encode
from gcloud.datastore.query import _pb_from_query
connection = _Connection()
client = self._makeClient(connection)
query = _Query(client, self._KIND, self._DATASET, self._NAMESPACE)
self._addQueryResults(connection)
self._addQueryResults(connection, cursor=b'')
iterator = self._makeOne(query, client, 13, 29)
entities, more_results, cursor = iterator.next_page()

self.assertEqual(cursor, b64encode(self._END))
self.assertEqual(cursor, None)
self.assertFalse(more_results)
self.assertFalse(iterator._more_results)
self.assertEqual(len(entities), 1)
Expand Down