diff --git a/enginetest/queries/create_table_queries.go b/enginetest/queries/create_table_queries.go index 48ba0b2d49..86dc268f71 100644 --- a/enginetest/queries/create_table_queries.go +++ b/enginetest/queries/create_table_queries.go @@ -837,7 +837,7 @@ var CreateTableScriptTests = []ScriptTest{ Query: "show create table t4;", Expected: []sql.Row{ {"t4", "CREATE TABLE `t4` (\n" + - " `(a.j + 1)` bigint\n" + + " `j + 1` bigint\n" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}, }, }, @@ -985,6 +985,28 @@ var CreateTableScriptTests = []ScriptTest{ }, }, }, + { + Name: "create table columns from aggregate functions", + SetUpScript: []string{ + "create table t1 (i int)", + "insert into t1 values (1)", + "create table t2 select sum(i), max(i), min(i), avg(i) from t1", + }, + Assertions: []ScriptTestAssertion{ + { + Query: "show create table t2;", + // TODO: MySQL column types are different https://github.com/dolthub/dolt/issues/9754 + Expected: []sql.Row{ + {"t2", "CREATE TABLE `t2` (\n" + + " `sum(i)` double NOT NULL,\n" + + " `max(i)` int NOT NULL,\n" + + " `min(i)` int NOT NULL,\n" + + " `avg(i)` double\n" + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}, + }, + }, + }, + }, } var CreateTableInSubroutineTests = []ScriptTest{ diff --git a/enginetest/queries/script_queries.go b/enginetest/queries/script_queries.go index b117ec2dcf..fa7e51438a 100644 --- a/enginetest/queries/script_queries.go +++ b/enginetest/queries/script_queries.go @@ -4693,7 +4693,7 @@ CREATE TABLE tab3 ( { Query: "select COLUMN_NAME, DATA_TYPE from INFORMATION_SCHEMA.COLUMNS where TABLE_NAME='c';", Expected: []sql.Row{ - {"coalesce(NULL,1)", "int"}, + {"coalesce(NULL, 1)", "int"}, }, }, }, diff --git a/go.mod b/go.mod index efb83dcebd..e6841f25b3 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/dolthub/go-icu-regex v0.0.0-20250820171420-f2b78f56ce9f 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-20250828224346-f347481664da + github.com/dolthub/vitess v0.0.0-20250829222523-5a45c06a7f3e github.com/go-sql-driver/mysql v1.7.2-0.20231213112541-0004702b931d github.com/gocraft/dbr/v2 v2.7.2 github.com/google/uuid v1.3.0 diff --git a/go.sum b/go.sum index ce35f545d8..1fd635d777 100644 --- a/go.sum +++ b/go.sum @@ -18,14 +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-20250730174048-497aebb8cea7 h1:l+mWO0xoh4eG1J9gMS87opL6N6WGAQitF36R/Lg4bWs= -github.com/dolthub/vitess v0.0.0-20250730174048-497aebb8cea7/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= -github.com/dolthub/vitess v0.0.0-20250813175212-45844169a751 h1:BBQKyvyODewdQxS+ICklMn1d/fFj2pVlkmMN1QFY4ms= -github.com/dolthub/vitess v0.0.0-20250813175212-45844169a751/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= -github.com/dolthub/vitess v0.0.0-20250814204310-c749d213f235 h1:uXrK+xn8rCwz/8jWDKaDyqZG1HbZI9F4V4HJ7zXFPMY= -github.com/dolthub/vitess v0.0.0-20250814204310-c749d213f235/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= -github.com/dolthub/vitess v0.0.0-20250828224346-f347481664da h1:8yD4o8bK8giyoJvjxYQ48mmNoBQ1WaBOUbIGhP3J0Ms= -github.com/dolthub/vitess v0.0.0-20250828224346-f347481664da/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= +github.com/dolthub/vitess v0.0.0-20250829222523-5a45c06a7f3e h1:foI0Zp8ydVabVyrJm30DbAxmHqjiA2rrQG+ZpahRQeU= +github.com/dolthub/vitess v0.0.0-20250829222523-5a45c06a7f3e/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= 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=