add support for GeometryCollection pt. 3

enginetest/enginetests.go

@@ -5613,6 +5613,9 @@ func TestColumnDefaults(t *testing.T, harness Harness) {
 		RunQuery(t, e, harness, "CREATE TABLE t34(pk INT PRIMARY KEY, v1 JSON)")
 		AssertErr(t, e, harness, "ALTER TABLE t34 alter column v1 set default '{}'", sql.ErrInvalidTextBlobColumnDefault)
 		RunQuery(t, e, harness, "ALTER TABLE t34 alter column v1 set default ('{}')")
+		RunQuery(t, e, harness, "CREATE TABLE t35(i int default 100, j JSON)")
+		AssertErr(t, e, harness, "ALTER TABLE t35 alter column j set default '[]'", sql.ErrInvalidTextBlobColumnDefault)
+		RunQuery(t, e, harness, "ALTER TABLE t35 alter column j set default ('[]')")
 	})
 
 	t.Run("Other types using NOW/CURRENT_TIMESTAMP literal", func(t *testing.T) {

enginetest/queries/queries.go

@@ -263,6 +263,7 @@ var SpatialQueryTests = []QueryTest{
 				{SRID: 4326, Lines: []sql.LineString{{SRID: 4326, Points: []sql.Point{{SRID: 4326, X: 0, Y: 0}, {SRID: 4326, X: 1.1, Y: 2.2}, {SRID: 4326, X: 3.3, Y: 4.4}, {SRID: 4326, X: 0, Y: 0}}}}},
 				{SRID: 4326, Lines: []sql.LineString{{SRID: 4326, Points: []sql.Point{{SRID: 4326, X: 1.1, Y: 1.1}, {SRID: 4326, X: 1.1, Y: 2.2}, {SRID: 4326, X: 3.3, Y: 4.4}, {SRID: 4326, X: 1.1, Y: 1.1}}}}},
 			}}},
+			{sql.GeomColl{SRID: 4326, Geoms: []sql.GeometryValue{sql.GeomColl{SRID: 4326, Geoms: []sql.GeometryValue{}}}}},
 		},
 	},
 	{
@@ -312,6 +313,7 @@ var SpatialQueryTests = []QueryTest{
 			{sql.JSONDocument{Val: map[string]interface{}{"type": "MultiPoint", "coordinates": [][2]float64{{1.23, 2.345}, {3.56789, 4.56}}}}},
 			{sql.JSONDocument{Val: map[string]interface{}{"type": "MultiLineString", "coordinates": [][][2]float64{{{1.1, 2.2}, {3.3, 4.4}}, {{5.5, 6.6}, {7.7, 8.8}}}}}},
 			{sql.JSONDocument{Val: map[string]interface{}{"type": "MultiPolygon", "coordinates": [][][][2]float64{{{{0, 0}, {1.1, 2.2}, {3.3, 4.4}, {0, 0}}}, {{{1.1, 1.1}, {1.1, 2.2}, {3.3, 4.4}, {1.1, 1.1}}}}}}},
+			{sql.JSONDocument{Val: map[string]interface{}{"type": "GeometryCollection", "geometries": []interface{}{map[string]interface{}{"type": "GeometryCollection", "geometries": []interface{}{}}}}}},
 		},
 	},
 	{
@@ -357,6 +359,12 @@ var SpatialQueryTests = []QueryTest{
 				{SRID: 4326, Lines: []sql.LineString{{SRID: 4326, Points: []sql.Point{{SRID: 4326, X: 1, Y: 1}, {SRID: 4326, X: 2, Y: 3}, {SRID: 4326, X: 4, Y: 5}, {SRID: 4326, X: 1, Y: 1}}}}}}}},
 		},
 	},
