Merge branch 'james/mysql' of https://github.com/dolthub/go-mysql-server into james/mysql

James Cor · James Cor · commit 70bd258893db · 2024-12-02T12:27:27.000-08:00
diff --git a/enginetest/queries/information_schema_queries.go b/enginetest/queries/information_schema_queries.go
@@ -1815,11 +1815,11 @@ from information_schema.routines where routine_schema = 'mydb' and routine_type
 				Expected: []sql.Row{{"information_schema"}},
 			},
 			{
-				Query:    "create database information_schema;",
+				Query:       "create database information_schema;",
 				ExpectedErr: sql.ErrDatabaseExists,
 			},
 			{
-				Query:    "drop database information_schema;",
+				Query:          "drop database information_schema;",
 				ExpectedErrStr: "unable to drop database: information_schema",
 			},
 			{
diff --git a/enginetest/queries/mysql_db_queries.go b/enginetest/queries/mysql_db_queries.go
@@ -46,11 +46,11 @@ var MySqlDbTests = []ScriptTest{
 				Expected: []sql.Row{{"mysql"}},
 			},
 			{
-				Query:    "create database mysql;",
+				Query:       "create database mysql;",
 				ExpectedErr: sql.ErrDatabaseExists,
 			},
 			{
-				Query:    "drop database mysql;",
+				Query:          "drop database mysql;",
 				ExpectedErrStr: "unable to drop database: mysql",
 			},
 			{

Original file line number	Diff line number	Diff line change
`@@ -1815,11 +1815,11 @@ from information_schema.routines where routine_schema = 'mydb' and routine_type`
`1815`	`1815`	`Expected: []sql.Row{{"information_schema"}},`
`1816`	`1816`	`},`
`1817`	`1817`	`{`
`1818`		`- Query: "create database information_schema;",`
	`1818`	`+ Query: "create database information_schema;",`
`1819`	`1819`	`ExpectedErr: sql.ErrDatabaseExists,`
`1820`	`1820`	`},`
`1821`	`1821`	`{`
`1822`		`- Query: "drop database information_schema;",`
	`1822`	`+ Query: "drop database information_schema;",`
`1823`	`1823`	`ExpectedErrStr: "unable to drop database: information_schema",`
`1824`	`1824`	`},`
`1825`	`1825`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,11 @@ var MySqlDbTests = []ScriptTest{`
`46`	`46`	`Expected: []sql.Row{{"mysql"}},`
`47`	`47`	`},`
`48`	`48`	`{`
`49`		`- Query: "create database mysql;",`
	`49`	`+ Query: "create database mysql;",`
`50`	`50`	`ExpectedErr: sql.ErrDatabaseExists,`
`51`	`51`	`},`
`52`	`52`	`{`
`53`		`- Query: "drop database mysql;",`
	`53`	`+ Query: "drop database mysql;",`
`54`	`54`	`ExpectedErrStr: "unable to drop database: mysql",`
`55`	`55`	`},`
`56`	`56`	`{`