From 73e5bc7b4a3162f2d14e7174904a00561f23aa97 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Sat, 2 May 2020 16:29:56 -0700 Subject: [PATCH] postgresql: Fix panic walking CreateTableAsStmt --- .../testdata/materialized_views/go/db.go | 29 +++++++++++++++++++ .../testdata/materialized_views/go/models.go | 14 +++++++++ .../testdata/materialized_views/query.sql | 11 +++++++ .../testdata/materialized_views/sqlc.json | 9 ++++++ internal/postgresql/ast/soup.go | 4 ++- 5 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 internal/endtoend/testdata/materialized_views/go/db.go create mode 100644 internal/endtoend/testdata/materialized_views/go/models.go create mode 100644 internal/endtoend/testdata/materialized_views/query.sql create mode 100644 internal/endtoend/testdata/materialized_views/sqlc.json diff --git a/internal/endtoend/testdata/materialized_views/go/db.go b/internal/endtoend/testdata/materialized_views/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/materialized_views/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/materialized_views/go/models.go b/internal/endtoend/testdata/materialized_views/go/models.go new file mode 100644 index 0000000000..41ff924fa5 --- /dev/null +++ b/internal/endtoend/testdata/materialized_views/go/models.go @@ -0,0 +1,14 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Author struct { + ID int64 + Name string + Bio sql.NullString + Gender sql.NullInt32 +} diff --git a/internal/endtoend/testdata/materialized_views/query.sql b/internal/endtoend/testdata/materialized_views/query.sql new file mode 100644 index 0000000000..f14191f894 --- /dev/null +++ b/internal/endtoend/testdata/materialized_views/query.sql @@ -0,0 +1,11 @@ +CREATE TABLE authors ( + id BIGSERIAL PRIMARY KEY, + name TEXT NOT NULL, + bio TEXT +); + +ALTER TABLE authors ADD COLUMN gender INTEGER NULL; + +CREATE MATERIALIZED VIEW authors_names as SELECT name from authors; + +SELECT * FROM authors; diff --git a/internal/endtoend/testdata/materialized_views/sqlc.json b/internal/endtoend/testdata/materialized_views/sqlc.json new file mode 100644 index 0000000000..1161aac713 --- /dev/null +++ b/internal/endtoend/testdata/materialized_views/sqlc.json @@ -0,0 +1,9 @@ +{ + "version": "1", + "packages": [{ + "path": "go", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + }] +} diff --git a/internal/postgresql/ast/soup.go b/internal/postgresql/ast/soup.go index a662e6f9a1..b6c4935117 100644 --- a/internal/postgresql/ast/soup.go +++ b/internal/postgresql/ast/soup.go @@ -496,7 +496,9 @@ func Walk(f Visitor, node nodes.Node) { case nodes.CreateTableAsStmt: walkn(f, n.Query) - walkn(f, n.Into) + if n.Into != nil { + walkn(f, *n.Into) + } case nodes.CreateTableSpaceStmt: if n.Owner != nil {