Skip to content

[no-release-notes] Fix pgcatalog for dolt_log fixed columns #2678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
elianddb wants to merge 2 commits into from
+30 −15
Closed

[no-release-notes] Fix pgcatalog for dolt_log fixed columns #2678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a979853
fix pgcatalog for dolt_log fixed columns
elianddb May 1, 2026
988456f
amend dolt ver. to dolthub/dolt#10983
elianddb May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand All @@ -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=
Expand Down
33 changes: 24 additions & 9 deletions testing/go/pgcatalog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -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},
Expand Down Expand Up @@ -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"},
Expand Down Expand Up @@ -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"},
Expand Down Expand Up @@ -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"},
Expand Down
Loading