diff --git a/go.mod b/go.mod index b4f94aa514..e40ae12104 100644 --- a/go.mod +++ b/go.mod @@ -9,10 +9,10 @@ require ( github.com/dolthub/dolt/go v0.40.5-0.20260430172110-36fcc634f302 github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.20.1-0.20260427172105-a0b357da2f1d + github.com/dolthub/go-mysql-server v0.20.1-0.20260501214944-8e27527885cc github.com/dolthub/pg_query_go/v6 v6.0.0-20251215122834-fb20be4254d1 github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216 - github.com/dolthub/vitess v0.0.0-20260424215137-ec6bd432b0be + github.com/dolthub/vitess v0.0.0-20260501205914-8b97d36b5ba9 github.com/fatih/color v1.13.0 github.com/goccy/go-json v0.10.2 github.com/gogo/protobuf v1.3.2 diff --git a/go.sum b/go.sum index ca4c550e1f..b45e6824cd 100644 --- a/go.sum +++ b/go.sum @@ -255,8 +255,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866 h1:U6gSf5I0e6h6GP1/5Sa7D2lWW1CWfcVPtY5wkyHq6jY= github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE= -github.com/dolthub/go-mysql-server v0.20.1-0.20260427172105-a0b357da2f1d h1:0ptkeudblr8Ee6fmah6T/1nmnqAC5XXUmHiknZiGL58= -github.com/dolthub/go-mysql-server v0.20.1-0.20260427172105-a0b357da2f1d/go.mod h1:O43PPQxMeNi7O5idizj6Itf2TZcSYfI/0WU24xhXg4I= +github.com/dolthub/go-mysql-server v0.20.1-0.20260501214944-8e27527885cc h1:63Oxz/p3+vao2ZMki8+1Dfy1wMxQZZ3oGdcxNY0WEMc= +github.com/dolthub/go-mysql-server v0.20.1-0.20260501214944-8e27527885cc/go.mod h1:XHHBMl8dUEt4UeBYDNeEFc3CqwzI6XgPLG74qi/W7MM= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 h1:oIW9HwuWrhxv+4HZxA+QQSKHLqWFyXZ2FmNjUYwkdiM= @@ -267,8 +267,8 @@ github.com/dolthub/pg_query_go/v6 v6.0.0-20251215122834-fb20be4254d1 h1:GY17cGA4 github.com/dolthub/pg_query_go/v6 v6.0.0-20251215122834-fb20be4254d1/go.mod h1:qnrZP3/1slFl2Bq5yw38HLOsArZareGwdpEceriblLc= github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216 h1:JWkKRE4EHUcEVQCMRBej8DYxjYjRz/9MdF/NNQh0o70= github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216/go.mod h1:e/FIZVvT2IR53HBCAo41NjqgtEnjMJGKca3Y/dAmZaA= -github.com/dolthub/vitess v0.0.0-20260424215137-ec6bd432b0be h1:m01DFtn4xQhLWni8bCbRRjcjeiOZkAgaj2fOWGpPr6A= -github.com/dolthub/vitess v0.0.0-20260424215137-ec6bd432b0be/go.mod h1:dKAkzdfRkAudpc0g8JOQ0eiEjV83TYIFz/yNIEdcjXM= +github.com/dolthub/vitess v0.0.0-20260501205914-8b97d36b5ba9 h1:zgm/aD8lSo0mts32lUQFEfQzFv4HtIZoDp/L0deRgMg= +github.com/dolthub/vitess v0.0.0-20260501205914-8b97d36b5ba9/go.mod h1:dKAkzdfRkAudpc0g8JOQ0eiEjV83TYIFz/yNIEdcjXM= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= diff --git a/testing/go/pgcatalog_test.go b/testing/go/pgcatalog_test.go index de714f8924..30cddd91f1 100644 --- a/testing/go/pgcatalog_test.go +++ b/testing/go/pgcatalog_test.go @@ -5483,6 +5483,9 @@ WHERE pg_catalog.pg_class.relkind = ANY (ARRAY['r', 'p', 'f', 'v', 'm']) AND pg_ {"date", "timestamp without time zone", nil, "t", "dolt_log", nil, "", nil}, {"message", "text", nil, "t", "dolt_log", nil, "", nil}, {"commit_order", "numeric", nil, "t", "dolt_log", nil, "", nil}, + {"parents", "text", nil, "f", "dolt_log", nil, "", nil}, + {"refs", "text", nil, "t", "dolt_log", nil, "", nil}, + {"signature", "text", nil, "f", "dolt_log", nil, "", nil}, {"author", "text", nil, "t", "dolt_log", nil, "", nil}, {"author_email", "text", nil, "t", "dolt_log", nil, "", nil}, {"author_date", "timestamp without time zone", nil, "t", "dolt_log", nil, "", nil}, @@ -5556,6 +5559,9 @@ JOIN pg_catalog.pg_namespace ON pg_catalog.pg_namespace.oid = pg_catalog.pg_type {"date", "timestamp without time zone", nil, "t", "dolt_log", nil, "", nil}, {"message", "text", nil, "t", "dolt_log", nil, "", nil}, {"commit_order", "numeric", nil, "t", "dolt_log", nil, "", nil}, + {"parents", "text", nil, "f", "dolt_log", nil, "", nil}, + {"refs", "text", nil, "t", "dolt_log", nil, "", nil}, + {"signature", "text", nil, "f", "dolt_log", nil, "", nil}, {"author", "text", nil, "t", "dolt_log", nil, "", nil}, {"author_email", "text", nil, "t", "dolt_log", nil, "", nil}, {"author_date", "timestamp without time zone", nil, "t", "dolt_log", nil, "", nil}, @@ -6086,9 +6092,12 @@ func TestSystemTablesInPgcatalog(t *testing.T) { {909123395, "date", 1114, 4, "t", "f", "f"}, {909123395, "message", 25, 5, "t", "f", "f"}, {909123395, "commit_order", 1700, 6, "t", "f", "f"}, - {909123395, "author", 25, 7, "t", "f", "f"}, - {909123395, "author_email", 25, 8, "t", "f", "f"}, - {909123395, "author_date", 1114, 9, "t", "f", "f"}, + {909123395, "parents", 25, 7, "f", "f", "f"}, + {909123395, "refs", 25, 8, "t", "f", "f"}, + {909123395, "signature", 25, 9, "f", "f", "f"}, + {909123395, "author", 25, 10, "t", "f", "f"}, + {909123395, "author_email", 25, 11, "t", "f", "f"}, + {909123395, "author_date", 1114, 12, "t", "f", "f"}, {1060579466, "table_name", 25, 1, "t", "f", "f"}, {1060579466, "staged", 16, 2, "t", "f", "f"}, {1060579466, "status", 25, 3, "t", "f", "f"}, @@ -6176,9 +6185,12 @@ func TestSystemTablesInPgcatalog(t *testing.T) { {2067982358, "date", 1114, 4, "t", "f", "f"}, {2067982358, "message", 25, 5, "t", "f", "f"}, {2067982358, "commit_order", 1700, 6, "t", "f", "f"}, - {2067982358, "author", 25, 7, "t", "f", "f"}, - {2067982358, "author_email", 25, 8, "t", "f", "f"}, - {2067982358, "author_date", 1114, 9, "t", "f", "f"}, + {2067982358, "parents", 25, 7, "f", "f", "f"}, + {2067982358, "refs", 25, 8, "t", "f", "f"}, + {2067982358, "signature", 25, 9, "f", "f", "f"}, + {2067982358, "author", 25, 10, "t", "f", "f"}, + {2067982358, "author_email", 25, 11, "t", "f", "f"}, + {2067982358, "author_date", 1114, 12, "t", "f", "f"}, {2357712556, "commit_hash", 25, 1, "t", "f", "f"}, {2357712556, "table_name", 25, 2, "t", "f", "f"}, {2357712556, "committer", 25, 3, "t", "f", "f"}, @@ -6262,9 +6274,12 @@ func TestSystemTablesInPgcatalog(t *testing.T) { {3491847678, "date", 1114, 4, "t", "f", "f"}, {3491847678, "message", 25, 5, "t", "f", "f"}, {3491847678, "commit_order", 1700, 6, "t", "f", "f"}, - {3491847678, "author", 25, 7, "t", "f", "f"}, - {3491847678, "author_email", 25, 8, "t", "f", "f"}, - {3491847678, "author_date", 1114, 9, "t", "f", "f"}, + {3491847678, "parents", 25, 7, "f", "f", "f"}, + {3491847678, "refs", 25, 8, "t", "f", "f"}, + {3491847678, "signature", 25, 9, "f", "f", "f"}, + {3491847678, "author", 25, 10, "t", "f", "f"}, + {3491847678, "author_email", 25, 11, "t", "f", "f"}, + {3491847678, "author_date", 1114, 12, "t", "f", "f"}, {3554775706, "table_name", 25, 1, "t", "f", "f"}, {3554775706, "staged", 16, 2, "t", "f", "f"}, {3554775706, "status", 25, 3, "t", "f", "f"},