Skip to content

fix: calculate limit value correctly for offset only queries #160

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
skuruppu merged 3 commits into from
Dec 2, 2021
Merged

fix: calculate limit value correctly for offset only queries #160

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
e82722b
fix: generate correct max limit when unspecified with offset
larkee Dec 2, 2021
ffd7997
fix: use _offset
larkee Dec 2, 2021
6fd76cf
Merge branch 'main' into offset-bug
larkee Dec 2, 2021
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
2 changes: 1 addition & 1 deletion google/cloud/sqlalchemy_spanner/sqlalchemy_spanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ def limit_clause(self, select, **kw):
text += "\n LIMIT " + self.process(select._limit_clause, **kw)
if select._offset_clause is not None:
if select._limit_clause is None:
text += "\n LIMIT 9223372036854775805"
text += f"\n LIMIT {9223372036854775807-select._offset}"
text += " OFFSET " + self.process(select._offset_clause, **kw)
return text

Expand Down
25 changes: 25 additions & 0 deletions test/test_suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,6 +1613,31 @@ def test_staleness(self):
assert connection.connection.staleness is None


class LimitOffsetTest(fixtures.TestBase):
"""
Check that SQL with an offset and no limit is being generated correctly.
"""

def setUp(self):
self._engine = create_engine(get_db_url(), pool_size=1)
self._metadata = MetaData(bind=self._engine)

self._table = Table(
"users",
self._metadata,
Column("user_id", Integer, primary_key=True),
Column("user_name", String(16), nullable=False),
)

self._metadata.create_all(self._engine)

def test_offset_only(self):
for offset in [1, 7, 10, 100, 1000, 10000]:

with self._engine.connect().execution_options(read_only=True) as connection:
list(connection.execute(self._table.select().offset(offset)).fetchall())


class ComputedReflectionFixtureTest(_ComputedReflectionFixtureTest):
@classmethod
def define_tables(cls, metadata):
Expand Down