Skip to content

Commit dcd6eb1

Browse files
authored
Merge pull request #2802 from dolthub/fulghum-0adf0e2d
[auto-bump] [no-release-notes] dependency by fulghum
2 parents 09da6c3 + b5ee4db commit dcd6eb1

3 files changed

Lines changed: 41 additions & 6 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ require (
66
github.com/PuerkitoBio/goquery v1.8.1
77
github.com/cockroachdb/apd/v3 v3.2.3
88
github.com/cockroachdb/errors v1.7.5
9-
github.com/dolthub/dolt/go v0.40.5-0.20260603070501-6f3c0a8e3652
9+
github.com/dolthub/dolt/go v0.40.5-0.20260603172609-0adf0e2d0069
1010
github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69
1111
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
12-
github.com/dolthub/go-mysql-server v0.20.1-0.20260603065308-fb1e5d2ea83f
12+
github.com/dolthub/go-mysql-server v0.20.1-0.20260603165028-b60521c3724e
1313
github.com/dolthub/pg_query_go/v6 v6.0.0-20251215122834-fb20be4254d1
1414
github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216
1515
github.com/dolthub/vitess v0.0.0-20260528164423-e3f9fa81284c

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 h1:I
245245
github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12/go.mod h1:rN7X8BHwkjPcfMQQ2QTAq/xM3leUSGLfb+1Js7Y6TVo=
246246
github.com/dolthub/dolt-mcp v0.3.4 h1:AyG5cw+fNWXDHXujtQnqUPZrpWtPg6FN6yYtjv1pP44=
247247
github.com/dolthub/dolt-mcp v0.3.4/go.mod h1:bCZ7KHvDYs+M0e+ySgmGiNvLhcwsN7bbf5YCyillLrk=
248-
github.com/dolthub/dolt/go v0.40.5-0.20260603070501-6f3c0a8e3652 h1:lrQRjFpRygvfRmZTAkAWD/jwlWy+M0Y0gmH/QYL90XY=
249-
github.com/dolthub/dolt/go v0.40.5-0.20260603070501-6f3c0a8e3652/go.mod h1:dk23yDkIQnNS3ibQlA19nQ+11DTnpzaQcP/NIHVMzvA=
248+
github.com/dolthub/dolt/go v0.40.5-0.20260603172609-0adf0e2d0069 h1:tsedds8wbL0CnHNYSH0bL9jXArGVdtlpx5ProefkB40=
249+
github.com/dolthub/dolt/go v0.40.5-0.20260603172609-0adf0e2d0069/go.mod h1:TJo9UN4IiXL4sx6NHVxWntKmpMKx4Cng31lqxtZxZlw=
250250
github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69 h1:JShhbqMw26nKx3pqqu/cFxOpzBkN+4elVhzuUfgDw2k=
251251
github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69/go.mod h1:SSLraQS/jGLYFgff3vuZ+JbVUct6vyEeMzjLBqWqoyM=
252252
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
@@ -255,8 +255,8 @@ github.com/dolthub/fslock v0.0.4 h1:p0FcUPu81bO53349qPT1im7XyGu3CwZDsB0PEVdFcaE=
255255
github.com/dolthub/fslock v0.0.4/go.mod h1:895XJNoMTlL5N1TjOJbd9Pnpjtv1DW/Ddw9qShcAYsM=
256256
github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866 h1:U6gSf5I0e6h6GP1/5Sa7D2lWW1CWfcVPtY5wkyHq6jY=
257257
github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE=
258-
github.com/dolthub/go-mysql-server v0.20.1-0.20260603065308-fb1e5d2ea83f h1:qvHxB2dkccBBtNYNtj6TEZhzCIYqxftzAtFgqhOBhDQ=
259-
github.com/dolthub/go-mysql-server v0.20.1-0.20260603065308-fb1e5d2ea83f/go.mod h1:UTL4UvG/y8PMBcI8I60gf0DH4YPBALW/8UQCcvft95Y=
258+
github.com/dolthub/go-mysql-server v0.20.1-0.20260603165028-b60521c3724e h1:rqmQ4Jm9lSZKbeFNZBvjZmPrfauN3ZYosfajkE5hlRM=
259+
github.com/dolthub/go-mysql-server v0.20.1-0.20260603165028-b60521c3724e/go.mod h1:UTL4UvG/y8PMBcI8I60gf0DH4YPBALW/8UQCcvft95Y=
260260
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
261261
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
262262
github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 h1:oIW9HwuWrhxv+4HZxA+QQSKHLqWFyXZ2FmNjUYwkdiM=

testing/go/alter_table_test.go

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,41 @@ func TestAlterTable(t *testing.T) {
610610
},
611611
},
612612
},
613+
{
614+
Name: "Rename table must not collide with other relation types",
615+
SetUpScript: []string{
616+
"CREATE TABLE src_tbl (pk int PRIMARY KEY, v1 int);",
617+
"CREATE TABLE other_tbl (pk int PRIMARY KEY, v1 int);",
618+
"CREATE SEQUENCE seq1;",
619+
"CREATE VIEW view1 AS SELECT pk FROM src_tbl;",
620+
"CREATE INDEX idx1 ON src_tbl (v1);",
621+
},
622+
Assertions: []ScriptTestAssertion{
623+
{
624+
Query: "ALTER TABLE src_tbl RENAME TO other_tbl;",
625+
ExpectedErr: `relation "other_tbl" already exists`,
626+
},
627+
{
628+
Query: "ALTER TABLE src_tbl RENAME TO seq1;",
629+
ExpectedErr: `relation "seq1" already exists`,
630+
},
631+
{
632+
Query: "ALTER TABLE src_tbl RENAME TO view1;",
633+
ExpectedErr: `relation "view1" already exists`,
634+
},
635+
{
636+
Query: "ALTER TABLE src_tbl RENAME TO idx1;",
637+
ExpectedErr: `relation "idx1" already exists`,
638+
},
639+
{
640+
Query: "ALTER TABLE src_tbl RENAME TO new_name;",
641+
},
642+
{
643+
Query: "SELECT pk FROM new_name;",
644+
Expected: []sql.Row{},
645+
},
646+
},
647+
},
613648
{
614649
Name: "alter table owner",
615650
SetUpScript: []string{

0 commit comments

Comments
 (0)