Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion internal/codegen/golang/mysql_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,20 @@ func mysqlType(r *compiler.Result, col *compiler.Column, settings config.Combine
}
return "sql.NullString"

case "int", "integer", "tinyint", "smallint", "mediumint", "year":
case "tinyint":
if col.Length != nil && *col.Length == 1 {
if notNull {
return "bool"
}
return "sql.NullBool"
} else {
if notNull {
return "int32"
}
return "sql.NullInt32"
}

case "int", "integer", "smallint", "mediumint", "year":
if notNull {
return "int32"
}
Expand Down
5 changes: 4 additions & 1 deletion internal/compiler/query.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package compiler

import "github.com/kyleconroy/sqlc/internal/sql/ast"
import (
"github.com/kyleconroy/sqlc/internal/sql/ast"
)

type Table struct {
Rel *ast.TableName
Expand All @@ -13,6 +15,7 @@ type Column struct {
NotNull bool
IsArray bool
Comment string
Length *int

// XXX: Figure out what PostgreSQL calls `foo.id`
Scope string
Expand Down
1 change: 1 addition & 0 deletions internal/compiler/query_catalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ func ConvertColumn(rel *ast.TableName, c *catalog.Column) *Column {
NotNull: c.IsNotNull,
IsArray: c.IsArray,
Type: &c.Type,
Length: c.Length,
}
}

Expand Down
29 changes: 29 additions & 0 deletions internal/endtoend/testdata/data_type_boolean/mysql/db/db.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions internal/endtoend/testdata/data_type_boolean/mysql/db/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 75 additions & 0 deletions internal/endtoend/testdata/data_type_boolean/mysql/db/query.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions internal/endtoend/testdata/data_type_boolean/mysql/query.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
CREATE TABLE foo
(
col_a BOOL NOT NULL,
col_b BOOLEAN NOT NULL,
col_c TINYINT(1) NOT NULL
);

-- name: ListFoo :many
SELECT * FROM foo;

CREATE TABLE bar
(
col_a BOOL,
col_b BOOLEAN,
col_c TINYINT(1)
);

-- name: ListBar :many
SELECT * FROM bar;
12 changes: 12 additions & 0 deletions internal/endtoend/testdata/data_type_boolean/mysql/sqlc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": "1",
"packages": [
{
"path": "db",
"engine": "mysql",
"schema": "query.sql",
"queries": "query.sql"
}
]
}

29 changes: 29 additions & 0 deletions internal/endtoend/testdata/data_type_boolean/postgresql/db/db.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions internal/endtoend/testdata/data_type_boolean/postgresql/query.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
CREATE TABLE foo
(
col_a BOOL NOT NULL,
col_b BOOLEAN NOT NULL
);

-- name: ListFoo :many
SELECT * FROM foo;

CREATE TABLE bar
(
col_a BOOL,
col_b BOOLEAN
);

-- name: ListBar :many
SELECT * FROM bar;
12 changes: 12 additions & 0 deletions internal/endtoend/testdata/data_type_boolean/postgresql/sqlc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": "1",
"packages": [
{
"path": "db",
"engine": "postgresql",
"schema": "query.sql",
"queries": "query.sql"
}
]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading