dolphin: Generate bools for tinyint(1)

kyleconroy · kyleconroy · commit f434868dce72 · 2021-01-31T18:16:29.000-08:00
diff --git a/internal/codegen/golang/mysql_type.go b/internal/codegen/golang/mysql_type.go
@@ -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"
 		}
diff --git a/internal/compiler/query.go b/internal/compiler/query.go
@@ -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
@@ -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
diff --git a/internal/compiler/query_catalog.go b/internal/compiler/query_catalog.go
@@ -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,
 	}
 }
 
diff --git a/internal/engine/dolphin/convert.go b/internal/engine/dolphin/convert.go
@@ -35,14 +35,19 @@ func (c *cc) convertAlterTableStmt(n *pcast.AlterTableStmt) ast.Node {
 		case pcast.AlterTableAddColumns:
 			for _, def := range spec.NewColumns {
 				name := def.Name.String()
+				columnDef := ast.ColumnDef{
+					Colname:   def.Name.String(),
+					TypeName:  &ast.TypeName{Name: types.TypeStr(def.Tp.Tp)},
+					IsNotNull: isNotNull(def),
+				}
+				if def.Tp.Flen >= 0 {
+					length := def.Tp.Flen
+					columnDef.Length = &length
+				}
 				alt.Cmds.Items = append(alt.Cmds.Items, &ast.AlterTableCmd{
 					Name:    &name,
 					Subtype: ast.AT_AddColumn,
-					Def: &ast.ColumnDef{
-						Colname:   def.Name.String(),
-						TypeName:  &ast.TypeName{Name: types.TypeStr(def.Tp.Tp)},
-						IsNotNull: isNotNull(def),
-					},
+					Def:     &columnDef,
 				})
 			}
 
@@ -60,18 +65,23 @@ func (c *cc) convertAlterTableStmt(n *pcast.AlterTableStmt) ast.Node {
 		case pcast.AlterTableModifyColumn:
 			for _, def := range spec.NewColumns {
 				name := def.Name.String()
+				columnDef := ast.ColumnDef{
+					Colname:   def.Name.String(),
+					TypeName:  &ast.TypeName{Name: types.TypeStr(def.Tp.Tp)},
+					IsNotNull: isNotNull(def),
+				}
+				if def.Tp.Flen >= 0 {
+					length := def.Tp.Flen
+					columnDef.Length = &length
+				}
 				alt.Cmds.Items = append(alt.Cmds.Items, &ast.AlterTableCmd{
 					Name:    &name,
 					Subtype: ast.AT_DropColumn,
 				})
 				alt.Cmds.Items = append(alt.Cmds.Items, &ast.AlterTableCmd{
 					Name:    &name,
 					Subtype: ast.AT_AddColumn,
-					Def: &ast.ColumnDef{
-						Colname:   def.Name.String(),
-						TypeName:  &ast.TypeName{Name: types.TypeStr(def.Tp.Tp)},
-						IsNotNull: isNotNull(def),
-					},
+					Def:     &columnDef,
 				})
 			}
 
@@ -224,13 +234,18 @@ func (c *cc) convertCreateTableStmt(n *pcast.CreateTableStmt) ast.Node {
 				}
 			}
 		}
-		create.Cols = append(create.Cols, &ast.ColumnDef{
+		columnDef := ast.ColumnDef{
 			Colname:   def.Name.String(),
 			TypeName:  &ast.TypeName{Name: types.TypeStr(def.Tp.Tp)},
 			IsNotNull: isNotNull(def),
 			Comment:   comment,
 			Vals:      vals,
-		})
+		}
+		if def.Tp.Flen >= 0 {
+			length := def.Tp.Flen
+			columnDef.Length = &length
+		}
+		create.Cols = append(create.Cols, &columnDef)
 	}
 	for _, opt := range n.Options {
 		switch opt.Tp {
diff --git a/internal/sql/ast/column_def.go b/internal/sql/ast/column_def.go
@@ -6,6 +6,7 @@ type ColumnDef struct {
 	IsNotNull bool
 	IsArray   bool
 	Vals      *List
+	Length    *int
 
 	// From pg.ColumnDef
 	Inhcount      int
diff --git a/internal/sql/catalog/catalog.go b/internal/sql/catalog/catalog.go
@@ -193,6 +193,7 @@ type Column struct {
 	IsNotNull bool
 	IsArray   bool
 	Comment   string
+	Length    *int
 }
 
 type Type interface {
diff --git a/internal/sql/catalog/table.go b/internal/sql/catalog/table.go
@@ -74,6 +74,7 @@ func (c *Catalog) alterTable(stmt *ast.AlterTableStmt) error {
 					Type:      *cmd.Def.TypeName,
 					IsNotNull: cmd.Def.IsNotNull,
 					IsArray:   cmd.Def.IsArray,
+					Length:    cmd.Def.Length,
 				})
 
 			case ast.AT_AlterColumnType:
@@ -160,6 +161,7 @@ func (c *Catalog) createTable(stmt *ast.CreateTableStmt) error {
 				IsNotNull: col.IsNotNull,
 				IsArray:   col.IsArray,
 				Comment:   col.Comment,
+				Length:    col.Length,
 			}
 			if col.Vals != nil {
 				typeName := ast.TypeName{

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ func ConvertColumn(rel ast.TableName, c catalog.Column) *Column {`
`52`	`52`	`NotNull: c.IsNotNull,`
`53`	`53`	`IsArray: c.IsArray,`
`54`	`54`	`Type: &c.Type,`
	`55`	`+ Length: c.Length,`
`55`	`56`	`}`
`56`	`57`	`}`
`57`	`58`
Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@ type Column struct {`
`193`	`193`	`IsNotNull bool`
`194`	`194`	`IsArray bool`
`195`	`195`	`Comment string`
	`196`	`+ Length *int`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`type Type interface {`