Remove the deprecated mysql package (#793)

* mysql: Make dolphin the default, remove mysql:beta

* tests: s/mysql:beta/mysql/g

* Remove the deprecated MySQL package

Author: kyleconroy

examples/authors/sqlc.json

@@ -15,7 +15,7 @@
     {
       "schema": "mysql/schema.sql",
       "queries": "mysql/query.sql",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "gen": {
         "go": {
           "package": "authors",

examples/booktest/sqlc.json

@@ -13,7 +13,7 @@
       "path": "mysql",
       "schema": "mysql/schema.sql",
       "queries": "mysql/query.sql",
-      "engine": "mysql:beta"
+      "engine": "mysql"
     }
   ]
 }

examples/kotlin/sqlc.json

@@ -48,7 +48,7 @@
     {
       "schema": "src/main/resources/authors/mysql/schema.sql",
       "queries": "src/main/resources/authors/mysql/query.sql",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "gen": {
         "kotlin": {
           "out": "src/main/kotlin/com/example/authors/mysql",
@@ -59,7 +59,7 @@
     {
       "schema": "src/main/resources/booktest/mysql/schema.sql",
       "queries": "src/main/resources/booktest/mysql/query.sql",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "gen": {
         "kotlin": {
           "out": "src/main/kotlin/com/example/booktest/mysql",
@@ -70,7 +70,7 @@
     {
       "schema": "src/main/resources/ondeck/mysql/schema",
       "queries": "src/main/resources/ondeck/mysql/query",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "gen": {
         "kotlin": {
           "out": "src/main/kotlin/com/example/ondeck/mysql",

examples/ondeck/sqlc.json

@@ -16,7 +16,7 @@
       "name": "ondeck",
       "schema": "mysql/schema",
       "queries": "mysql/query",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "emit_json_tags": true,
       "emit_prepared_queries": true,
       "emit_interface": true

internal/cmd/generate.go

@@ -16,7 +16,6 @@ import (
 	"github.com/kyleconroy/sqlc/internal/config"
 	"github.com/kyleconroy/sqlc/internal/debug"
 	"github.com/kyleconroy/sqlc/internal/multierr"
-	"github.com/kyleconroy/sqlc/internal/mysql"
 	"github.com/kyleconroy/sqlc/internal/opts"
 )
 
@@ -147,32 +146,22 @@ func Generate(e Env, dir string, stderr io.Writer) (map[string]string, error) {
 			name = combo.Kotlin.Package
 		}
 
+		result, errored := parse(e, name, dir, sql.SQL, combo, parseOpts, stderr)
+		if errored {
+			break
+		}
+
 		var files map[string]string
 		var out string
-
-		// TODO: Note about how this will be going away
-		if sql.Engine == config.EngineMySQL {
-			result, errored := parseMySQL(e, name, dir, sql.SQL, combo, parseOpts, stderr)
-			if errored {
-				break
-			}
+		switch {
+		case sql.Gen.Go != nil:
 			out = combo.Go.Out
-			files, err = golang.DeprecatedGenerate(result, combo)
-		} else {
-			result, errored := parse(e, name, dir, sql.SQL, combo, parseOpts, stderr)
-			if errored {
-				break
-			}
-			switch {
-			case sql.Gen.Go != nil:
-				out = combo.Go.Out
-				files, err = golang.Generate(result, combo)
-			case sql.Gen.Kotlin != nil:
-				out = combo.Kotlin.Out
-				files, err = kotlin.Generate(result, combo)
-			default:
-				panic("missing language backend")
-			}
+			files, err = golang.Generate(result, combo)
+		case sql.Gen.Kotlin != nil:
+			out = combo.Kotlin.Out
+			files, err = kotlin.Generate(result, combo)
+		default:
+			panic("missing language backend")
 		}
 
 		if err != nil {
@@ -193,23 +182,6 @@ func Generate(e Env, dir string, stderr io.Writer) (map[string]string, error) {
 	return output, nil
 }
 
-// Experimental MySQL support
-func parseMySQL(e Env, name, dir string, sql config.SQL, combo config.CombinedSettings, parserOpts opts.Parser, stderr io.Writer) (golang.Generateable, bool) {
-	q, err := mysql.GeneratePkg(name, sql.Schema, sql.Queries, combo)
-	if err != nil {
-		fmt.Fprintf(stderr, "# package %s\n", name)
-		if parserErr, ok := err.(*multierr.Error); ok {
-			for _, fileErr := range parserErr.Errs() {
-				printFileErr(stderr, dir, fileErr)
-			}
-		} else {
-			fmt.Fprintf(stderr, "error parsing schema: %s\n", err)
-		}
-		return nil, true
-	}
-	return q, false
-}
-
 func parse(e Env, name, dir string, sql config.SQL, combo config.CombinedSettings, parserOpts opts.Parser, stderr io.Writer) (*compiler.Result, bool) {
 	c := compiler.NewCompiler(sql, combo)
 	if err := c.ParseCatalog(sql.Schema); err != nil {

internal/codegen/golang/gen.go

@@ -372,10 +372,6 @@ func (t *tmplCtx) OutputQuery(sourceName string) bool {
 	return t.SourceName == sourceName
 }
 
-func DeprecatedGenerate(r Generateable, settings config.CombinedSettings) (map[string]string, error) {
-	return generate(settings, r.Enums(settings), r.Structs(settings), r.GoQueries(settings))
-}
-
 func Generate(r *compiler.Result, settings config.CombinedSettings) (map[string]string, error) {
 	enums := buildEnums(r, settings)
 	structs := buildStructs(r, settings)

internal/codegen/golang/go_type.go

@@ -33,7 +33,7 @@ func goInnerType(r *compiler.Result, col *compiler.Column, settings config.Combi
 
 	// TODO: Extend the engine interface to handle types
 	switch settings.Package.Engine {
-	case config.EngineMySQL, config.EngineMySQLBeta:
+	case config.EngineMySQL:
 		return mysqlType(r, col, settings)
 	case config.EnginePostgreSQL:
 		return postgresType(r, col, settings)

internal/codegen/kotlin/gen.go

@@ -365,7 +365,7 @@ func makeType(r *compiler.Result, col *compiler.Column, settings config.Combined
 func ktInnerType(r *compiler.Result, col *compiler.Column, settings config.CombinedSettings) (string, bool) {
 	// TODO: Extend the engine interface to handle types
 	switch settings.Package.Engine {
-	case config.EngineMySQL, config.EngineMySQLBeta:
+	case config.EngineMySQL:
 		return mysqlType(r, col, settings)
 	case config.EnginePostgreSQL:
 		return postgresType(r, col, settings)

internal/compiler/engine.go

@@ -25,7 +25,7 @@ func NewCompiler(conf config.SQL, combo config.CombinedSettings) *Compiler {
 	case config.EngineXLemon:
 		c.parser = sqlite.NewParser()
 		c.catalog = catalog.New("main")
-	case config.EngineMySQL, config.EngineMySQLBeta:
+	case config.EngineMySQL:
 		c.parser = dolphin.NewParser()
 		c.catalog = dolphin.NewCatalog()
 	case config.EnginePostgreSQL:

internal/compiler/expand.go

@@ -39,7 +39,7 @@ func (c *Compiler) expand(qc *QueryCatalog, raw *ast.RawStmt) ([]source.Edit, er
 func (c *Compiler) quoteIdent(ident string) string {
 	if c.parser.IsReservedKeyword(ident) {
 		switch c.conf.Engine {
-		case config.EngineMySQL, config.EngineMySQLBeta:
+		case config.EngineMySQL:
 			return "`" + ident + "`"
 		default:
 			return "\"" + ident + "\""

internal/config/config.go

@@ -70,7 +70,6 @@ func (p *Paths) UnmarshalYAML(unmarshal func(interface{}) error) error {
 
 const (
 	EngineMySQL      Engine = "mysql"
-	EngineMySQLBeta  Engine = "mysql:beta"
 	EnginePostgreSQL Engine = "postgresql"
 
 	// Experimental engines

internal/endtoend/testdata/alias/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "query.sql",
       "queries": "query.sql"

internal/endtoend/testdata/column_as/mysql/sqlc.json

@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",

internal/endtoend/testdata/comment_syntax/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "query.sql",
       "queries": "query.sql"

internal/endtoend/testdata/create_table_like/mysql/sqlc.json

@@ -6,7 +6,7 @@
       "path": "go",
       "schema": "schema.sql",
       "queries": "query.sql",
-      "engine": "mysql:beta"
+      "engine": "mysql"
     }
   ]
 }

internal/endtoend/testdata/ddl_alter_table_column_drop_not_null/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "schema.sql",
       "queries": "query.sql"

internal/endtoend/testdata/ddl_alter_table_column_drop_not_null/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_alter_table_drop_column/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "schema.sql",
       "queries": "query.sql"

internal/endtoend/testdata/ddl_alter_table_drop_column/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_alter_table_drop_column_if_exists/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "schema.sql",
       "queries": "query.sql"

internal/endtoend/testdata/ddl_alter_table_drop_column_if_exists/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_alter_table_drop_constraint/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "schema.sql",
       "queries": "query.sql"

internal/endtoend/testdata/ddl_alter_table_drop_constraint/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_alter_table_rename/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "schema.sql",
       "queries": "query.sql"

internal/endtoend/testdata/ddl_alter_table_rename/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_alter_table_rename_column/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "schema.sql",
       "queries": "query.sql"

internal/endtoend/testdata/ddl_alter_table_rename_column/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_alter_table_set_data_type/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "schema.sql",
       "queries": "query.sql"

internal/endtoend/testdata/ddl_alter_table_set_data_type/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_alter_table_set_not_null/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "schema.sql",
       "queries": "query.sql"

internal/endtoend/testdata/ddl_alter_table_set_not_null/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_alter_table_set_schema/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_alter_type_add_value/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_alter_type_rename_value/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_comment/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "schema.sql",
       "queries": "query.sql"

internal/endtoend/testdata/ddl_comment/postgresql/sqlc.json

@@ -9,4 +9,4 @@
       "queries": "query.sql"
     }
   ]
-}
+}

internal/endtoend/testdata/ddl_create_enum/mysql/sqlc.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "path": "go",
-      "engine": "mysql:beta",
+      "engine": "mysql",
       "name": "querytest",
       "schema": "schema.sql",
       "queries": "query.sql"