Rename the _dolpin engine to mysql:beta

kyleconroy · kyleconroy · commit 399f4e46ae9b · 2020-08-03T09:56:51.000-07:00
diff --git a/examples/booktest/sqlc.json b/examples/booktest/sqlc.json
@@ -13,7 +13,7 @@
       "path": "mysql",
       "schema": "mysql/schema.sql",
       "queries": "mysql/query.sql",
-      "engine": "_dolphin"
+      "engine": "mysql:beta"
     }
   ]
 }
diff --git a/internal/codegen/golang/go_type.go b/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.EngineXDolphin:
+	case config.EngineMySQL, config.EngineMySQLBeta:
 		return mysqlType(r, col, settings)
 	case config.EnginePostgreSQL:
 		return postgresType(r, col, settings)
diff --git a/internal/compiler/engine.go b/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.EngineXDolphin:
+	case config.EngineMySQL, config.EngineMySQLBeta:
 		c.parser = dolphin.NewParser()
 		c.catalog = catalog.New("public") // TODO: What is the default database for MySQL?
 	case config.EnginePostgreSQL:
diff --git a/internal/compiler/expand.go b/internal/compiler/expand.go
@@ -42,7 +42,7 @@ func (c *Compiler) quoteIdent(ident string) string {
 	// TODO: Add a method to the parser / engine for this instead
 	if lang.IsReservedKeyword(ident) {
 		switch c.conf.Engine {
-		case config.EngineMySQL, config.EngineXDolphin:
+		case config.EngineMySQL, config.EngineMySQLBeta:
 			return "`" + ident + "`"
 		default:
 			return "\"" + ident + "\""
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -71,11 +71,11 @@ func (p *Paths) UnmarshalYAML(unmarshal func(interface{}) error) error {
 
 const (
 	EngineMySQL      Engine = "mysql"
+	EngineMySQLBeta  Engine = "mysql:beta"
 	EnginePostgreSQL Engine = "postgresql"
 
 	// Experimental engines
-	EngineXLemon   Engine = "_lemon"
-	EngineXDolphin Engine = "_dolphin"
+	EngineXLemon Engine = "_lemon"
 )
 
 type Config struct {
diff --git a/internal/endtoend/testdata/column_as/mysql/sqlc.json b/internal/endtoend/testdata/column_as/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/delete_from/mysql/sqlc.json b/internal/endtoend/testdata/delete_from/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/dolphin_errors/sqlc.json b/internal/endtoend/testdata/dolphin_errors/sqlc.json
@@ -6,7 +6,7 @@
       "path": "go",
       "schema": "schema.sql",
       "queries": "query",
-      "engine": "_dolphin"
+      "engine": "mysql:beta"
     }
   ]
 }
diff --git a/internal/endtoend/testdata/inflection/mysql/sqlc.json b/internal/endtoend/testdata/inflection/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/insert_select/mysql/sqlc.json b/internal/endtoend/testdata/insert_select/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/insert_values/mysql/sqlc.json b/internal/endtoend/testdata/insert_values/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/params_two/mysql/sqlc.json b/internal/endtoend/testdata/params_two/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/select_limit/mysql/sqlc.json b/internal/endtoend/testdata/select_limit/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/select_star/mysql/sqlc.json b/internal/endtoend/testdata/select_star/mysql/sqlc.json
@@ -6,7 +6,7 @@
       "path": "go",
       "schema": "schema.sql",
       "queries": "query.sql",
-      "engine": "_dolphin"
+      "engine": "mysql:beta"
     }
   ]
 }
diff --git a/internal/endtoend/testdata/sqlc_arg/mysql/sqlc.json b/internal/endtoend/testdata/sqlc_arg/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/star_expansion/mysql/sqlc.json b/internal/endtoend/testdata/star_expansion/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/star_expansion_join/mysql/sqlc.json b/internal/endtoend/testdata/star_expansion_join/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/star_expansion_reserved/mysql/sqlc.json b/internal/endtoend/testdata/star_expansion_reserved/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/star_expansion_subquery/mysql/sqlc.json b/internal/endtoend/testdata/star_expansion_subquery/mysql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/endtoend/testdata/update_set/myql/sqlc.json b/internal/endtoend/testdata/update_set/myql/sqlc.json
@@ -2,7 +2,7 @@
   "version": "1",
   "packages": [
     {
-      "engine": "_dolphin",
+      "engine": "mysql:beta",
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
diff --git a/internal/sql/rewrite/parameters.go b/internal/sql/rewrite/parameters.go
@@ -79,7 +79,7 @@ func NamedParameters(engine config.Engine, raw *ast.RawStmt) (*ast.RawStmt, map[
 			} else {
 				old = fmt.Sprintf("sqlc.arg(%s)", param)
 			}
-			if engine == config.EngineMySQL || engine == config.EngineXDolphin {
+			if engine == config.EngineMySQL || engine == config.EngineMySQLBeta {
 				replace = "?"
 			} else {
 				replace = fmt.Sprintf("$%d", args[param])

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"path": "mysql",`
`14`	`14`	`"schema": "mysql/schema.sql",`
`15`	`15`	`"queries": "mysql/query.sql",`
`16`		`- "engine": "_dolphin"`
	`16`	`+ "engine": "mysql:beta"`
`17`	`17`	`}`
`18`	`18`	`]`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"version": "1",`
`3`	`3`	`"packages": [`
`4`	`4`	`{`
`5`		`- "engine": "_dolphin",`
	`5`	`+ "engine": "mysql:beta",`
`6`	`6`	`"path": "go",`
`7`	`7`	`"name": "querytest",`
`8`	`8`	`"schema": "query.sql",`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"path": "go",`
`7`	`7`	`"schema": "schema.sql",`
`8`	`8`	`"queries": "query",`
`9`		`- "engine": "_dolphin"`
	`9`	`+ "engine": "mysql:beta"`
`10`	`10`	`}`
`11`	`11`	`]`
`12`	`12`	`}`