From 3b47ec0427382a7e4cc49689e9327e69eccab1fc Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Tue, 4 May 2021 09:53:55 -0700 Subject: [PATCH] compiler: Find columns in default schemas --- internal/codegen/golang/sqlite_type.go | 41 ++++++++++++++++--- internal/compiler/resolve.go | 21 +++++++--- .../insert_values_public/mysql/go/db.go | 29 +++++++++++++ .../insert_values_public/mysql/go/models.go | 12 ++++++ .../mysql/go/query.sql.go | 23 +++++++++++ .../insert_values_public/mysql/query.sql | 4 ++ .../insert_values_public/mysql/sqlc.json | 12 ++++++ .../insert_values_public/postgresql/go/db.go | 29 +++++++++++++ .../postgresql/go/models.go | 12 ++++++ .../postgresql/go/query.sql.go | 23 +++++++++++ .../insert_values_public/postgresql/query.sql | 4 ++ .../insert_values_public/postgresql/sqlc.json | 12 ++++++ .../testdata/select_star/sqlite/go/models.go | 4 +- 13 files changed, 214 insertions(+), 12 deletions(-) create mode 100644 internal/endtoend/testdata/insert_values_public/mysql/go/db.go create mode 100644 internal/endtoend/testdata/insert_values_public/mysql/go/models.go create mode 100644 internal/endtoend/testdata/insert_values_public/mysql/go/query.sql.go create mode 100644 internal/endtoend/testdata/insert_values_public/mysql/query.sql create mode 100644 internal/endtoend/testdata/insert_values_public/mysql/sqlc.json create mode 100644 internal/endtoend/testdata/insert_values_public/postgresql/go/db.go create mode 100644 internal/endtoend/testdata/insert_values_public/postgresql/go/models.go create mode 100644 internal/endtoend/testdata/insert_values_public/postgresql/go/query.sql.go create mode 100644 internal/endtoend/testdata/insert_values_public/postgresql/query.sql create mode 100644 internal/endtoend/testdata/insert_values_public/postgresql/sqlc.json diff --git a/internal/codegen/golang/sqlite_type.go b/internal/codegen/golang/sqlite_type.go index 505a74740c..bb8fcc0735 100644 --- a/internal/codegen/golang/sqlite_type.go +++ b/internal/codegen/golang/sqlite_type.go @@ -9,16 +9,40 @@ import ( ) func sqliteType(r *compiler.Result, col *compiler.Column, settings config.CombinedSettings) string { - dt := col.DataType + dt := strings.ToLower(col.DataType) notNull := col.NotNull || col.IsArray switch dt { - case "integer": + case "int", "integer", "tinyint", "smallint", "mediumint", "bigint", "unsignedbigint", "int2", "int8", "numeric", "decimal": if notNull { - return "int32" + return "int64" } - return "sql.NullInt32" + return "sql.NullInt64" + + case "blob": + if notNull { + return "[]uint8" + } + return "*[]uint8" + + case "real", "double", "doubleprecision", "float": + if notNull { + return "float64" + } + return "sql.NullFloat64" + + case "boolean": + if notNull { + return "bool" + } + return "sql.NullBool" + + case "date", "datetime", "timestamp": + if notNull { + return "time.Time" + } + return "sql.NullTime" case "any": return "interface{}" @@ -27,7 +51,14 @@ func sqliteType(r *compiler.Result, col *compiler.Column, settings config.Combin switch { - case strings.HasPrefix(dt, "varchar"): + case strings.HasPrefix(dt, "character"), + strings.HasPrefix(dt, "varchar"), + strings.HasPrefix(dt, "varyingcharacter"), + strings.HasPrefix(dt, "nchar"), + strings.HasPrefix(dt, "nativecharacter"), + strings.HasPrefix(dt, "nvarchar"), + dt == "text", + dt == "clob": if notNull { return "string" } diff --git a/internal/compiler/resolve.go b/internal/compiler/resolve.go index e594f38ec9..33402cfc1d 100644 --- a/internal/compiler/resolve.go +++ b/internal/compiler/resolve.go @@ -37,13 +37,17 @@ func resolveCatalogRefs(c *catalog.Catalog, rvs []*ast.RangeVar, args []paramRef if defaultTable == nil { defaultTable = table.Rel } - if _, exists := typeMap[table.Rel.Schema]; !exists { - typeMap[table.Rel.Schema] = map[string]map[string]*catalog.Column{} + schema := table.Rel.Schema + if schema == "" { + schema = c.DefaultSchema } - typeMap[table.Rel.Schema][table.Rel.Name] = map[string]*catalog.Column{} + if _, exists := typeMap[schema]; !exists { + typeMap[schema] = map[string]map[string]*catalog.Column{} + } + typeMap[schema][table.Rel.Name] = map[string]*catalog.Column{} for _, c := range table.Columns { cc := c - typeMap[table.Rel.Schema][table.Rel.Name][c.Name] = cc + typeMap[schema][table.Rel.Name][c.Name] = cc } return nil } @@ -146,7 +150,11 @@ func resolveCatalogRefs(c *catalog.Catalog, rvs []*ast.RangeVar, args []paramRef var found int for _, table := range search { - if c, ok := typeMap[table.Schema][table.Name][key]; ok { + schema := table.Schema + if schema == "" { + schema = c.DefaultSchema + } + if c, ok := typeMap[schema][table.Name][key]; ok { found += 1 if ref.name != "" { key = ref.name @@ -308,6 +316,9 @@ func resolveCatalogRefs(c *catalog.Catalog, rvs []*ast.RangeVar, args []paramRef schema = fqn.Schema rel = fqn.Name } + if schema == "" { + schema = c.DefaultSchema + } if c, ok := typeMap[schema][rel][key]; ok { a = append(a, Parameter{ Number: ref.ref.Number, diff --git a/internal/endtoend/testdata/insert_values_public/mysql/go/db.go b/internal/endtoend/testdata/insert_values_public/mysql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/insert_values_public/mysql/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/insert_values_public/mysql/go/models.go b/internal/endtoend/testdata/insert_values_public/mysql/go/models.go new file mode 100644 index 0000000000..f5e6321432 --- /dev/null +++ b/internal/endtoend/testdata/insert_values_public/mysql/go/models.go @@ -0,0 +1,12 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + A sql.NullString + B sql.NullInt32 +} diff --git a/internal/endtoend/testdata/insert_values_public/mysql/go/query.sql.go b/internal/endtoend/testdata/insert_values_public/mysql/go/query.sql.go new file mode 100644 index 0000000000..bc4d34ca4a --- /dev/null +++ b/internal/endtoend/testdata/insert_values_public/mysql/go/query.sql.go @@ -0,0 +1,23 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const insertValues = `-- name: InsertValues :exec +INSERT INTO public.foo (a, b) VALUES (?, ?) +` + +type InsertValuesParams struct { + A sql.NullString + B sql.NullInt32 +} + +func (q *Queries) InsertValues(ctx context.Context, arg InsertValuesParams) error { + _, err := q.db.ExecContext(ctx, insertValues, arg.A, arg.B) + return err +} diff --git a/internal/endtoend/testdata/insert_values_public/mysql/query.sql b/internal/endtoend/testdata/insert_values_public/mysql/query.sql new file mode 100644 index 0000000000..3d101ce31e --- /dev/null +++ b/internal/endtoend/testdata/insert_values_public/mysql/query.sql @@ -0,0 +1,4 @@ +CREATE TABLE foo (a text, b integer); + +/* name: InsertValues :exec */ +INSERT INTO public.foo (a, b) VALUES (?, ?); diff --git a/internal/endtoend/testdata/insert_values_public/mysql/sqlc.json b/internal/endtoend/testdata/insert_values_public/mysql/sqlc.json new file mode 100644 index 0000000000..0657f4db83 --- /dev/null +++ b/internal/endtoend/testdata/insert_values_public/mysql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "engine": "mysql", + "path": "go", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/insert_values_public/postgresql/go/db.go b/internal/endtoend/testdata/insert_values_public/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/insert_values_public/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/insert_values_public/postgresql/go/models.go b/internal/endtoend/testdata/insert_values_public/postgresql/go/models.go new file mode 100644 index 0000000000..f5e6321432 --- /dev/null +++ b/internal/endtoend/testdata/insert_values_public/postgresql/go/models.go @@ -0,0 +1,12 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + A sql.NullString + B sql.NullInt32 +} diff --git a/internal/endtoend/testdata/insert_values_public/postgresql/go/query.sql.go b/internal/endtoend/testdata/insert_values_public/postgresql/go/query.sql.go new file mode 100644 index 0000000000..8b16b8e80c --- /dev/null +++ b/internal/endtoend/testdata/insert_values_public/postgresql/go/query.sql.go @@ -0,0 +1,23 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const insertValues = `-- name: InsertValues :exec +INSERT INTO public.foo (a, b) VALUES ($1, $2) +` + +type InsertValuesParams struct { + A sql.NullString + B sql.NullInt32 +} + +func (q *Queries) InsertValues(ctx context.Context, arg InsertValuesParams) error { + _, err := q.db.ExecContext(ctx, insertValues, arg.A, arg.B) + return err +} diff --git a/internal/endtoend/testdata/insert_values_public/postgresql/query.sql b/internal/endtoend/testdata/insert_values_public/postgresql/query.sql new file mode 100644 index 0000000000..01aa79ad19 --- /dev/null +++ b/internal/endtoend/testdata/insert_values_public/postgresql/query.sql @@ -0,0 +1,4 @@ +CREATE TABLE foo (a text, b integer); + +-- name: InsertValues :exec +INSERT INTO public.foo (a, b) VALUES ($1, $2); diff --git a/internal/endtoend/testdata/insert_values_public/postgresql/sqlc.json b/internal/endtoend/testdata/insert_values_public/postgresql/sqlc.json new file mode 100644 index 0000000000..de427d069f --- /dev/null +++ b/internal/endtoend/testdata/insert_values_public/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "engine": "postgresql", + "path": "go", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/select_star/sqlite/go/models.go b/internal/endtoend/testdata/select_star/sqlite/go/models.go index 4c02540e98..977f099b2f 100644 --- a/internal/endtoend/testdata/select_star/sqlite/go/models.go +++ b/internal/endtoend/testdata/select_star/sqlite/go/models.go @@ -7,8 +7,8 @@ import ( ) type User struct { - ID int32 + ID int64 FirstName string LastName sql.NullString - Age int32 + Age int64 }