feat(mysql): Support unsigned integers (#1746)

* config: Target overrides at unsigned columns

---------

Co-authored-by: Kyle Conroy <kyle@conroy.org>

Author: roccoblues

examples/ondeck/mysql/db_test.go

@@ -65,7 +65,7 @@ func runOnDeckQueries(t *testing.T, q *Queries) {
 		t.Fatal(err)
 	}
 
-	if diff := cmp.Diff(venue.ID, venueID); diff != "" {
+	if diff := cmp.Diff(venue.ID, uint64(venueID)); diff != "" {
 		t.Errorf("venue ID mismatch:\n%s", diff)
 	}
 

examples/ondeck/mysql/models.go

@@ -37,6 +37,7 @@ func pluginOverride(r *compiler.Result, o config.Override) *plugin.Override {
 		CodeType:   "", // FIXME
 		DbType:     o.DBType,
 		Nullable:   o.Nullable,
+		Unsigned:   o.Unsigned,
 		Column:     o.Column,
 		ColumnName: column,
 		Table:      &table,
@@ -166,10 +167,11 @@ func pluginCatalog(c *catalog.Catalog) *plugin.Catalog {
 						Schema:  c.Type.Schema,
 						Name:    c.Type.Name,
 					},
-					Comment: c.Comment,
-					NotNull: c.IsNotNull,
-					IsArray: c.IsArray,
-					Length:  int32(l),
+					Comment:  c.Comment,
+					NotNull:  c.IsNotNull,
+					Unsigned: c.IsUnsigned,
+					IsArray:  c.IsArray,
+					Length:   int32(l),
 					Table: &plugin.Identifier{
 						Catalog: t.Rel.Catalog,
 						Schema:  t.Rel.Schema,
@@ -246,6 +248,7 @@ func pluginQueryColumn(c *compiler.Column) *plugin.Column {
 		OriginalName: c.OriginalName,
 		Comment:      c.Comment,
 		NotNull:      c.NotNull,
+		Unsigned:     c.Unsigned,
 		IsArray:      c.IsArray,
 		Length:       int32(l),
 		IsNamedParam: c.IsNamedParam,

internal/cmd/shim.go

@@ -60,7 +60,7 @@ func goInnerType(req *plugin.CodeGenRequest, col *plugin.Column) string {
 		if oride.GoType.TypeName == "" {
 			continue
 		}
-		if oride.DbType != "" && oride.DbType == columnType && oride.Nullable != notNull {
+		if oride.DbType != "" && oride.DbType == columnType && oride.Nullable != notNull && oride.Unsigned == col.Unsigned {
 			return oride.GoType.TypeName
 		}
 	}

internal/codegen/golang/go_type.go

@@ -11,6 +11,7 @@ import (
 func mysqlType(req *plugin.CodeGenRequest, col *plugin.Column) string {
 	columnType := sdk.DataType(col.Type)
 	notNull := col.NotNull || col.IsArray
+	unsigned := col.Unsigned
 
 	switch columnType {
 
@@ -28,19 +29,28 @@ func mysqlType(req *plugin.CodeGenRequest, col *plugin.Column) string {
 			return "sql.NullBool"
 		} else {
 			if notNull {
+				if unsigned {
+					return "uint32"
+				}
 				return "int32"
 			}
 			return "sql.NullInt32"
 		}
 
 	case "int", "integer", "smallint", "mediumint", "year":
 		if notNull {
+			if unsigned {
+				return "uint32"
+			}
 			return "int32"
 		}
 		return "sql.NullInt32"
 
 	case "bigint":
 		if notNull {
+			if unsigned {
+				return "uint64"
+			}
 			return "int64"
 		}
 		return "sql.NullInt64"

internal/codegen/golang/mysql_type.go

@@ -26,12 +26,13 @@ func (c *Compiler) OutputColumns(stmt ast.Node) ([]*catalog.Column, error) {
 	catCols := make([]*catalog.Column, 0, len(cols))
 	for _, col := range cols {
 		catCols = append(catCols, &catalog.Column{
-			Name:      col.Name,
-			Type:      ast.TypeName{Name: col.DataType},
-			IsNotNull: col.NotNull,
-			IsArray:   col.IsArray,
-			Comment:   col.Comment,
-			Length:    col.Length,
+			Name:       col.Name,
+			Type:       ast.TypeName{Name: col.DataType},
+			IsNotNull:  col.NotNull,
+			IsUnsigned: col.Unsigned,
+			IsArray:    col.IsArray,
+			Comment:    col.Comment,
+			Length:     col.Length,
 		})
 	}
 	return catCols, nil
@@ -256,6 +257,7 @@ func outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, error) {
 							TableAlias:   t.Rel.Name,
 							DataType:     c.DataType,
 							NotNull:      c.NotNull,
+							Unsigned:     c.Unsigned,
 							IsArray:      c.IsArray,
 							Length:       c.Length,
 						})
@@ -548,15 +550,16 @@ func outputColumnRefs(res *ast.ResTarget, tables []*Table, node *ast.ColumnRef)
 
 				cols = append(cols, &Column{
 					Name:         cname,
-					OriginalName: c.Name,
 					Type:         c.Type,
 					Table:        c.Table,
 					TableAlias:   alias,
 					DataType:     c.DataType,
 					NotNull:      c.NotNull,
+					Unsigned:     c.Unsigned,
 					IsArray:      c.IsArray,
 					Length:       c.Length,
 					EmbedTable:   c.EmbedTable,
+					OriginalName: c.Name,
 				})
 			}
 		}

internal/compiler/output_columns.go

@@ -19,6 +19,7 @@ type Column struct {
 	OriginalName string
 	DataType     string
 	NotNull      bool
+	Unsigned     bool
 	IsArray      bool
 	Comment      string
 	Length       *int

internal/compiler/query.go

@@ -56,6 +56,7 @@ func ConvertColumn(rel *ast.TableName, c *catalog.Column) *Column {
 		Name:     c.Name,
 		DataType: dataType(&c.Type),
 		NotNull:  c.IsNotNull,
+		Unsigned: c.IsUnsigned,
 		IsArray:  c.IsArray,
 		Type:     &c.Type,
 		Length:   c.Length,

internal/compiler/query_catalog.go

@@ -215,6 +215,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 								OriginalName: c.Name,
 								DataType:     dataType(&c.Type),
 								NotNull:      p.NotNull(),
+								Unsigned:     c.IsUnsigned,
 								IsArray:      c.IsArray,
 								Length:       c.Length,
 								Table:        table,
@@ -274,6 +275,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 							Name:         p.Name(),
 							DataType:     dataType(&c.Type),
 							NotNull:      p.NotNull(),
+							Unsigned:     c.IsUnsigned,
 							IsArray:      c.IsArray,
 							Table:        table,
 							IsNamedParam: isNamed,
@@ -553,6 +555,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 								Name:         p.Name(),
 								DataType:     dataType(&c.Type),
 								NotNull:      c.IsNotNull,
+								Unsigned:     c.IsUnsigned,
 								IsArray:      c.IsArray,
 								Table:        table,
 								IsNamedParam: isNamed,

internal/compiler/resolve.go

@@ -24,8 +24,12 @@ type Override struct {
 	// for global overrides only when two different engines are in use
 	Engine Engine `json:"engine,omitempty" yaml:"engine"`
 
-	// True if the GoType should override if the maching postgres type is nullable
+	// True if the GoType should override if the matching type is nullable
 	Nullable bool `json:"nullable" yaml:"nullable"`
+
+	// True if the GoType should override if the matching type is unsiged.
+	Unsigned bool `json:"unsigned" yaml:"unsigned"`
+
 	// Deprecated. Use the `nullable` property instead
 	Deprecated_Null bool `json:"null" yaml:"null"`