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

Author: angelamayxie

enginetest/queries/script_queries.go

@@ -13519,6 +13519,52 @@ var BrokenScriptTests = []ScriptTest{
 }
 
 var CreateDatabaseScripts = []ScriptTest{
+	{
+		// https://github.com/dolthub/dolt/pull/9830
+		Name: "CREATE SCHEMA without database selection falls back to CREATE DATABASE",
+		SetUpScript: []string{
+			"CREATE DATABASE tmp",
+			"USE tmp",
+		},
+		Dialect: "mysql",
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: "DROP DATABASE tmp",
+			},
+			{
+				Query:    "CREATE SCHEMA NewDatabase",
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
+			},
+			{
+				Query:    "SHOW DATABASES",
+				Expected: []sql.Row{{"NewDatabase"}, {"information_schema"}, {"mydb"}, {"mysql"}},
+			},
+			{
+				Query:    "USE NewDatabase",
+				Expected: []sql.Row{},
+			},
+			{
+				Query:    "SELECT DATABASE()",
+				Expected: []sql.Row{{"NewDatabase"}},
+			},
+			{
+				Query:    "CREATE TABLE test_table (id INT PRIMARY KEY)",
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 0}}},
+			},
+			{
+				Query:    "SHOW TABLES",
+				Expected: []sql.Row{{"test_table"}},
+			},
+			{
+				Query:    "USE mydb",
+				Expected: []sql.Row{},
+			},
+			{
+				Query:    "DROP DATABASE NewDatabase",
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
+			},
+		},
+	},
 	{
 		Name: "CREATE DATABASE and create table",
 		Assertions: []ScriptTestAssertion{

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/dolthub/go-icu-regex v0.0.0-20250916051405-78a38d478790
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
-	github.com/dolthub/vitess v0.0.0-20250915221346-753c44800850
+	github.com/dolthub/vitess v0.0.0-20250918181259-ed0e1c5cb192
 	github.com/go-sql-driver/mysql v1.9.3
 	github.com/gocraft/dbr/v2 v2.7.2
 	github.com/google/uuid v1.3.0
@@ -41,4 +41,4 @@ require (
 	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 )
 
-go 1.24.6
+go 1.25

go.sum

@@ -18,8 +18,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE
 github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
-github.com/dolthub/vitess v0.0.0-20250915221346-753c44800850 h1:QXkIRTquxaGUgKVHnKZxU+ikARdszUUDU6C9B/76+a0=
-github.com/dolthub/vitess v0.0.0-20250915221346-753c44800850/go.mod h1:tV3BrIVyDWVkkYy8dKt2o6hjJ89cHb5opY5FpCyhncQ=
+github.com/dolthub/vitess v0.0.0-20250918181259-ed0e1c5cb192 h1:s7Ghoy+x+C/spSjM5/w9MoMIIeXNcBY/fI2oHxWajLM=
+github.com/dolthub/vitess v0.0.0-20250918181259-ed0e1c5cb192/go.mod h1:8pvvk5OLaLN9LLxghyczUapn/97l+mBgIb10qC1LG84=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=

sql/rowexec/ddl.go

@@ -405,8 +405,18 @@ func (b *BaseBuilder) buildCreateDB(ctx *sql.Context, n *plan.CreateDB, row sql.
 
 func (b *BaseBuilder) buildCreateSchema(ctx *sql.Context, n *plan.CreateSchema, row sql.Row) (sql.RowIter, error) {
 	database := ctx.GetCurrentDatabase()
+
+	// If no database is selected, first try to fall back to CREATE DATABASE
+	// since CREATE SCHEMA is a synonym for CREATE DATABASE in MySQL
+	// https://dev.mysql.com/doc/refman/8.4/en/create-database.html
+	// TODO: For PostgreSQL, return an error if no database is selected.
 	if database == "" {
-		return nil, sql.ErrNoDatabaseSelected.New()
+		return b.buildCreateDB(ctx, &plan.CreateDB{
+			Catalog:     n.Catalog,
+			DbName:      n.DbName,
+			IfNotExists: n.IfNotExists,
+			Collation:   n.Collation,
+		}, row)
 	}
 
 	db, err := n.Catalog.Database(ctx, database)