diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/db.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/db.go new file mode 100644 index 0000000000..3895084dc3 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.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/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/models.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/models.go new file mode 100644 index 0000000000..a695cb0722 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/models.go @@ -0,0 +1,21 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package querytest + +import ( + "github.com/google/uuid" +) + +type ChildPerson struct { + PartyID uuid.UUID + Name string + FirstName string + LastName string +} + +type ParentParty struct { + PartyID uuid.UUID + Name string +} diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/query.sql.go new file mode 100644 index 0000000000..77900b12cf --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/query.sql.go @@ -0,0 +1,63 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const getAllParties = `-- name: GetAllParties :many +SELECT party_id, name FROM parent.party +` + +func (q *Queries) GetAllParties(ctx context.Context) ([]ParentParty, error) { + rows, err := q.db.Query(ctx, getAllParties) + if err != nil { + return nil, err + } + defer rows.Close() + var items []ParentParty + for rows.Next() { + var i ParentParty + if err := rows.Scan(&i.PartyID, &i.Name); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const getAllPeople = `-- name: GetAllPeople :many +SELECT party_id, name, first_name, last_name FROM child.person +` + +func (q *Queries) GetAllPeople(ctx context.Context) ([]ChildPerson, error) { + rows, err := q.db.Query(ctx, getAllPeople) + if err != nil { + return nil, err + } + defer rows.Close() + var items []ChildPerson + for rows.Next() { + var i ChildPerson + if err := rows.Scan( + &i.PartyID, + &i.Name, + &i.FirstName, + &i.LastName, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql new file mode 100644 index 0000000000..cf26f5b25b --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql @@ -0,0 +1,6 @@ +-- name: GetAllParties :many +SELECT * FROM parent.party; + +-- name: GetAllPeople :many +SELECT * FROM child.person; + diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/schema.sql new file mode 100644 index 0000000000..03dc55d755 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/schema.sql @@ -0,0 +1,13 @@ +CREATE SCHEMA parent; +CREATE SCHEMA child; + +CREATE TABLE parent.party ( + party_id uuid PRIMARY KEY, + name text NOT NULL +); + +CREATE TABLE child.person ( + first_name text NOT NULL, + last_name text NOT NULL +) INHERITS (parent.party); + diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/sqlc.json b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/sqlc.json new file mode 100644 index 0000000000..d1244c9e7a --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/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/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/db.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/db.go new file mode 100644 index 0000000000..1e00549714 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.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/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/models.go new file mode 100644 index 0000000000..76111e1d6f --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/models.go @@ -0,0 +1,21 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package querytest + +import ( + "github.com/jackc/pgx/v5/pgtype" +) + +type ChildPerson struct { + PartyID pgtype.UUID + Name string + FirstName string + LastName string +} + +type ParentParty struct { + PartyID pgtype.UUID + Name string +} diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/query.sql.go new file mode 100644 index 0000000000..77900b12cf --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/query.sql.go @@ -0,0 +1,63 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const getAllParties = `-- name: GetAllParties :many +SELECT party_id, name FROM parent.party +` + +func (q *Queries) GetAllParties(ctx context.Context) ([]ParentParty, error) { + rows, err := q.db.Query(ctx, getAllParties) + if err != nil { + return nil, err + } + defer rows.Close() + var items []ParentParty + for rows.Next() { + var i ParentParty + if err := rows.Scan(&i.PartyID, &i.Name); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const getAllPeople = `-- name: GetAllPeople :many +SELECT party_id, name, first_name, last_name FROM child.person +` + +func (q *Queries) GetAllPeople(ctx context.Context) ([]ChildPerson, error) { + rows, err := q.db.Query(ctx, getAllPeople) + if err != nil { + return nil, err + } + defer rows.Close() + var items []ChildPerson + for rows.Next() { + var i ChildPerson + if err := rows.Scan( + &i.PartyID, + &i.Name, + &i.FirstName, + &i.LastName, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql new file mode 100644 index 0000000000..cf26f5b25b --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql @@ -0,0 +1,6 @@ +-- name: GetAllParties :many +SELECT * FROM parent.party; + +-- name: GetAllPeople :many +SELECT * FROM child.person; + diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/schema.sql new file mode 100644 index 0000000000..03dc55d755 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/schema.sql @@ -0,0 +1,13 @@ +CREATE SCHEMA parent; +CREATE SCHEMA child; + +CREATE TABLE parent.party ( + party_id uuid PRIMARY KEY, + name text NOT NULL +); + +CREATE TABLE child.person ( + first_name text NOT NULL, + last_name text NOT NULL +) INHERITS (parent.party); + diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/sqlc.json b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/sqlc.json new file mode 100644 index 0000000000..32ede07158 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/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/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/db.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/db.go new file mode 100644 index 0000000000..3b320aa168 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.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/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/models.go new file mode 100644 index 0000000000..a695cb0722 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/models.go @@ -0,0 +1,21 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package querytest + +import ( + "github.com/google/uuid" +) + +type ChildPerson struct { + PartyID uuid.UUID + Name string + FirstName string + LastName string +} + +type ParentParty struct { + PartyID uuid.UUID + Name string +} diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/query.sql.go new file mode 100644 index 0000000000..20f0a16369 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/query.sql.go @@ -0,0 +1,69 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const getAllParties = `-- name: GetAllParties :many +SELECT party_id, name FROM parent.party +` + +func (q *Queries) GetAllParties(ctx context.Context) ([]ParentParty, error) { + rows, err := q.db.QueryContext(ctx, getAllParties) + if err != nil { + return nil, err + } + defer rows.Close() + var items []ParentParty + for rows.Next() { + var i ParentParty + if err := rows.Scan(&i.PartyID, &i.Name); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const getAllPeople = `-- name: GetAllPeople :many +SELECT party_id, name, first_name, last_name FROM child.person +` + +func (q *Queries) GetAllPeople(ctx context.Context) ([]ChildPerson, error) { + rows, err := q.db.QueryContext(ctx, getAllPeople) + if err != nil { + return nil, err + } + defer rows.Close() + var items []ChildPerson + for rows.Next() { + var i ChildPerson + if err := rows.Scan( + &i.PartyID, + &i.Name, + &i.FirstName, + &i.LastName, + ); err != nil { + return nil, err + } + items = append(items, i) + } + 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/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql new file mode 100644 index 0000000000..cf26f5b25b --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql @@ -0,0 +1,6 @@ +-- name: GetAllParties :many +SELECT * FROM parent.party; + +-- name: GetAllPeople :many +SELECT * FROM child.person; + diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql new file mode 100644 index 0000000000..03dc55d755 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql @@ -0,0 +1,13 @@ +CREATE SCHEMA parent; +CREATE SCHEMA child; + +CREATE TABLE parent.party ( + party_id uuid PRIMARY KEY, + name text NOT NULL +); + +CREATE TABLE child.person ( + first_name text NOT NULL, + last_name text NOT NULL +) INHERITS (parent.party); + diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/sqlc.json b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/sqlc.json new file mode 100644 index 0000000000..f717ca2e66 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/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/sql/catalog/table.go b/internal/sql/catalog/table.go index dc30acfa1e..6b6add0768 100644 --- a/internal/sql/catalog/table.go +++ b/internal/sql/catalog/table.go @@ -267,10 +267,23 @@ func (c *Catalog) createTable(stmt *ast.CreateTableStmt) error { coltype := make(map[string]ast.TypeName) // used to check for duplicate column names seen := make(map[string]bool) // used to check for duplicate column names for _, inheritTable := range stmt.Inherits { - t, _, err := schema.getTable(inheritTable) + + var inheritTableSchema *Schema + if inheritTable.Schema == "" { + inheritTableSchema = schema + } else { + inheritSchema, err := c.getSchema(inheritTable.Schema) + if err != nil { + return err + } + inheritTableSchema = inheritSchema + } + + t, _, err := inheritTableSchema.getTable(inheritTable) if err != nil { return err } + // check and ignore duplicate columns for _, col := range t.Columns { if notNull, ok := seen[col.Name]; ok {