From 4317bba595f58054d98526b97b9bc27ddf193478 Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Wed, 26 Feb 2025 15:11:04 -0800 Subject: [PATCH 1/5] go.mod: Bump go version to 1.24.0. --- .github/workflows/cd-release.yaml | 2 +- go.mod | 2 +- server/node/no_op.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd-release.yaml b/.github/workflows/cd-release.yaml index 36b80b998b..3e35e425d4 100644 --- a/.github/workflows/cd-release.yaml +++ b/.github/workflows/cd-release.yaml @@ -76,7 +76,7 @@ jobs: run: | latest=$(git rev-parse HEAD) echo "commitish=$latest" >> $GITHUB_OUTPUT - GO_BUILD_VERSION=1.23.3 scripts/build_binaries.sh + GO_BUILD_VERSION=1.24.0 scripts/build_binaries.sh - name: Create Release id: create_release uses: dolthub/create-release@v2 diff --git a/go.mod b/go.mod index 03e46e8b88..d6d6ceb436 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/dolthub/doltgresql -go 1.23.3 +go 1.24.0 require ( github.com/PuerkitoBio/goquery v1.8.1 diff --git a/server/node/no_op.go b/server/node/no_op.go index fc2aa5d4b3..7ca3beb6b3 100755 --- a/server/node/no_op.go +++ b/server/node/no_op.go @@ -69,7 +69,7 @@ func (n noOpRowIter) Next(ctx *sql.Context) (sql.Row, error) { func (n noOpRowIter) Close(ctx *sql.Context) error { for _, warning := range n.warnings { - ctx.Warn(0, fmt.Sprintf("%s is unimplemented", warning)) + ctx.Warn(0, "%s is unimplemented", warning) } return nil } From 454dfb3718368ddeae5357dd41a80bb68ddb9b80 Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Wed, 26 Feb 2025 16:13:06 -0800 Subject: [PATCH 2/5] scripts/run_staticcheck.sh: Bump to 2025.1, which supports type alias params. --- scripts/run_staticcheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_staticcheck.sh b/scripts/run_staticcheck.sh index bb6377605e..f0d9029059 100755 --- a/scripts/run_staticcheck.sh +++ b/scripts/run_staticcheck.sh @@ -4,4 +4,4 @@ cd "$(cd -P -- "$(dirname -- "$0")" && pwd -P)" cd .. -go run honnef.co/go/tools/cmd/staticcheck@2024.1.1 ./... +go run honnef.co/go/tools/cmd/staticcheck@2025.1 ./... From 9f1458ceb4a00133ff9e213a08441e8149dee862 Mon Sep 17 00:00:00 2001 From: max-hoffman Date: Wed, 5 Mar 2025 03:39:20 +0000 Subject: [PATCH 3/5] [ga-bump-dep] Bump dependency in Doltgres by max-hoffman --- go.mod | 14 ++++++++------ go.sum | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index b84b576d85..18596a59c8 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,20 @@ module github.com/dolthub/doltgresql -go 1.23.3 +go 1.24.0 + +toolchain go1.24.1 require ( github.com/PuerkitoBio/goquery v1.8.1 github.com/cockroachdb/apd/v2 v2.0.3-0.20200518165714-d020e156310a github.com/cockroachdb/errors v1.7.5 - github.com/dolthub/dolt/go v0.40.5-0.20250227000557-ec15fdc1ddc6 + github.com/dolthub/dolt/go v0.40.5-0.20250305033733-0565b03abd83 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 - github.com/dolthub/go-mysql-server v0.19.1-0.20250227200259-b9d44c4607d1 + github.com/dolthub/go-icu-regex v0.0.0-20250303123116-549b8d7cad00 + github.com/dolthub/go-mysql-server v0.19.1-0.20250305015716-690400e21e90 github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216 - github.com/dolthub/vitess v0.0.0-20250214225328-a0ed4612b41c + github.com/dolthub/vitess v0.0.0-20250304211657-920ca9ec2b9a github.com/fatih/color v1.13.0 github.com/goccy/go-json v0.10.2 github.com/gogo/protobuf v1.3.2 @@ -58,7 +60,7 @@ require ( github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 // indirect github.com/andybalholm/cascadia v1.3.1 // indirect github.com/apache/thrift v0.13.1-0.20201008052519-daf620915714 // indirect - github.com/aws/aws-sdk-go v1.34.0 // indirect + github.com/aws/aws-sdk-go v1.55.6 // indirect github.com/bcicen/jstream v1.0.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect diff --git a/go.sum b/go.sum index 095e64a1a0..2745dd3c96 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.30.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.34.0 h1:brux2dRrlwCF5JhTL7MUT3WUwo9zfDHZZp3+g3Mvlmo= -github.com/aws/aws-sdk-go v1.34.0/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk= +github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.7.1/go.mod h1:L5LuPC1ZgDr2xQS7AmIec/Jlc7O/Y1u2KxJyNVab250= github.com/aws/aws-sdk-go-v2/config v1.5.0/go.mod h1:RWlPOAW3E3tbtNAqTwvSW54Of/yP3oiZXMI0xfUdjyA= @@ -214,18 +214,18 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/dolthub/dolt/go v0.40.5-0.20250227000557-ec15fdc1ddc6 h1:g69dROw+SbOeOiZuPPe5CJ2vzcXdUDL2T9WXmA7uzUQ= -github.com/dolthub/dolt/go v0.40.5-0.20250227000557-ec15fdc1ddc6/go.mod h1:sXPQXJRVGP9iAxcqf7SHZrnYKLnSTL4hKwlo6ELDK10= +github.com/dolthub/dolt/go v0.40.5-0.20250305033733-0565b03abd83 h1:UIKUtU2Hn0R1mAsZNftanHm70t1G9P2HhNh/ogNcR5s= +github.com/dolthub/dolt/go v0.40.5-0.20250305033733-0565b03abd83/go.mod h1:yNlTc3vD2W3cy/CUsHRQBYTzUyi9SQyr3iFBAnNij8E= github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d h1:gO9+wrmNHXukPNCO1tpfCcXIdMlW/qppbUStfLvqz/U= github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d/go.mod h1:L5RDYZbC9BBWmoU2+TjTekeqqhFXX5EqH9ln00O0stY= github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww= github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY= 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-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM= -github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250227200259-b9d44c4607d1 h1:GhFEGULkWuOIwBM2Fv2A/OgszEDjm9CyfAQD/EEzSIA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250227200259-b9d44c4607d1/go.mod h1:JTlrabhq5TJqvlL+J3NKlm0EzTHQQugUAH6yAxWi4Ww= +github.com/dolthub/go-icu-regex v0.0.0-20250303123116-549b8d7cad00 h1:rh2ij2yTYKJWlX+c8XRg4H5OzqPewbU1lPK8pcfVmx8= +github.com/dolthub/go-icu-regex v0.0.0-20250303123116-549b8d7cad00/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= +github.com/dolthub/go-mysql-server v0.19.1-0.20250305015716-690400e21e90 h1:zYtorqYKsm+OFrHeBYklBiNmIc1QbKTdnF0SDH4DarE= +github.com/dolthub/go-mysql-server v0.19.1-0.20250305015716-690400e21e90/go.mod h1:yr+Vv47/YLOKMgiEY+QxHTlbIVpTuiVtkEZ5l+xruY4= 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-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= @@ -238,8 +238,8 @@ github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216 h1:JWkKRE4 github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216/go.mod h1:e/FIZVvT2IR53HBCAo41NjqgtEnjMJGKca3Y/dAmZaA= github.com/dolthub/swiss v0.1.0 h1:EaGQct3AqeP/MjASHLiH6i4TAmgbG/c4rA6a1bzCOPc= github.com/dolthub/swiss v0.1.0/go.mod h1:BeucyB08Vb1G9tumVN3Vp/pyY4AMUnr9p7Rz7wJ7kAQ= -github.com/dolthub/vitess v0.0.0-20250214225328-a0ed4612b41c h1:YsZuBsU5wKmwrXGfzhW6/a+XzP/LWfzayXC3nCz/kqQ= -github.com/dolthub/vitess v0.0.0-20250214225328-a0ed4612b41c/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= +github.com/dolthub/vitess v0.0.0-20250304211657-920ca9ec2b9a h1:HIH9g4z+yXr4DIFyT6L5qOIEGJ1zVtlj6baPyHAG4Yw= +github.com/dolthub/vitess v0.0.0-20250304211657-920ca9ec2b9a/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= From 3e27e7c3eedf371feb9c441024fa2226a512aab4 Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Wed, 5 Mar 2025 09:37:38 -0800 Subject: [PATCH 4/5] Changes to make it build with the bump. Constant fmt string. servercfg LogFormat. --- server/node/no_op.go | 2 +- servercfg/config.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/server/node/no_op.go b/server/node/no_op.go index fc2aa5d4b3..7ca3beb6b3 100755 --- a/server/node/no_op.go +++ b/server/node/no_op.go @@ -69,7 +69,7 @@ func (n noOpRowIter) Next(ctx *sql.Context) (sql.Row, error) { func (n noOpRowIter) Close(ctx *sql.Context) error { for _, warning := range n.warnings { - ctx.Warn(0, fmt.Sprintf("%s is unimplemented", warning)) + ctx.Warn(0, "%s is unimplemented", warning) } return nil } diff --git a/servercfg/config.go b/servercfg/config.go index e7be894cc9..e27dd625c5 100755 --- a/servercfg/config.go +++ b/servercfg/config.go @@ -299,6 +299,10 @@ func (cfg *DoltgresConfig) LogLevel() servercfg.LogLevel { } } +func (cfg *DoltgresConfig) LogFormat() servercfg.LogFormat { + return servercfg.LogFormat_Text +} + func (cfg *DoltgresConfig) MaxConnections() uint64 { return 0 } From ee6cecc325b8e1df5f5630b1f1bacc00a4457b62 Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Wed, 5 Mar 2025 10:22:03 -0800 Subject: [PATCH 5/5] .github/workflows/cd-release.yaml: Build with Go 1.24.1. --- .github/workflows/cd-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-release.yaml b/.github/workflows/cd-release.yaml index 3e35e425d4..062c49dfee 100644 --- a/.github/workflows/cd-release.yaml +++ b/.github/workflows/cd-release.yaml @@ -76,7 +76,7 @@ jobs: run: | latest=$(git rev-parse HEAD) echo "commitish=$latest" >> $GITHUB_OUTPUT - GO_BUILD_VERSION=1.24.0 scripts/build_binaries.sh + GO_BUILD_VERSION=1.24.1 scripts/build_binaries.sh - name: Create Release id: create_release uses: dolthub/create-release@v2