diff --git a/internal/compiler/query_catalog.go b/internal/compiler/query_catalog.go index 80b59d876c..489c30a490 100644 --- a/internal/compiler/query_catalog.go +++ b/internal/compiler/query_catalog.go @@ -20,7 +20,11 @@ func (comp *Compiler) buildQueryCatalog(c *catalog.Catalog, node ast.Node, embed case *ast.DeleteStmt: with = n.WithClause case *ast.InsertStmt: - with = n.WithClause + if selectStmt, ok := n.SelectStmt.(*ast.SelectStmt); ok && selectStmt.WithClause != nil { + with = selectStmt.WithClause + } else { + with = n.WithClause + } case *ast.UpdateStmt: with = n.WithClause case *ast.SelectStmt: diff --git a/internal/endtoend/testdata/insert_cte_select/mysql/go/db.go b/internal/endtoend/testdata/insert_cte_select/mysql/go/db.go new file mode 100644 index 0000000000..a92cd6e8eb --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/mysql/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.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/insert_cte_select/mysql/go/models.go b/internal/endtoend/testdata/insert_cte_select/mysql/go/models.go new file mode 100644 index 0000000000..66cf0f637c --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/mysql/go/models.go @@ -0,0 +1,21 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 + +package querytest + +import ( + "database/sql" +) + +type Author struct { + ID int32 + Name string + Bio sql.NullString +} + +type Dummy struct { + ID int32 + Name string + Bio sql.NullString +} diff --git a/internal/endtoend/testdata/insert_cte_select/mysql/go/query.sql.go b/internal/endtoend/testdata/insert_cte_select/mysql/go/query.sql.go new file mode 100644 index 0000000000..75265f288a --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/mysql/go/query.sql.go @@ -0,0 +1,25 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const createAuthor = `-- name: CreateAuthor :exec +insert into authors (id, name, bio) +with potential_authors as ( + select id, name, bio + from dummy +) +select id, name, bio +from potential_authors +` + +func (q *Queries) CreateAuthor(ctx context.Context) error { + _, err := q.db.ExecContext(ctx, createAuthor) + return err +} diff --git a/internal/endtoend/testdata/insert_cte_select/mysql/query.sql b/internal/endtoend/testdata/insert_cte_select/mysql/query.sql new file mode 100644 index 0000000000..d9e38f7d63 --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/mysql/query.sql @@ -0,0 +1,8 @@ +-- name: CreateAuthor :exec +insert into authors (id, name, bio) +with potential_authors as ( + select id, name, bio + from dummy +) +select id, name, bio +from potential_authors; diff --git a/internal/endtoend/testdata/insert_cte_select/mysql/schema.sql b/internal/endtoend/testdata/insert_cte_select/mysql/schema.sql new file mode 100644 index 0000000000..c1025692bc --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/mysql/schema.sql @@ -0,0 +1,11 @@ +create table authors ( + id integer primary key, + name text not null, + bio text +); + +create table dummy ( + id integer primary key, + name text not null, + bio text +); diff --git a/internal/endtoend/testdata/insert_cte_select/mysql/sqlc.json b/internal/endtoend/testdata/insert_cte_select/mysql/sqlc.json new file mode 100644 index 0000000000..974aa9ff9e --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/mysql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "engine": "mysql", + "path": "go", + "name": "querytest", + "schema": "schema.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/go/db.go b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/go/db.go new file mode 100644 index 0000000000..635cce3c5d --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/go/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 + +package querytest + +import ( + "context" + + "github.com/jackc/pgconn" + "github.com/jackc/pgx/v4" +) + +type DBTX interface { + Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) + Query(context.Context, string, ...interface{}) (pgx.Rows, error) + QueryRow(context.Context, string, ...interface{}) pgx.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx pgx.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/go/models.go b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/go/models.go new file mode 100644 index 0000000000..66cf0f637c --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/go/models.go @@ -0,0 +1,21 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 + +package querytest + +import ( + "database/sql" +) + +type Author struct { + ID int32 + Name string + Bio sql.NullString +} + +type Dummy struct { + ID int32 + Name string + Bio sql.NullString +} diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/go/query.sql.go new file mode 100644 index 0000000000..5060c7380e --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/go/query.sql.go @@ -0,0 +1,25 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const createAuthor = `-- name: CreateAuthor :exec +insert into authors (id, name, bio) +with potential_authors as ( + select id, name, bio + from dummy +) +select id, name, bio +from potential_authors +` + +func (q *Queries) CreateAuthor(ctx context.Context) error { + _, err := q.db.Exec(ctx, createAuthor) + return err +} diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/query.sql new file mode 100644 index 0000000000..d9e38f7d63 --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/query.sql @@ -0,0 +1,8 @@ +-- name: CreateAuthor :exec +insert into authors (id, name, bio) +with potential_authors as ( + select id, name, bio + from dummy +) +select id, name, bio +from potential_authors; diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/schema.sql b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/schema.sql new file mode 100644 index 0000000000..c1025692bc --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/schema.sql @@ -0,0 +1,11 @@ +create table authors ( + id integer primary key, + name text not null, + bio text +); + +create table dummy ( + id integer primary key, + name text not null, + bio text +); diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/sqlc.json b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/sqlc.json new file mode 100644 index 0000000000..d1244c9e7a --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v4/sqlc.json @@ -0,0 +1,13 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "sql_package": "pgx/v4", + "name": "querytest", + "schema": "schema.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/go/db.go b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/go/db.go new file mode 100644 index 0000000000..e83d6a948c --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/go/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 + +package querytest + +import ( + "context" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" +) + +type DBTX interface { + Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) + Query(context.Context, string, ...interface{}) (pgx.Rows, error) + QueryRow(context.Context, string, ...interface{}) pgx.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx pgx.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/go/models.go new file mode 100644 index 0000000000..9824935857 --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/go/models.go @@ -0,0 +1,21 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 + +package querytest + +import ( + "github.com/jackc/pgx/v5/pgtype" +) + +type Author struct { + ID int32 + Name string + Bio pgtype.Text +} + +type Dummy struct { + ID int32 + Name string + Bio pgtype.Text +} diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/go/query.sql.go new file mode 100644 index 0000000000..5060c7380e --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/go/query.sql.go @@ -0,0 +1,25 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const createAuthor = `-- name: CreateAuthor :exec +insert into authors (id, name, bio) +with potential_authors as ( + select id, name, bio + from dummy +) +select id, name, bio +from potential_authors +` + +func (q *Queries) CreateAuthor(ctx context.Context) error { + _, err := q.db.Exec(ctx, createAuthor) + return err +} diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/query.sql new file mode 100644 index 0000000000..d9e38f7d63 --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/query.sql @@ -0,0 +1,8 @@ +-- name: CreateAuthor :exec +insert into authors (id, name, bio) +with potential_authors as ( + select id, name, bio + from dummy +) +select id, name, bio +from potential_authors; diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/schema.sql b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/schema.sql new file mode 100644 index 0000000000..c1025692bc --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/schema.sql @@ -0,0 +1,11 @@ +create table authors ( + id integer primary key, + name text not null, + bio text +); + +create table dummy ( + id integer primary key, + name text not null, + bio text +); diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/sqlc.json b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/sqlc.json new file mode 100644 index 0000000000..32ede07158 --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/pgx/v5/sqlc.json @@ -0,0 +1,13 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "sql_package": "pgx/v5", + "name": "querytest", + "schema": "schema.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/go/db.go b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/go/db.go new file mode 100644 index 0000000000..a92cd6e8eb --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.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/insert_cte_select/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/go/models.go new file mode 100644 index 0000000000..66cf0f637c --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/go/models.go @@ -0,0 +1,21 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 + +package querytest + +import ( + "database/sql" +) + +type Author struct { + ID int32 + Name string + Bio sql.NullString +} + +type Dummy struct { + ID int32 + Name string + Bio sql.NullString +} diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/go/query.sql.go new file mode 100644 index 0000000000..75265f288a --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/go/query.sql.go @@ -0,0 +1,25 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const createAuthor = `-- name: CreateAuthor :exec +insert into authors (id, name, bio) +with potential_authors as ( + select id, name, bio + from dummy +) +select id, name, bio +from potential_authors +` + +func (q *Queries) CreateAuthor(ctx context.Context) error { + _, err := q.db.ExecContext(ctx, createAuthor) + return err +} diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/query.sql b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/query.sql new file mode 100644 index 0000000000..d9e38f7d63 --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/query.sql @@ -0,0 +1,8 @@ +-- name: CreateAuthor :exec +insert into authors (id, name, bio) +with potential_authors as ( + select id, name, bio + from dummy +) +select id, name, bio +from potential_authors; diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/schema.sql new file mode 100644 index 0000000000..c1025692bc --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/schema.sql @@ -0,0 +1,11 @@ +create table authors ( + id integer primary key, + name text not null, + bio text +); + +create table dummy ( + id integer primary key, + name text not null, + bio text +); diff --git a/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/sqlc.json b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/sqlc.json new file mode 100644 index 0000000000..cd518671ac --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/postgresql/stdlib/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "engine": "postgresql", + "path": "go", + "name": "querytest", + "schema": "schema.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/insert_cte_select/sqlite/go/db.go b/internal/endtoend/testdata/insert_cte_select/sqlite/go/db.go new file mode 100644 index 0000000000..a92cd6e8eb --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/sqlite/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.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/insert_cte_select/sqlite/go/models.go b/internal/endtoend/testdata/insert_cte_select/sqlite/go/models.go new file mode 100644 index 0000000000..4ec2b369d3 --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/sqlite/go/models.go @@ -0,0 +1,21 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 + +package querytest + +import ( + "database/sql" +) + +type Author struct { + ID int64 + Name string + Bio sql.NullString +} + +type Dummy struct { + ID int64 + Name string + Bio sql.NullString +} diff --git a/internal/endtoend/testdata/insert_cte_select/sqlite/go/query.sql.go b/internal/endtoend/testdata/insert_cte_select/sqlite/go/query.sql.go new file mode 100644 index 0000000000..75265f288a --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/sqlite/go/query.sql.go @@ -0,0 +1,25 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.29.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const createAuthor = `-- name: CreateAuthor :exec +insert into authors (id, name, bio) +with potential_authors as ( + select id, name, bio + from dummy +) +select id, name, bio +from potential_authors +` + +func (q *Queries) CreateAuthor(ctx context.Context) error { + _, err := q.db.ExecContext(ctx, createAuthor) + return err +} diff --git a/internal/endtoend/testdata/insert_cte_select/sqlite/query.sql b/internal/endtoend/testdata/insert_cte_select/sqlite/query.sql new file mode 100644 index 0000000000..d9e38f7d63 --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/sqlite/query.sql @@ -0,0 +1,8 @@ +-- name: CreateAuthor :exec +insert into authors (id, name, bio) +with potential_authors as ( + select id, name, bio + from dummy +) +select id, name, bio +from potential_authors; diff --git a/internal/endtoend/testdata/insert_cte_select/sqlite/schema.sql b/internal/endtoend/testdata/insert_cte_select/sqlite/schema.sql new file mode 100644 index 0000000000..c1025692bc --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/sqlite/schema.sql @@ -0,0 +1,11 @@ +create table authors ( + id integer primary key, + name text not null, + bio text +); + +create table dummy ( + id integer primary key, + name text not null, + bio text +); diff --git a/internal/endtoend/testdata/insert_cte_select/sqlite/sqlc.json b/internal/endtoend/testdata/insert_cte_select/sqlite/sqlc.json new file mode 100644 index 0000000000..f8e8051087 --- /dev/null +++ b/internal/endtoend/testdata/insert_cte_select/sqlite/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "engine": "sqlite", + "path": "go", + "name": "querytest", + "schema": "schema.sql", + "queries": "query.sql" + } + ] +} \ No newline at end of file