+	{
+		Query: `SELECT ST_GEOMFROMGEOJSON(ST_ASGEOJSON(g)) from geom_coll_table`,
+		Expected: []sql.Row{
+			{sql.GeomColl{SRID: 4326, Geoms: []sql.GeometryValue{sql.GeomColl{SRID: 4326, Geoms: []sql.GeometryValue{}}}}},
+		},
+	},
 	{
 		Query: `SELECT ST_DIMENSION(p) from point_table`,
 		Expected: []sql.Row{

enginetest/queries/script_queries.go

@@ -1999,6 +1999,24 @@ var ScriptTests = []ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "alter json column default; from scorewarrior: https://github.com/dolthub/dolt/issues/4543",
+		SetUpScript: []string{
+			"CREATE TABLE test (i int default 999, j json);",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "alter table test alter column j set default ('[]');",
+				Expected: []sql.Row{},
+			},
+			{
+				Query: "show create table test",
+				Expected: []sql.Row{
+					{"test", "CREATE TABLE `test` (\n  `i` int DEFAULT '999',\n  `j` json DEFAULT ('[]')\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"},
+				},
+			},
+		},
+	},
 	{
 		Name: "ALTER TABLE MULTI ADD/DROP COLUMN",
 		SetUpScript: []string{
@@ -2322,6 +2340,30 @@ var ScriptTests = []ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "can't create view with same name as existing table",
+		SetUpScript: []string{
+			"create table t (i int);",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:       "create view t as select 1 from dual",
+				ExpectedErr: sql.ErrTableAlreadyExists,
+			},
+		},
+	},
+	{
+		Name: "can't create table with same name as existing view",
+		SetUpScript: []string{
+			"create view t as select 1 from dual",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:       "create table t (i int);",
+				ExpectedErr: sql.ErrTableAlreadyExists,
+			},
+		},
+	},
 }
 
 var SpatialScriptTests = []ScriptTest{

enginetest/scriptgen/setup/scripts/spatial

@@ -13,7 +13,8 @@ insert into stringtogeojson_table values
         (6, '{"type": "MultiPoint", "coordinates": [[1,2],[3,4]]}'),
         (7, '{"type": "MultiPoint", "coordinates": [[1.23,2.345],[3.56789,4.56]]}'),
         (8, '{"type": "MultiLineString", "coordinates": [[[1.1,2.2],[3.3,4.4]],[[5.5,6.6],[7.7,8.8]]]}'),
-        (9, '{"type": "MultiPolygon", "coordinates": [[[[0.0, 0.0],[1.1,2.2],[3.3,4.4],[0.0,0.0]]],[[[1.1,1.1],[1.1,2.2],[3.3,4.4],[1.1,1.1]]]]}')
+        (9, '{"type": "MultiPolygon", "coordinates": [[[[0.0, 0.0],[1.1,2.2],[3.3,4.4],[0.0,0.0]]],[[[1.1,1.1],[1.1,2.2],[3.3,4.4],[1.1,1.1]]]]}'),
+        (10, '{"type": "GeometryCollection", "geometries": [{"type": "GeometryCollection", "geometries":[]}]}')
 ----
 
 exec

sql/analyzer/resolve_column_defaults.go

@@ -498,21 +498,25 @@ func resolveColumnDefaults(ctx *sql.Context, _ *Analyzer, n sql.Node, _ *Scope,
 			}
 			return node, identity, err
 		case *plan.AlterDefaultSet:
-			return transform.NodeExprs(n, func(e sql.Expression) (sql.Expression, transform.TreeIdentity, error) {
-				eWrapper, ok := e.(*expression.Wrapper)
-				if !ok {
-					return e, transform.SameTree, nil
-				}
-
-				table := getResolvedTable(node)
-				sch := table.Schema()
-				index := sch.IndexOfColName(node.ColumnName)
-
-				col := sch[index]
-				colIndex++
+			table := getResolvedTable(node)
+			sch := table.Schema()
+			index := sch.IndexOfColName(node.ColumnName)
+			col := sch[index]
+
+			eWrapper := expression.WrapExpression(node.Default)
+			newExpr, same, err := resolveColumnDefaultsOnWrapper(ctx, col, eWrapper)
+			if err != nil {
+				return node, transform.SameTree, err
+			}
+			if same {
+				return node, transform.SameTree, nil
+			}
 
-				return resolveColumnDefaultsOnWrapper(ctx, col, eWrapper)
-			})
+			newNode, err := node.WithDefault(newExpr)
+			if err != nil {
+				return node, transform.SameTree, err
+			}
+			return newNode, transform.NewTree, nil
 		case sql.SchemaTarget:
 			return transform.NodeExprs(n, func(e sql.Expression) (sql.Expression, transform.TreeIdentity, error) {
 				eWrapper, ok := e.(*expression.Wrapper)