From 5f27e7c8289e5835e55a1fc4d2b70aa1c8beea8c Mon Sep 17 00:00:00 2001 From: Nao Yonashiro Date: Thu, 13 Jul 2023 06:04:09 +0900 Subject: [PATCH 1/3] fix(engine/sqlite): fixed to be able to find relation from WITH clause fix #2136 --- internal/engine/sqlite/convert.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/internal/engine/sqlite/convert.go b/internal/engine/sqlite/convert.go index a730fabdb6..f7d1c26659 100644 --- a/internal/engine/sqlite/convert.go +++ b/internal/engine/sqlite/convert.go @@ -331,6 +331,25 @@ func (c *cc) convertMultiSelect_stmtContext(n *parser.Select_stmtContext) ast.No var where ast.Node var groups = []ast.Node{} var having ast.Node + var ctes []ast.Node + + if ct := n.Common_table_stmt(); ct != nil { + recursive := ct.RECURSIVE_() != nil + for _, cte := range ct.AllCommon_table_expression() { + tableName := identifier(cte.Table_name().GetText()) + var cteCols ast.List + for _, col := range cte.AllColumn_name() { + cteCols.Items = append(cteCols.Items, NewIdentifer(col.GetText())) + } + ctes = append(ctes, &ast.CommonTableExpr{ + Ctename: &tableName, + Ctequery: c.convert(cte.Select_stmt()), + Location: cte.GetStart().GetStart(), + Cterecursive: recursive, + Ctecolnames: &cteCols, + }) + } + } for _, icore := range n.AllSelect_core() { core, ok := icore.(*parser.Select_coreContext) @@ -377,6 +396,9 @@ func (c *cc) convertMultiSelect_stmtContext(n *parser.Select_stmtContext) ast.No LimitCount: limitCount, LimitOffset: limitOffset, ValuesLists: &ast.List{}, + WithClause: &ast.WithClause{ + Ctes: &ast.List{Items: ctes}, + }, } } From cdaef9b3b38714d0c20d7bfbccd6edd19696414d Mon Sep 17 00:00:00 2001 From: Nao Yonashiro Date: Sat, 15 Jul 2023 12:42:09 +0900 Subject: [PATCH 2/3] test: add endtoend --- .../testdata/select_cte/sqlite/go/db.go | 31 ++++++++++++++ .../testdata/select_cte/sqlite/go/models.go | 7 ++++ .../select_cte/sqlite/go/query.sql.go | 40 +++++++++++++++++++ .../testdata/select_cte/sqlite/query.sql | 6 +++ .../testdata/select_cte/sqlite/sqlc.json | 12 ++++++ 5 files changed, 96 insertions(+) create mode 100644 internal/endtoend/testdata/select_cte/sqlite/go/db.go create mode 100644 internal/endtoend/testdata/select_cte/sqlite/go/models.go create mode 100644 internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go create mode 100644 internal/endtoend/testdata/select_cte/sqlite/query.sql create mode 100644 internal/endtoend/testdata/select_cte/sqlite/sqlc.json diff --git a/internal/endtoend/testdata/select_cte/sqlite/go/db.go b/internal/endtoend/testdata/select_cte/sqlite/go/db.go new file mode 100644 index 0000000000..ec5e95c4ab --- /dev/null +++ b/internal/endtoend/testdata/select_cte/sqlite/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.19.0 + +package querytest + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...interface{}) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...interface{}) *sql.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/select_cte/sqlite/go/models.go b/internal/endtoend/testdata/select_cte/sqlite/go/models.go new file mode 100644 index 0000000000..b750863f92 --- /dev/null +++ b/internal/endtoend/testdata/select_cte/sqlite/go/models.go @@ -0,0 +1,7 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.19.0 + +package querytest + +import () diff --git a/internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go b/internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go new file mode 100644 index 0000000000..509422aeb3 --- /dev/null +++ b/internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go @@ -0,0 +1,40 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.19.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const listAuthors = `-- name: ListAuthors :many +WITH abc AS ( + SELECT 1 AS n +) +SELECT n FROM abc +` + +func (q *Queries) ListAuthors(ctx context.Context) ([]int64, error) { + rows, err := q.db.QueryContext(ctx, listAuthors) + if err != nil { + return nil, err + } + defer rows.Close() + var items []int64 + for rows.Next() { + var n int64 + if err := rows.Scan(&n); err != nil { + return nil, err + } + items = append(items, n) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/select_cte/sqlite/query.sql b/internal/endtoend/testdata/select_cte/sqlite/query.sql new file mode 100644 index 0000000000..22b412b89a --- /dev/null +++ b/internal/endtoend/testdata/select_cte/sqlite/query.sql @@ -0,0 +1,6 @@ + +-- name: ListAuthors :many +WITH abc AS ( + SELECT 1 AS n +) +SELECT * FROM abc; diff --git a/internal/endtoend/testdata/select_cte/sqlite/sqlc.json b/internal/endtoend/testdata/select_cte/sqlite/sqlc.json new file mode 100644 index 0000000000..3ed5eea856 --- /dev/null +++ b/internal/endtoend/testdata/select_cte/sqlite/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "sqlite", + "schema": "query.sql", + "queries": "query.sql", + "name": "querytest" + } + ] +} \ No newline at end of file From 7642630c315abc779c3c534ee462863317303538 Mon Sep 17 00:00:00 2001 From: Nao Yonashiro Date: Sun, 16 Jul 2023 00:34:02 +0900 Subject: [PATCH 3/3] chore: v1.19.1 --- internal/endtoend/testdata/select_cte/sqlite/go/db.go | 2 +- internal/endtoend/testdata/select_cte/sqlite/go/models.go | 2 +- internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/endtoend/testdata/select_cte/sqlite/go/db.go b/internal/endtoend/testdata/select_cte/sqlite/go/db.go index ec5e95c4ab..fb6ae669f6 100644 --- a/internal/endtoend/testdata/select_cte/sqlite/go/db.go +++ b/internal/endtoend/testdata/select_cte/sqlite/go/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.19.0 +// sqlc v1.19.1 package querytest diff --git a/internal/endtoend/testdata/select_cte/sqlite/go/models.go b/internal/endtoend/testdata/select_cte/sqlite/go/models.go index b750863f92..90d1991962 100644 --- a/internal/endtoend/testdata/select_cte/sqlite/go/models.go +++ b/internal/endtoend/testdata/select_cte/sqlite/go/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.19.0 +// sqlc v1.19.1 package querytest diff --git a/internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go b/internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go index 509422aeb3..48027c9266 100644 --- a/internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go +++ b/internal/endtoend/testdata/select_cte/sqlite/go/query.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.19.0 +// sqlc v1.19.1 // source: query.sql package querytest