From a515ec9f311d377d7f7aa40d84f173822caba09d Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Wed, 18 Nov 2020 21:42:29 -0800 Subject: [PATCH] dolphin: Represent tinyint as int32 --- internal/codegen/golang/mysql_type.go | 4 ++-- internal/endtoend/testdata/insert_select/mysql/go/models.go | 2 +- .../endtoend/testdata/insert_select/mysql/go/query.sql.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/codegen/golang/mysql_type.go b/internal/codegen/golang/mysql_type.go index 4be59fc7f6..15c5838e3a 100644 --- a/internal/codegen/golang/mysql_type.go +++ b/internal/codegen/golang/mysql_type.go @@ -21,7 +21,7 @@ func mysqlType(r *compiler.Result, col *compiler.Column, settings config.Combine } return "sql.NullString" - case "int", "integer", "smallint", "mediumint", "year": + case "int", "integer", "tinyint", "smallint", "mediumint", "year": if notNull { return "int32" } @@ -58,7 +58,7 @@ func mysqlType(r *compiler.Result, col *compiler.Column, settings config.Combine } return "sql.NullTime" - case "boolean", "bool", "tinyint": + case "boolean", "bool": if notNull { return "bool" } diff --git a/internal/endtoend/testdata/insert_select/mysql/go/models.go b/internal/endtoend/testdata/insert_select/mysql/go/models.go index b9f6dc7049..d216fceb7e 100644 --- a/internal/endtoend/testdata/insert_select/mysql/go/models.go +++ b/internal/endtoend/testdata/insert_select/mysql/go/models.go @@ -6,7 +6,7 @@ import () type Bar struct { Name string - Ready bool + Ready int32 } type Foo struct { diff --git a/internal/endtoend/testdata/insert_select/mysql/go/query.sql.go b/internal/endtoend/testdata/insert_select/mysql/go/query.sql.go index 1fa01b5816..e4457b6470 100644 --- a/internal/endtoend/testdata/insert_select/mysql/go/query.sql.go +++ b/internal/endtoend/testdata/insert_select/mysql/go/query.sql.go @@ -15,7 +15,7 @@ FROM bar WHERE ready = ? type InsertSelectParams struct { Meta string - Ready bool + Ready int32 } func (q *Queries) InsertSelect(ctx context.Context, arg InsertSelectParams) error {