Merge pull request #52 from ankane/pg_query_go

exAspArk · web-flow · commit fe9e3e3b99bb · 2025-08-10T20:34:37.000+01:00
Upgrade pg_query_go to v6
diff --git a/src/server/go.mod b/src/server/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/jackc/pgx/v5 v5.7.2
 	github.com/marcboeker/go-duckdb/v2 v2.3.2
-	github.com/pganalyze/pg_query_go/v5 v5.1.0
+	github.com/pganalyze/pg_query_go/v6 v6.1.0
 )
 
 require golang.org/x/crypto v0.35.0
diff --git a/src/server/go.sum b/src/server/go.sum
@@ -93,8 +93,8 @@ github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpsp
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
-github.com/pganalyze/pg_query_go/v5 v5.1.0 h1:MlxQqHZnvA3cbRQYyIrjxEjzo560P6MyTgtlaf3pmXg=
-github.com/pganalyze/pg_query_go/v5 v5.1.0/go.mod h1:FsglvxidZsVN+Ltw3Ai6nTgPVcK2BPukH3jCDEqc1Ug=
+github.com/pganalyze/pg_query_go/v6 v6.1.0 h1:jG5ZLhcVgL1FAw4C/0VNQaVmX1SUJx71wBGdtTtBvls=
+github.com/pganalyze/pg_query_go/v6 v6.1.0/go.mod h1:nvTHIuoud6e1SfrUaFwHqT0i4b5Nr+1rPWVds3B5+50=
 github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
 github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/src/server/parser_a_expr.go b/src/server/parser_a_expr.go
@@ -3,7 +3,7 @@ package main
 import (
 	"strings"
 
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 type ParserAExpr struct {
diff --git a/src/server/parser_column_ref.go b/src/server/parser_column_ref.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 type ParserColumnRef struct {
diff --git a/src/server/parser_function.go b/src/server/parser_function.go
@@ -3,7 +3,7 @@ package main
 import (
 	"strings"
 
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 type ParserFunction struct {
diff --git a/src/server/parser_select.go b/src/server/parser_select.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 type ParserSelect struct {
diff --git a/src/server/parser_show.go b/src/server/parser_show.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 type ParserShow struct {
diff --git a/src/server/parser_table.go b/src/server/parser_table.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 type QueryToIcebergTable struct {
diff --git a/src/server/parser_type_cast.go b/src/server/parser_type_cast.go
@@ -3,7 +3,7 @@ package main
 import (
 	"strings"
 
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 type ParserTypeCast struct {
diff --git a/src/server/parser_utils.go b/src/server/parser_utils.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 type ParserUtils struct {
diff --git a/src/server/query_remapper.go b/src/server/query_remapper.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 var SUPPORTED_SET_STATEMENTS = NewSet[string]().AddAll([]string{
diff --git a/src/server/query_remapper_expression.go b/src/server/query_remapper_expression.go
@@ -3,7 +3,7 @@ package main
 import (
 	"strings"
 
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 type QueryRemapperExpression struct {
diff --git a/src/server/query_remapper_function.go b/src/server/query_remapper_function.go
@@ -3,7 +3,7 @@ package main
 import (
 	"regexp"
 
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 var PG_CATALOG_MACRO_FUNCTION_NAMES = Set[string]{}
diff --git a/src/server/query_remapper_select.go b/src/server/query_remapper_select.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 type QueryRemapperSelect struct {
diff --git a/src/server/query_remapper_show.go b/src/server/query_remapper_show.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 type QueryRemapperShow struct {
diff --git a/src/server/query_remapper_table.go b/src/server/query_remapper_table.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"
 
-	pgQuery "github.com/pganalyze/pg_query_go/v5"
+	pgQuery "github.com/pganalyze/pg_query_go/v6"
 )
 
 var PG_CATALOG_TABLE_NAMES = Set[string]{}

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ require (`
`10`	`10`	`github.com/google/uuid v1.6.0`
`11`	`11`	`github.com/jackc/pgx/v5 v5.7.2`
`12`	`12`	`github.com/marcboeker/go-duckdb/v2 v2.3.2`
`13`		`- github.com/pganalyze/pg_query_go/v5 v5.1.0`
	`13`	`+ github.com/pganalyze/pg_query_go/v6 v6.1.0`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`require golang.org/x/crypto v0.35.0`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"strings"`
`5`	`5`
`6`		`- pgQuery "github.com/pganalyze/pg_query_go/v5"`
	`6`	`+ pgQuery "github.com/pganalyze/pg_query_go/v6"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type ParserAExpr struct {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
`4`		`- pgQuery "github.com/pganalyze/pg_query_go/v5"`
	`4`	`+ pgQuery "github.com/pganalyze/pg_query_go/v6"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`type ParserColumnRef struct {`