dolphin: Add ENUM() support (#676)

* dolphin: Add ENUM() support

* codegen: Only print warnings in debug mode

* dolphin: Unify enum names

Author: kyleconroy

examples/booktest/mysql/models.go

@@ -5,6 +5,8 @@ import (
 
 	"github.com/kyleconroy/sqlc/internal/compiler"
 	"github.com/kyleconroy/sqlc/internal/config"
+	"github.com/kyleconroy/sqlc/internal/debug"
+	"github.com/kyleconroy/sqlc/internal/sql/catalog"
 )
 
 func mysqlType(r *compiler.Result, col *compiler.Column, settings config.CombinedSettings) string {
@@ -69,7 +71,22 @@ func mysqlType(r *compiler.Result, col *compiler.Column, settings config.Combine
 		return "interface{}"
 
 	default:
-		log.Printf("unknown MySQL type: %s\n", columnType)
+		for _, schema := range r.Catalog.Schemas {
+			for _, typ := range schema.Types {
+				switch t := typ.(type) {
+				case *catalog.Enum:
+					if t.Name == columnType {
+						if schema.Name == r.Catalog.DefaultSchema {
+							return StructName(t.Name, settings)
+						}
+						return StructName(schema.Name+"_"+t.Name, settings)
+					}
+				}
+			}
+		}
+		if debug.Active {
+			log.Printf("Unknown MySQL type: %s\n", columnType)
+		}
 		return "interface{}"
 
 	}

examples/booktest/mysql/query.sql.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/kyleconroy/sqlc/internal/compiler"
 	"github.com/kyleconroy/sqlc/internal/config"
+	"github.com/kyleconroy/sqlc/internal/debug"
 	"github.com/kyleconroy/sqlc/internal/sql/catalog"
 )
 
@@ -166,8 +167,9 @@ func postgresType(r *compiler.Result, col *compiler.Column, settings config.Comb
 				}
 			}
 		}
-
-		log.Printf("unknown PostgreSQL type: %s\n", columnType)
+		if debug.Active {
+			log.Printf("unknown PostgreSQL type: %s\n", columnType)
+		}
 		return "interface{}"
 	}
 }

internal/codegen/golang/mysql_type.go

@@ -0,0 +1,2 @@
+/* name: ListFoo :many */
+SELECT * FROM foo;

internal/codegen/golang/postgresql_type.go

@@ -0,0 +1,3 @@
+CREATE TABLE foo (
+    foobar ENUM ('foo-a', 'foo_b', 'foo:c', 'foo/d', 'foo@e', 'foo+f', 'foo!g') NOT NULL
+);

internal/endtoend/testdata/enums/go/db.go renamed to internal/endtoend/testdata/ddl_create_enum/mysql/go/db.go

@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "mysql:beta",
+      "name": "querytest",
+      "schema": "schema.sql",
+      "queries": "query.sql"
+    }
+  ]
+}

internal/endtoend/testdata/enums/go/models.go renamed to internal/endtoend/testdata/ddl_create_enum/mysql/go/models.go

@@ -1,2 +1,2 @@
--- name: Placeholder :exec
-SELECT 1;
+-- name: ListFoo :many
+SELECT * FROM foo;

internal/endtoend/testdata/ddl_create_enum/mysql/go/query.sql.go

@@ -1 +1,13 @@
-CREATE TYPE status AS ENUM ('open', 'closed');
+CREATE TYPE foobar AS ENUM (
+    -- Valid separators
+    'foo-a',
+    'foo_b',
+    'foo:c',
+    'foo/d',
+    -- Strip unknown characters
+    'foo@e',
+    'foo+f',
+    'foo!g'
+);
+
+CREATE TABLE foo (val foobar NOT NULL);

internal/endtoend/testdata/ddl_create_enum/mysql/query.sql

@@ -2,6 +2,7 @@ package dolphin
 
 import (
 	"fmt"
+	"log"
 
 	pcast "github.com/pingcap/parser/ast"
 	"github.com/pingcap/parser/opcode"
@@ -172,6 +173,7 @@ func (c *cc) convertCreateTableStmt(n *pcast.CreateTableStmt) ast.Node {
 			TypeName:  &ast.TypeName{Name: types.TypeStr(def.Tp.Tp)},
 			IsNotNull: isNotNull(def),
 			Comment:   comment,
+			Vals:      vals,
 		})
 	}
 	for _, opt := range n.Options {
@@ -492,7 +494,7 @@ func (c *cc) convert(node pcast.Node) ast.Node {
 
 	default:
 		if debug.Active {
-			fmt.Printf("dolphin.convert: Unknown node type %T\n", n)
+			log.Printf("dolphin.convert: Unknown node type %T\n", n)
 		}
 		return &ast.TODO{}
 	}

internal/endtoend/testdata/ddl_create_enum/mysql/schema.sql

@@ -153,13 +153,24 @@ func (c *Catalog) createTable(stmt *ast.CreateTableStmt) error {
 		}
 	} else {
 		for _, col := range stmt.Cols {
-			tbl.Columns = append(tbl.Columns, &Column{
+			tc := &Column{
 				Name:      col.Colname,
 				Type:      *col.TypeName,
 				IsNotNull: col.IsNotNull,
 				IsArray:   col.IsArray,
 				Comment:   col.Comment,
-			})
+			}
+			if col.Vals != nil {
+				typeName := ast.TypeName{
+					Name: col.Colname,
+				}
+				s := &ast.CreateEnumStmt{TypeName: &typeName, Vals: col.Vals}
+				if err := c.createEnum(s); err != nil {
+					return err
+				}
+				tc.Type = typeName
+			}
+			tbl.Columns = append(tbl.Columns, tc)
 		}
 	}
 	schema.Tables = append(schema.Tables, &tbl)