Merge pull request #704 from erizocosmico/fix/type-display-name

sql: use correct MySQL display name for types

Author: erizocosmico

_integration/go/mysql_test.go

@@ -82,7 +82,7 @@ func TestGrafana(t *testing.T) {
 				{"name", "TEXT"},
 				{"email", "TEXT"},
 				{"phone_numbers", "JSON"},
-				{"created_at", "TIMESTAMP"},
+				{"created_at", "DATETIME"},
 			},
 		},
 		{

engine_test.go

@@ -694,7 +694,7 @@ var queries = []struct {
 		`,
 		[]sql.Row{
 			{"s", "TEXT"},
-			{"i", "INT64"},
+			{"i", "BIGINT"},
 		},
 	},
 	{

sql/information_schema.go

@@ -214,27 +214,27 @@ func columnsRowIter(cat *Catalog) RowIter {
 					collName = "utf8_bin"
 				}
 				rows = append(rows, Row{
-					"def",           // table_catalog
-					db.Name(),       // table_schema
-					t.Name(),        // table_name
-					c.Name,          // column_name
-					uint64(i),       // ordinal_position
-					c.Default,       // column_default
-					nullable,        // is_nullable
-					c.Type.String(), // data_type
-					nil,             // character_maximum_length
-					nil,             // character_octet_length
-					nil,             // numeric_precision
-					nil,             // numeric_scale
-					nil,             // datetime_precision
-					charName,        // character_set_name
-					collName,        // collation_name
-					c.Type.String(), // column_type
-					"",              // column_key
-					"",              // extra
-					"select",        // privileges
-					"",              // column_comment
-					"",              // generation_expression
+					"def",                 // table_catalog
+					db.Name(),             // table_schema
+					t.Name(),              // table_name
+					c.Name,                // column_name
+					uint64(i),             // ordinal_position
+					c.Default,             // column_default
+					nullable,              // is_nullable
+					MySQLTypeName(c.Type), // data_type
+					nil,                   // character_maximum_length
+					nil,                   // character_octet_length
+					nil,                   // numeric_precision
+					nil,                   // numeric_scale
+					nil,                   // datetime_precision
+					charName,              // character_set_name
+					collName,              // collation_name
+					MySQLTypeName(c.Type), // column_type
+					"",                    // column_key
+					"",                    // extra
+					"select",              // privileges
+					"",                    // column_comment
+					"",                    // generation_expression
 				})
 			}
 		}

sql/plan/describe.go

@@ -70,7 +70,7 @@ func (i *describeIter) Next() (sql.Row, error) {
 
 	f := i.schema[i.i]
 	i.i++
-	return sql.NewRow(f.Name, f.Type.Type().String()), nil
+	return sql.NewRow(f.Name, sql.MySQLTypeName(f.Type)), nil
 }
 
 func (i *describeIter) Close() error {

sql/plan/describe_test.go

@@ -30,7 +30,7 @@ func TestDescribe(t *testing.T) {
 
 	n, err = iter.Next()
 	require.NoError(err)
-	require.Equal(sql.NewRow("c2", "INT32"), n)
+	require.Equal(sql.NewRow("c2", "INTEGER"), n)
 
 	n, err = iter.Next()
 	require.Equal(io.EOF, err)

sql/plan/show_create_table.go

@@ -2,10 +2,11 @@ package plan
 
 import (
 	"fmt"
-	"gopkg.in/src-d/go-mysql-server.v0/internal/similartext"
 	"io"
 	"strings"
 
+	"gopkg.in/src-d/go-mysql-server.v0/internal/similartext"
+
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
 )
 
@@ -80,43 +81,42 @@ func (i *showCreateTablesIter) Next() (sql.Row, error) {
 	composedCreateTableStatement := produceCreateStatement(table)
 
 	return sql.NewRow(
-		i.table, // "Table" string
+		i.table,                      // "Table" string
 		composedCreateTableStatement, // "Create Table" string
 	), nil
 }
 
 func produceCreateStatement(table sql.Table) string {
 	schema := table.Schema()
-	colCreateStatements := make([]string, len(schema))
+	colStmts := make([]string, len(schema))
 
 	// Statement creation parts for each column
-	for indx, col := range schema {
-		createStmtPart := fmt.Sprintf("  `%s` %s", col.Name,
-			strings.ToLower(col.Type.Type().String()))
+	for i, col := range schema {
+		stmt := fmt.Sprintf("  `%s` %s", col.Name, sql.MySQLTypeName(col.Type))
 
 		if !col.Nullable {
-			createStmtPart = fmt.Sprintf("%s NOT NULL", createStmtPart)
+			stmt = fmt.Sprintf("%s NOT NULL", stmt)
 		}
 
 		switch def := col.Default.(type) {
 		case string:
 			if def != "" {
-				createStmtPart = fmt.Sprintf("%s DEFAULT %s", createStmtPart, def)
+				stmt = fmt.Sprintf("%s DEFAULT %q", stmt, def)
 			}
 		default:
 			if def != nil {
-				createStmtPart = fmt.Sprintf("%s DEFAULT %v", createStmtPart, col.Default)
+				stmt = fmt.Sprintf("%s DEFAULT %v", stmt, col.Default)
 			}
 		}
 
-		colCreateStatements[indx] = createStmtPart
+		colStmts[i] = stmt
 	}
 
-	prettyColCreateStmts := strings.Join(colCreateStatements, ",\n")
-	composedCreateTableStatement :=
-		fmt.Sprintf("CREATE TABLE `%s` (\n%s\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", table.Name(), prettyColCreateStmts)
-
-	return composedCreateTableStatement
+	return fmt.Sprintf(
+		"CREATE TABLE `%s` (\n%s\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4",
+		table.Name(),
+		strings.Join(colStmts, ",\n"),
+	)
 }
 
 func (i *showCreateTablesIter) Close() error {

sql/plan/show_create_table_test.go

@@ -18,7 +18,7 @@ func TestShowCreateTable(t *testing.T) {
 		sql.Schema{
 			&sql.Column{Name: "baz", Type: sql.Text, Default: "", Nullable: false},
 			&sql.Column{Name: "zab", Type: sql.Int32, Default: int32(0), Nullable: true},
-			&sql.Column{Name: "bza", Type: sql.Int64, Default: int64(0), Nullable: true},
+			&sql.Column{Name: "bza", Type: sql.Uint64, Default: uint64(0), Nullable: true},
 		})
 
 	db.AddTable(table.Name(), table)
@@ -37,9 +37,9 @@ func TestShowCreateTable(t *testing.T) {
 
 	expected := sql.NewRow(
 		table.Name(),
-		"CREATE TABLE `test-table` (\n  `baz` text NOT NULL,\n"+
-			"  `zab` int32 DEFAULT 0,\n"+
-			"  `bza` int64 DEFAULT 0\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4",
+		"CREATE TABLE `test-table` (\n  `baz` TEXT NOT NULL,\n"+
+			"  `zab` INTEGER DEFAULT 0,\n"+
+			"  `bza` BIGINT UNSIGNED DEFAULT 0\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4",
 	)
 
 	require.Equal(expected, row)

sql/type.go

@@ -875,3 +875,43 @@ func NumColumns(t Type) int {
 	}
 	return len(v)
 }
+
+// MySQLTypeName returns the MySQL display name for the given type.
+func MySQLTypeName(t Type) string {
+	switch t.Type() {
+	case sqltypes.Int8:
+		return "TINYINT"
+	case sqltypes.Uint8:
+		return "TINYINT UNSIGNED"
+	case sqltypes.Int16:
+		return "SMALLINT"
+	case sqltypes.Uint16:
+		return "SMALLINT UNSIGNED"
+	case sqltypes.Int32:
+		return "INTEGER"
+	case sqltypes.Int64:
+		return "BIGINT"
+	case sqltypes.Uint32:
+		return "INTEGER UNSIGNED"
+	case sqltypes.Uint64:
+		return "BIGINT UNSIGNED"
+	case sqltypes.Float32:
+		return "FLOAT"
+	case sqltypes.Float64:
+		return "DOUBLE"
+	case sqltypes.Timestamp:
+		return "DATETIME"
+	case sqltypes.Date:
+		return "DATE"
+	case sqltypes.Text, sqltypes.VarChar:
+		return "TEXT"
+	case sqltypes.Bit:
+		return "BIT"
+	case sqltypes.TypeJSON:
+		return "JSON"
+	case sqltypes.Blob:
+		return "BLOB"
+	default:
+		return "UNKNOWN"
+	}
+}