Fix rows_where() crash when offset is given without limit

SQLite requires LIMIT before OFFSET; omitting it raised OperationalError.
When offset is set and limit is not, emit LIMIT -1 first so the SQL is valid.
Same fix applied to search_sql(). Adds regression test.
This commit is contained in:
ikatyal21 2026-07-26 14:37:29 +00:00
commit 72b7d469a4
No known key found for this signature in database
2 changed files with 11 additions and 0 deletions

View file

@ -2003,6 +2003,8 @@ class Queryable:
if limit is not None:
sql += f" limit {limit}"
if offset is not None:
if limit is None:
sql += " limit -1"
sql += f" offset {offset}"
cursor = self.db.execute(sql, where_args or [])
columns = dedupe_keys(c[0] for c in cursor.description)
@ -3594,6 +3596,8 @@ class Table(Queryable):
if limit is not None:
limit_offset += f" limit {limit}"
if offset is not None:
if limit is None:
limit_offset += " limit -1"
limit_offset += f" offset {offset}"
return sql.format(
dbtable=quote_identifier(self.name),

View file

@ -70,6 +70,13 @@ def test_rows_where_offset_limit(fresh_db, offset, limit, expected):
]
def test_rows_where_offset_without_limit(fresh_db):
table = fresh_db["rows"]
table.insert_all([{"id": id} for id in range(1, 6)], pk="id")
ids = [r["id"] for r in table.rows_where(offset=2, order_by="id")]
assert ids == [3, 4, 5]
def test_pks_and_rows_where_rowid(fresh_db):
table = fresh_db["rowid_table"]
table.insert_all({"number": i + 10} for i in range(3))