diff --git a/internal/endtoend/testdata/ddl_create_procedure/postgresql/go/db.go b/internal/endtoend/testdata/ddl_create_procedure/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_procedure/postgresql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +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/ddl_create_procedure/postgresql/go/models.go b/internal/endtoend/testdata/ddl_create_procedure/postgresql/go/models.go new file mode 100644 index 0000000000..e4c1a2aa89 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_procedure/postgresql/go/models.go @@ -0,0 +1,11 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Tbl struct { + Value sql.NullInt32 +} diff --git a/internal/endtoend/testdata/ddl_create_procedure/postgresql/go/query.sql.go b/internal/endtoend/testdata/ddl_create_procedure/postgresql/go/query.sql.go new file mode 100644 index 0000000000..203f0fe62c --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_procedure/postgresql/go/query.sql.go @@ -0,0 +1,17 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const placeholder = `-- name: Placeholder :exec +SELECT 1 +` + +func (q *Queries) Placeholder(ctx context.Context) error { + _, err := q.db.ExecContext(ctx, placeholder) + return err +} diff --git a/internal/endtoend/testdata/ddl_create_procedure/postgresql/query.sql b/internal/endtoend/testdata/ddl_create_procedure/postgresql/query.sql new file mode 100644 index 0000000000..eea032f74a --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_procedure/postgresql/query.sql @@ -0,0 +1,6 @@ +-- name: Placeholder :exec +SELECT 1; + +-- FIXME: Implement CALL +-- name: CallInsertData :select +CALL insert_data(1, 2); diff --git a/internal/endtoend/testdata/ddl_create_procedure/postgresql/schema.sql b/internal/endtoend/testdata/ddl_create_procedure/postgresql/schema.sql new file mode 100644 index 0000000000..55a9a2e69a --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_procedure/postgresql/schema.sql @@ -0,0 +1,11 @@ +CREATE TABLE tbl ( + value integer +); + +-- https://www.postgresql.org/docs/current/sql-createprocedure.html +CREATE PROCEDURE insert_data(a integer, b integer) +LANGUAGE SQL +AS $$ +INSERT INTO tbl VALUES (a); +INSERT INTO tbl VALUES (b); +$$; diff --git a/internal/endtoend/testdata/ddl_create_procedure/postgresql/sqlc.json b/internal/endtoend/testdata/ddl_create_procedure/postgresql/sqlc.json new file mode 100644 index 0000000000..f717ca2e66 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_procedure/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "schema.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/ddl_create_table_include/postgresql/go/db.go b/internal/endtoend/testdata/ddl_create_table_include/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_include/postgresql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +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/ddl_create_table_include/postgresql/go/models.go b/internal/endtoend/testdata/ddl_create_table_include/postgresql/go/models.go new file mode 100644 index 0000000000..705bbb37e5 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_include/postgresql/go/models.go @@ -0,0 +1,13 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + A int32 + B int32 + C sql.NullInt32 +} diff --git a/internal/endtoend/testdata/ddl_create_table_include/postgresql/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_include/postgresql/go/query.sql.go new file mode 100644 index 0000000000..203f0fe62c --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_include/postgresql/go/query.sql.go @@ -0,0 +1,17 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const placeholder = `-- name: Placeholder :exec +SELECT 1 +` + +func (q *Queries) Placeholder(ctx context.Context) error { + _, err := q.db.ExecContext(ctx, placeholder) + return err +} diff --git a/internal/endtoend/testdata/ddl_create_table_include/postgresql/query.sql b/internal/endtoend/testdata/ddl_create_table_include/postgresql/query.sql new file mode 100644 index 0000000000..6520aef4b6 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_include/postgresql/query.sql @@ -0,0 +1,2 @@ +-- name: Placeholder :exec +SELECT 1; diff --git a/internal/endtoend/testdata/ddl_create_table_include/postgresql/schema.sql b/internal/endtoend/testdata/ddl_create_table_include/postgresql/schema.sql new file mode 100644 index 0000000000..db08b9d26d --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_include/postgresql/schema.sql @@ -0,0 +1,6 @@ +CREATE TABLE foo ( + PRIMARY KEY (a, b) INCLUDE (c), + a integer, + b integer, + c integer +); diff --git a/internal/endtoend/testdata/ddl_create_table_include/postgresql/sqlc.json b/internal/endtoend/testdata/ddl_create_table_include/postgresql/sqlc.json new file mode 100644 index 0000000000..f717ca2e66 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_include/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "schema.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/ddl_create_table_partition/postgresql/go/db.go b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +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/ddl_create_table_partition/postgresql/go/models.go b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/go/models.go new file mode 100644 index 0000000000..a6e501eb11 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/go/models.go @@ -0,0 +1,15 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "github.com/google/uuid" +) + +type Foo struct { + ID uuid.UUID + OtherID uuid.UUID +} + +type Foo1 struct { +} diff --git a/internal/endtoend/testdata/ddl_create_table_partition/postgresql/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/go/query.sql.go new file mode 100644 index 0000000000..203f0fe62c --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/go/query.sql.go @@ -0,0 +1,17 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const placeholder = `-- name: Placeholder :exec +SELECT 1 +` + +func (q *Queries) Placeholder(ctx context.Context) error { + _, err := q.db.ExecContext(ctx, placeholder) + return err +} diff --git a/internal/endtoend/testdata/ddl_create_table_partition/postgresql/query.sql b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/query.sql new file mode 100644 index 0000000000..6520aef4b6 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/query.sql @@ -0,0 +1,2 @@ +-- name: Placeholder :exec +SELECT 1; diff --git a/internal/endtoend/testdata/ddl_create_table_partition/postgresql/schema.sql b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/schema.sql new file mode 100644 index 0000000000..29bf454622 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/schema.sql @@ -0,0 +1,6 @@ +CREATE TABLE foo ( + id uuid PRIMARY KEY, + other_id uuid NOT NULL +) PARTITION BY HASH (other_id); + +CREATE TABLE foo_1 PARTITION OF foo FOR VALUES WITH (MODULUS 10, REMAINDER 0); diff --git a/internal/endtoend/testdata/ddl_create_table_partition/postgresql/sqlc.json b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/sqlc.json new file mode 100644 index 0000000000..f717ca2e66 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "schema.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/ddl_create_trigger/postgresql/go/db.go b/internal/endtoend/testdata/ddl_create_trigger/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_trigger/postgresql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +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/ddl_create_trigger/postgresql/go/models.go b/internal/endtoend/testdata/ddl_create_trigger/postgresql/go/models.go new file mode 100644 index 0000000000..84bc39cfc5 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_trigger/postgresql/go/models.go @@ -0,0 +1,17 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "time" + + "github.com/google/uuid" +) + +type TddTest struct { + TestID uuid.UUID + Title string + Descr string + TsCreated time.Time + TsUpdated time.Time +} diff --git a/internal/endtoend/testdata/ddl_create_trigger/postgresql/go/query.sql.go b/internal/endtoend/testdata/ddl_create_trigger/postgresql/go/query.sql.go new file mode 100644 index 0000000000..203f0fe62c --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_trigger/postgresql/go/query.sql.go @@ -0,0 +1,17 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const placeholder = `-- name: Placeholder :exec +SELECT 1 +` + +func (q *Queries) Placeholder(ctx context.Context) error { + _, err := q.db.ExecContext(ctx, placeholder) + return err +} diff --git a/internal/endtoend/testdata/ddl_create_trigger/postgresql/query.sql b/internal/endtoend/testdata/ddl_create_trigger/postgresql/query.sql new file mode 100644 index 0000000000..6520aef4b6 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_trigger/postgresql/query.sql @@ -0,0 +1,2 @@ +-- name: Placeholder :exec +SELECT 1; diff --git a/internal/endtoend/testdata/ddl_create_trigger/postgresql/schema.sql b/internal/endtoend/testdata/ddl_create_trigger/postgresql/schema.sql new file mode 100644 index 0000000000..d218ce9e77 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_trigger/postgresql/schema.sql @@ -0,0 +1,24 @@ +CREATE SCHEMA tdd; + +CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; +CREATE EXTENSION IF NOT EXISTS pgcrypto + SCHEMA public + VERSION "1.3"; + +CREATE FUNCTION tdd.trigger_set_timestamp() RETURNS trigger +LANGUAGE plpgsql +AS $$BEGIN + NEW.ts_updated = NOW(); + RETURN NEW; +END; +$$; + +CREATE TABLE tdd.tests ( + test_id uuid DEFAULT uuid_generate_v4() PRIMARY KEY, + title text DEFAULT ''::text NOT NULL, + descr text DEFAULT ''::text NOT NULL, + ts_created timestamp with time zone DEFAULT now() NOT NULL, + ts_updated timestamp with time zone DEFAULT now() NOT NULL +); + +CREATE TRIGGER set_timestamp BEFORE UPDATE ON tdd.tests FOR EACH ROW EXECUTE FUNCTION tdd.trigger_set_timestamp(); diff --git a/internal/endtoend/testdata/ddl_create_trigger/postgresql/sqlc.json b/internal/endtoend/testdata/ddl_create_trigger/postgresql/sqlc.json new file mode 100644 index 0000000000..f717ca2e66 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_trigger/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "schema.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/ddl_generated_columns/postgresql/go/db.go b/internal/endtoend/testdata/ddl_generated_columns/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/ddl_generated_columns/postgresql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +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/ddl_generated_columns/postgresql/go/models.go b/internal/endtoend/testdata/ddl_generated_columns/postgresql/go/models.go new file mode 100644 index 0000000000..d7d5f0d1bb --- /dev/null +++ b/internal/endtoend/testdata/ddl_generated_columns/postgresql/go/models.go @@ -0,0 +1,12 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Description struct { + ID string + Txt sql.NullString +} diff --git a/internal/endtoend/testdata/ddl_generated_columns/postgresql/go/query.sql.go b/internal/endtoend/testdata/ddl_generated_columns/postgresql/go/query.sql.go new file mode 100644 index 0000000000..203f0fe62c --- /dev/null +++ b/internal/endtoend/testdata/ddl_generated_columns/postgresql/go/query.sql.go @@ -0,0 +1,17 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const placeholder = `-- name: Placeholder :exec +SELECT 1 +` + +func (q *Queries) Placeholder(ctx context.Context) error { + _, err := q.db.ExecContext(ctx, placeholder) + return err +} diff --git a/internal/endtoend/testdata/ddl_generated_columns/postgresql/query.sql b/internal/endtoend/testdata/ddl_generated_columns/postgresql/query.sql new file mode 100644 index 0000000000..6520aef4b6 --- /dev/null +++ b/internal/endtoend/testdata/ddl_generated_columns/postgresql/query.sql @@ -0,0 +1,2 @@ +-- name: Placeholder :exec +SELECT 1; diff --git a/internal/endtoend/testdata/ddl_generated_columns/postgresql/schema.sql b/internal/endtoend/testdata/ddl_generated_columns/postgresql/schema.sql new file mode 100644 index 0000000000..8df3af69b2 --- /dev/null +++ b/internal/endtoend/testdata/ddl_generated_columns/postgresql/schema.sql @@ -0,0 +1,5 @@ +create table descriptions ( + id varchar(32) GENERATED ALWAYS AS (MD5(txt)) STORED, + txt text, + primary key (id) +); diff --git a/internal/endtoend/testdata/ddl_generated_columns/postgresql/sqlc.json b/internal/endtoend/testdata/ddl_generated_columns/postgresql/sqlc.json new file mode 100644 index 0000000000..f717ca2e66 --- /dev/null +++ b/internal/endtoend/testdata/ddl_generated_columns/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "schema.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/engine/postgresql/parse.go b/internal/engine/postgresql/parse.go index 0d1325c600..6738da1992 100644 --- a/internal/engine/postgresql/parse.go +++ b/internal/engine/postgresql/parse.go @@ -420,13 +420,17 @@ func translate(node *nodes.Node) (ast.Node, error) { if err != nil { return nil, err } - rt, err := parseRelationFromNodes(n.ReturnType.Names) - if err != nil { - return nil, err + var rt *ast.TypeName + if n.ReturnType != nil { + rel, err := parseRelationFromNodes(n.ReturnType.Names) + if err != nil { + return nil, err + } + rt = rel.TypeName() } stmt := &ast.CreateFunctionStmt{ Func: fn.FuncName(), - ReturnType: rt.TypeName(), + ReturnType: rt, Replace: n.Replace, Params: &ast.List{}, }