Skip to content

Commit c681209

Browse files
kyleconroylisitsky
kyleconroy
authored and
lisitsky
committed
fix(sqlite): Correctly skip unknown statements (sqlc-dev#3239)
* fix(sqlite): Correctly skip unknown statements Without updating loc, the unknown statement would be included in the text of the next query. * Pick sqlc-gen-typescript to a release
1 parent ae63775 commit c681209

File tree

8 files changed

+148
-0
lines changed

8 files changed

+148
-0
lines changed

‎.github/workflows/ci-typescript.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@ jobs:
1919
with:
2020
repository: sqlc-dev/sqlc-gen-typescript
2121
path: typescript
22+
# v0.1.3
23+
ref: daaf539092421adc15f6c3164279a3470716b560
2224
- run: sqlc diff
2325
working-directory: typescript/examples

‎internal/endtoend/testdata/sqlite_skip_todo/db/db.go‎

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/sqlite_skip_todo/db/models.go‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/sqlite_skip_todo/db/query.sql.go‎

Lines changed: 66 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/sqlite_skip_todo/query.sql‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
-- name: PragmaForeignKeysEnable :exec
2+
PRAGMA foreign_keys = 1;
3+
4+
-- name: ListFoo :many
5+
SELECT * FROM foo;
6+
7+
-- name: PragmaForeignKeysDisable :exec
8+
PRAGMA foreign_keys = 0;
9+
10+
-- name: PragmaForeignKeysGet :one
11+
PRAGMA foreign_keys;
12+
13+
-- name: GetFoo :many
14+
SELECT * FROM foo
15+
WHERE bar = ?;
16+

‎internal/endtoend/testdata/sqlite_skip_todo/schema.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CREATE TABLE foo (
2+
bar text
3+
);

‎internal/endtoend/testdata/sqlite_skip_todo/sqlc.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": "2",
3+
"sql": [
4+
{
5+
"engine": "sqlite",
6+
"queries": "query.sql",
7+
"schema": "schema.sql",
8+
"gen": {
9+
"go": {
10+
"package": "db",
11+
"out": "db"
12+
}
13+
}
14+
}
15+
]
16+
}

‎internal/engine/sqlite/parse.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
6969
converter := &cc{}
7070
out := converter.convert(stmt)
7171
if _, ok := out.(*ast.TODO); ok {
72+
loc = stmt.GetStop().GetStop() + 2
7273
continue
7374
}
7475
len := (stmt.GetStop().GetStop() + 1) - loc

0 commit comments

Comments
 (0)