From e006f7f5bfb0651135e1625fd9fe421f74198232 Mon Sep 17 00:00:00 2001 From: Akash Kalita Date: Sat, 21 Nov 2026 15:59:07 -0800 Subject: [PATCH] duckdb: preserve OFFSET parameters with a percentage LIMIT --- .../analyze_percent_offset/duckdb/exec.json | 5 ++++ .../analyze_percent_offset/duckdb/query.sql | 2 ++ .../analyze_percent_offset/duckdb/schema.sql | 1 + .../analyze_percent_offset/duckdb/stdout.json | 26 +++++++++++++++++++ internal/engine/duckdb/convert.go | 7 ++--- 5 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 internal/endtoend/testdata/analyze_percent_offset/duckdb/exec.json create mode 100644 internal/endtoend/testdata/analyze_percent_offset/duckdb/query.sql create mode 100644 internal/endtoend/testdata/analyze_percent_offset/duckdb/schema.sql create mode 100644 internal/endtoend/testdata/analyze_percent_offset/duckdb/stdout.json diff --git a/internal/endtoend/testdata/analyze_percent_offset/duckdb/exec.json b/internal/endtoend/testdata/analyze_percent_offset/duckdb/exec.json new file mode 100644 index 0000000000..56cb4b3fff --- /dev/null +++ b/internal/endtoend/testdata/analyze_percent_offset/duckdb/exec.json @@ -0,0 +1,5 @@ +{ + "command": "analyze", + "args": ["--dialect", "duckdb", "--schema", "schema.sql", "query.sql"], + "contexts": ["base"] +} diff --git a/internal/endtoend/testdata/analyze_percent_offset/duckdb/query.sql b/internal/endtoend/testdata/analyze_percent_offset/duckdb/query.sql new file mode 100644 index 0000000000..7ed1e63ce2 --- /dev/null +++ b/internal/endtoend/testdata/analyze_percent_offset/duckdb/query.sql @@ -0,0 +1,2 @@ +-- name: Page :many +SELECT id FROM readings ORDER BY id LIMIT 50% OFFSET $1; diff --git a/internal/endtoend/testdata/analyze_percent_offset/duckdb/schema.sql b/internal/endtoend/testdata/analyze_percent_offset/duckdb/schema.sql new file mode 100644 index 0000000000..3e3f10ca86 --- /dev/null +++ b/internal/endtoend/testdata/analyze_percent_offset/duckdb/schema.sql @@ -0,0 +1 @@ +CREATE TABLE readings (id INTEGER NOT NULL); diff --git a/internal/endtoend/testdata/analyze_percent_offset/duckdb/stdout.json b/internal/endtoend/testdata/analyze_percent_offset/duckdb/stdout.json new file mode 100644 index 0000000000..492b8a3ac8 --- /dev/null +++ b/internal/endtoend/testdata/analyze_percent_offset/duckdb/stdout.json @@ -0,0 +1,26 @@ +[ + { + "name": "Page", + "cmd": ":many", + "columns": [ + { + "name": "id", + "type": { + "name": "integer" + }, + "table": "readings" + } + ], + "params": [ + { + "number": 1, + "column": { + "name": "", + "type": { + "name": "integer" + } + } + } + ] + } +] diff --git a/internal/engine/duckdb/convert.go b/internal/engine/duckdb/convert.go index 29721bb60d..63a2c7ec9d 100644 --- a/internal/engine/duckdb/convert.go +++ b/internal/engine/duckdb/convert.go @@ -75,11 +75,8 @@ func (c *cc) applyModifiers(stmt *ast.SelectStmt, mods []dw.ResultModifier) { case *dw.OrderModifier: stmt.SortClause = c.convertOrderBys(m.Orders) case *dw.LimitModifier: - // LIMIT n% has no row-count equivalent. - if m.LimitType == dw.LimitPercentage { - continue - } - if m.Limit != nil { + // LIMIT n% has no row-count equivalent, but its OFFSET counts rows. + if m.Limit != nil && m.LimitType != dw.LimitPercentage { stmt.LimitCount = c.convertExpr(m.Limit) } if m.Offset != nil {