diff --git a/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/go/db.go b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/go/db.go new file mode 100644 index 0000000000..4559f50a4f --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/go/db.go @@ -0,0 +1,30 @@ +// Code generated by sqlc. DO NOT EDIT. + +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/postgresql/pgx/go/models.go b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/go/models.go new file mode 100644 index 0000000000..b9f9b7bae1 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/go/models.go @@ -0,0 +1,27 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" + + "github.com/google/uuid" +) + +type Organisation struct { + PartyID uuid.UUID + Name string + LegalName sql.NullString +} + +type Party struct { + PartyID uuid.UUID + Name string +} + +type Person struct { + PartyID uuid.UUID + Name string + FirstName string + LastName string +} diff --git a/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/go/query.sql.go new file mode 100644 index 0000000000..bb2f4c7430 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/go/query.sql.go @@ -0,0 +1,85 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const getAllOrganisations = `-- name: GetAllOrganisations :many +SELECT party_id, name, legal_name FROM organisation +` + +func (q *Queries) GetAllOrganisations(ctx context.Context) ([]Organisation, error) { + rows, err := q.db.Query(ctx, getAllOrganisations) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Organisation + for rows.Next() { + var i Organisation + if err := rows.Scan(&i.PartyID, &i.Name, &i.LegalName); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const getAllParties = `-- name: GetAllParties :many +SELECT party_id, name FROM party +` + +func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) { + rows, err := q.db.Query(ctx, getAllParties) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Party + for rows.Next() { + var i Party + 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 person +` + +func (q *Queries) GetAllPeople(ctx context.Context) ([]Person, error) { + rows, err := q.db.Query(ctx, getAllPeople) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Person + for rows.Next() { + var i Person + 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/postgresql/pgx/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/query.sql new file mode 100644 index 0000000000..30adbd9aa1 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/query.sql @@ -0,0 +1,8 @@ +-- name: GetAllParties :many +SELECT * FROM party; + +-- name: GetAllPeople :many +SELECT * FROM person; + +-- name: GetAllOrganisations :many +SELECT * FROM organisation; diff --git a/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/schema.sql new file mode 100644 index 0000000000..3190f48f83 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/schema.sql @@ -0,0 +1,13 @@ +CREATE TABLE party ( + party_id uuid PRIMARY KEY, + name text NOT NULL +); + +CREATE TABLE person ( + first_name text NOT NULL, + last_name text NOT NULL +) INHERITS (party); + +CREATE TABLE organisation ( + legal_name text +) INHERITS (party); diff --git a/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/sqlc.json b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/sqlc.json new file mode 100644 index 0000000000..d1244c9e7a --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/pgx/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/postgresql/stdlib/go/db.go b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/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_inherits/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/go/models.go new file mode 100644 index 0000000000..b9f9b7bae1 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/go/models.go @@ -0,0 +1,27 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" + + "github.com/google/uuid" +) + +type Organisation struct { + PartyID uuid.UUID + Name string + LegalName sql.NullString +} + +type Party struct { + PartyID uuid.UUID + Name string +} + +type Person struct { + PartyID uuid.UUID + Name string + FirstName string + LastName string +} diff --git a/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/go/query.sql.go new file mode 100644 index 0000000000..886045b4f8 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/go/query.sql.go @@ -0,0 +1,94 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const getAllOrganisations = `-- name: GetAllOrganisations :many +SELECT party_id, name, legal_name FROM organisation +` + +func (q *Queries) GetAllOrganisations(ctx context.Context) ([]Organisation, error) { + rows, err := q.db.QueryContext(ctx, getAllOrganisations) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Organisation + for rows.Next() { + var i Organisation + if err := rows.Scan(&i.PartyID, &i.Name, &i.LegalName); 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 getAllParties = `-- name: GetAllParties :many +SELECT party_id, name FROM party +` + +func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) { + rows, err := q.db.QueryContext(ctx, getAllParties) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Party + for rows.Next() { + var i Party + 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 person +` + +func (q *Queries) GetAllPeople(ctx context.Context) ([]Person, error) { + rows, err := q.db.QueryContext(ctx, getAllPeople) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Person + for rows.Next() { + var i Person + 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/postgresql/stdlib/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/query.sql new file mode 100644 index 0000000000..30adbd9aa1 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/query.sql @@ -0,0 +1,8 @@ +-- name: GetAllParties :many +SELECT * FROM party; + +-- name: GetAllPeople :many +SELECT * FROM person; + +-- name: GetAllOrganisations :many +SELECT * FROM organisation; diff --git a/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/schema.sql new file mode 100644 index 0000000000..3190f48f83 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/schema.sql @@ -0,0 +1,13 @@ +CREATE TABLE party ( + party_id uuid PRIMARY KEY, + name text NOT NULL +); + +CREATE TABLE person ( + first_name text NOT NULL, + last_name text NOT NULL +) INHERITS (party); + +CREATE TABLE organisation ( + legal_name text +) INHERITS (party); diff --git a/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/sqlc.json b/internal/endtoend/testdata/ddl_create_table_inherits/postgresql/stdlib/sqlc.json new file mode 100644 index 0000000000..f717ca2e66 --- /dev/null +++ b/internal/endtoend/testdata/ddl_create_table_inherits/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/endtoend/testdata/ddl_create_table_partition/postgresql/pgx/go/models.go b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/pgx/go/models.go index a6e501eb11..82da8f5c84 100644 --- a/internal/endtoend/testdata/ddl_create_table_partition/postgresql/pgx/go/models.go +++ b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/pgx/go/models.go @@ -12,4 +12,6 @@ type Foo struct { } type Foo1 struct { + ID uuid.UUID + OtherID uuid.UUID } diff --git a/internal/endtoend/testdata/ddl_create_table_partition/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/stdlib/go/models.go index a6e501eb11..82da8f5c84 100644 --- a/internal/endtoend/testdata/ddl_create_table_partition/postgresql/stdlib/go/models.go +++ b/internal/endtoend/testdata/ddl_create_table_partition/postgresql/stdlib/go/models.go @@ -12,4 +12,6 @@ type Foo struct { } type Foo1 struct { + ID uuid.UUID + OtherID uuid.UUID } diff --git a/internal/engine/postgresql/parse.go b/internal/engine/postgresql/parse.go index 33cac214af..74bb5b685c 100644 --- a/internal/engine/postgresql/parse.go +++ b/internal/engine/postgresql/parse.go @@ -365,6 +365,15 @@ func translate(node *nodes.Node) (ast.Node, error) { Name: rel.TableName(), IfNotExists: n.IfNotExists, } + for _, node := range n.InhRelations { + switch item := node.Node.(type) { + case *nodes.Node_RangeVar: + if item.RangeVar.Inh { + rel := parseRelationFromRangeVar(item.RangeVar) + create.Inherits = append(create.Inherits, rel.TableName()) + } + } + } primaryKey := make(map[string]bool) for _, elt := range n.TableElts { switch item := elt.Node.(type) { diff --git a/internal/sql/ast/create_table_stmt.go b/internal/sql/ast/create_table_stmt.go index 96512ea3fa..7273ffa852 100644 --- a/internal/sql/ast/create_table_stmt.go +++ b/internal/sql/ast/create_table_stmt.go @@ -6,6 +6,7 @@ type CreateTableStmt struct { Cols []*ColumnDef ReferTable *TableName Comment string + Inherits []*TableName } func (n *CreateTableStmt) Pos() int { diff --git a/internal/sql/catalog/table.go b/internal/sql/catalog/table.go index a91404c8d8..283e169a72 100644 --- a/internal/sql/catalog/table.go +++ b/internal/sql/catalog/table.go @@ -139,6 +139,13 @@ func (c *Catalog) createTable(stmt *ast.CreateTableStmt) error { } tbl := Table{Rel: stmt.Name, Comment: stmt.Comment} + for _, inheritTable := range stmt.Inherits { + t, _, err := schema.getTable(inheritTable) + if err != nil { + return err + } + tbl.Columns = append(tbl.Columns, t.Columns...) + } if stmt.ReferTable != nil && len(stmt.Cols) != 0 { return errors.New("create table node cannot have both a ReferTable and Cols")