Skip to content

Commit c870a71

Browse files
kyleconroykyleconroy
authored
build(deps): bump wazero from 1.5.0 to 1.7.0 (#3284)
* build(deps): bump wazero from 1.5.0 to 1.7.0 * build(deps): bump pg_query_go from v4 to v5 * Upgrade to v5
1 parent 019c13d commit c870a71

File tree

12 files changed

+15
-34
lines changed

12 files changed

+15
-34
lines changed

‎go.mod

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ require (
1414
github.com/jackc/pgx/v5 v5.5.5
1515
github.com/jinzhu/inflection v1.0.0
1616
github.com/lib/pq v1.10.9
17-
github.com/pganalyze/pg_query_go/v4 v4.2.4-0.20231205012101-7463430c7b73
17+
github.com/pganalyze/pg_query_go/v5 v5.1.0
1818
github.com/pingcap/tidb/pkg/parser v0.0.0-20231103154709-4f00ece106b1
1919
github.com/riza-io/grpc-go v0.2.0
2020
github.com/spf13/cobra v1.8.0
2121
github.com/spf13/pflag v1.0.5
22-
github.com/tetratelabs/wazero v1.6.0
23-
github.com/wasilibs/go-pgquery v0.0.0-20231208014744-de63626a1e99
22+
github.com/tetratelabs/wazero v1.7.0
23+
github.com/wasilibs/go-pgquery v0.0.0-20240319230125-b9b2e95c69a7
2424
github.com/xeipuuv/gojsonschema v1.2.0
2525
golang.org/x/sync v0.6.0
2626
google.golang.org/grpc v1.62.1
@@ -53,7 +53,6 @@ require (
5353
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
5454
github.com/rogpeppe/go-internal v1.10.0 // indirect
5555
github.com/stoewer/go-strcase v1.2.0 // indirect
56-
github.com/wasilibs/wazerox v0.0.0-20231208014050-e6b725634531 // indirect
5756
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
5857
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
5958
go.uber.org/atomic v1.11.0 // indirect

‎go.sum

+6-8
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o
127127
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
128128
github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
129129
github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
130-
github.com/pganalyze/pg_query_go/v4 v4.2.4-0.20231205012101-7463430c7b73 h1:vZEujakYrBzd7CWMwqTsDRU7bdRm4Aiu76X9K3P+qtI=
131-
github.com/pganalyze/pg_query_go/v4 v4.2.4-0.20231205012101-7463430c7b73/go.mod h1:pRJ9rCcWIhDLAzymhH2iY5kEVEfU6UGrL1wBWuO7gmM=
130+
github.com/pganalyze/pg_query_go/v5 v5.1.0 h1:MlxQqHZnvA3cbRQYyIrjxEjzo560P6MyTgtlaf3pmXg=
131+
github.com/pganalyze/pg_query_go/v5 v5.1.0/go.mod h1:FsglvxidZsVN+Ltw3Ai6nTgPVcK2BPukH3jCDEqc1Ug=
132132
github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
133133
github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
134134
github.com/pingcap/errors v0.11.5-0.20210425183316-da1aaba5fb63 h1:+FZIDR/D97YOPik4N4lPDaUcLDF/EQPogxtlHB2ZZRM=
@@ -178,12 +178,10 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
178178
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
179179
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
180180
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
181-
github.com/tetratelabs/wazero v1.6.0 h1:z0H1iikCdP8t+q341xqepY4EWvHEw8Es7tlqiVzlP3g=
182-
github.com/tetratelabs/wazero v1.6.0/go.mod h1:0U0G41+ochRKoPKCJlh0jMg1CHkyfK8kDqiirMmKY8A=
183-
github.com/wasilibs/go-pgquery v0.0.0-20231208014744-de63626a1e99 h1:HFee1ByN4FrqNVd53Mo28ccGO+g5gxqUV/gdvKMe4b8=
184-
github.com/wasilibs/go-pgquery v0.0.0-20231208014744-de63626a1e99/go.mod h1:f2JMhFocVxY3VKMd9ykUxMnX4EVew9WOgjnfaNBB6C8=
185-
github.com/wasilibs/wazerox v0.0.0-20231208014050-e6b725634531 h1:zVJ4SZgaEE9sEH2L9k1+eAvCNa/WAAnT9UiMa3/tQrI=
186-
github.com/wasilibs/wazerox v0.0.0-20231208014050-e6b725634531/go.mod h1:IQNVyA4d1hWIe23mlMMuqXjyWMdndgSlNx6FqBkwPsM=
181+
github.com/tetratelabs/wazero v1.7.0 h1:jg5qPydno59wqjpGrHph81lbtHzTrWzwwtD4cD88+hQ=
182+
github.com/tetratelabs/wazero v1.7.0/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=
183+
github.com/wasilibs/go-pgquery v0.0.0-20240319230125-b9b2e95c69a7 h1:sqqLVb63En4uTKFKBWSJ7c1aIFonhM1yn35/+KchOf4=
184+
github.com/wasilibs/go-pgquery v0.0.0-20240319230125-b9b2e95c69a7/go.mod h1:ZAUjWnxivykc22k0TKFZylOV0WlVQ9nWMExfGFIBuF4=
187185
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
188186
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
189187
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=

‎internal/engine/postgresql/convert.go

+2-13
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package postgresql
33
import (
44
"fmt"
55

6-
pg "github.com/pganalyze/pg_query_go/v4"
6+
pg "github.com/pganalyze/pg_query_go/v5"
77

88
"github.com/sqlc-dev/sqlc/internal/sql/ast"
99
)
@@ -183,7 +183,6 @@ func convertAggref(n *pg.Aggref) *ast.Aggref {
183183
Aggtype: ast.Oid(n.Aggtype),
184184
Aggcollid: ast.Oid(n.Aggcollid),
185185
Inputcollid: ast.Oid(n.Inputcollid),
186-
Aggtranstype: ast.Oid(n.Aggtranstype),
187186
Aggargtypes: convertSlice(n.Aggargtypes),
188187
Aggdirectargs: convertSlice(n.Aggdirectargs),
189188
Args: convertSlice(n.Args),
@@ -1663,7 +1662,6 @@ func convertGrantRoleStmt(n *pg.GrantRoleStmt) *ast.GrantRoleStmt {
16631662
GrantedRoles: convertSlice(n.GrantedRoles),
16641663
GranteeRoles: convertSlice(n.GranteeRoles),
16651664
IsGrant: n.IsGrant,
1666-
AdminOpt: n.AdminOpt,
16671665
Grantor: convertRoleSpec(n.Grantor),
16681666
Behavior: ast.DropBehavior(n.Behavior),
16691667
}
@@ -1693,7 +1691,6 @@ func convertGroupingFunc(n *pg.GroupingFunc) *ast.GroupingFunc {
16931691
Xpr: convertNode(n.Xpr),
16941692
Args: convertSlice(n.Args),
16951693
Refs: convertSlice(n.Refs),
1696-
Cols: convertSlice(n.Cols),
16971694
Agglevelsup: ast.Index(n.Agglevelsup),
16981695
Location: int(n.Location),
16991696
}
@@ -1754,7 +1751,6 @@ func convertIndexStmt(n *pg.IndexStmt) *ast.IndexStmt {
17541751
ExcludeOpNames: convertSlice(n.ExcludeOpNames),
17551752
Idxcomment: makeString(n.Idxcomment),
17561753
IndexOid: ast.Oid(n.IndexOid),
1757-
OldNode: ast.Oid(n.OldNode),
17581754
Unique: n.Unique,
17591755
Primary: n.Primary,
17601756
Isconstraint: n.Isconstraint,
@@ -2016,7 +2012,6 @@ func convertOpExpr(n *pg.OpExpr) *ast.OpExpr {
20162012
return &ast.OpExpr{
20172013
Xpr: convertNode(n.Xpr),
20182014
Opno: ast.Oid(n.Opno),
2019-
Opfuncid: ast.Oid(n.Opfuncid),
20202015
Opresulttype: ast.Oid(n.Opresulttype),
20212016
Opretset: n.Opretset,
20222017
Opcollid: ast.Oid(n.Opcollid),
@@ -2108,7 +2103,7 @@ func convertPartitionSpec(n *pg.PartitionSpec) *ast.PartitionSpec {
21082103
return nil
21092104
}
21102105
return &ast.PartitionSpec{
2111-
Strategy: makeString(n.Strategy),
2106+
Strategy: makeString(n.Strategy.String()),
21122107
PartParams: convertSlice(n.PartParams),
21132108
Location: int(n.Location),
21142109
}
@@ -2266,11 +2261,6 @@ func convertRangeTblEntry(n *pg.RangeTblEntry) *ast.RangeTblEntry {
22662261
Lateral: n.Lateral,
22672262
Inh: n.Inh,
22682263
InFromCl: n.InFromCl,
2269-
RequiredPerms: ast.AclMode(n.RequiredPerms),
2270-
CheckAsUser: ast.Oid(n.CheckAsUser),
2271-
SelectedCols: makeUint32Slice(n.SelectedCols),
2272-
InsertedCols: makeUint32Slice(n.InsertedCols),
2273-
UpdatedCols: makeUint32Slice(n.UpdatedCols),
22742264
SecurityQuals: convertSlice(n.SecurityQuals),
22752265
}
22762266
}
@@ -2498,7 +2488,6 @@ func convertScalarArrayOpExpr(n *pg.ScalarArrayOpExpr) *ast.ScalarArrayOpExpr {
24982488
return &ast.ScalarArrayOpExpr{
24992489
Xpr: convertNode(n.Xpr),
25002490
Opno: ast.Oid(n.Opno),
2501-
Opfuncid: ast.Oid(n.Opfuncid),
25022491
UseOr: n.UseOr,
25032492
Inputcollid: ast.Oid(n.Inputcollid),
25042493
Args: convertSlice(n.Args),

‎internal/engine/postgresql/parse.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"io"
77
"strings"
88

9-
nodes "github.com/pganalyze/pg_query_go/v4"
9+
nodes "github.com/pganalyze/pg_query_go/v5"
1010

1111
"github.com/sqlc-dev/sqlc/internal/engine/postgresql/parser"
1212
"github.com/sqlc-dev/sqlc/internal/source"

‎internal/engine/postgresql/parse_default.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package postgresql
55

66
import (
7-
nodes "github.com/pganalyze/pg_query_go/v4"
7+
nodes "github.com/pganalyze/pg_query_go/v5"
88
)
99

1010
var Parse = nodes.Parse

‎internal/engine/postgresql/parser/parser_default.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
package parser
55

6-
import "github.com/pganalyze/pg_query_go/v4/parser"
6+
import "github.com/pganalyze/pg_query_go/v5/parser"
77

88
type Error = parser.Error

‎internal/engine/postgresql/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package postgresql
22

33
import (
4-
nodes "github.com/pganalyze/pg_query_go/v4"
4+
nodes "github.com/pganalyze/pg_query_go/v5"
55
)
66

77
func isArray(n *nodes.TypeName) bool {

‎internal/sql/ast/aggref.go

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ type Aggref struct {
66
Aggtype Oid
77
Aggcollid Oid
88
Inputcollid Oid
9-
Aggtranstype Oid
109
Aggargtypes *List
1110
Aggdirectargs *List
1211
Args *List

‎internal/sql/ast/grant_role_stmt.go

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ type GrantRoleStmt struct {
44
GrantedRoles *List
55
GranteeRoles *List
66
IsGrant bool
7-
AdminOpt bool
87
Grantor *RoleSpec
98
Behavior DropBehavior
109
}

‎internal/sql/ast/index_stmt.go

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ type IndexStmt struct {
1111
ExcludeOpNames *List
1212
Idxcomment *string
1313
IndexOid Oid
14-
OldNode Oid
1514
Unique bool
1615
Primary bool
1716
Isconstraint bool

‎internal/sql/ast/op_expr.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package ast
33
type OpExpr struct {
44
Xpr Node
55
Opno Oid
6-
Opfuncid Oid
76
Opresulttype Oid
87
Opretset bool
98
Opcollid Oid

‎internal/sql/ast/scalar_array_op_expr.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package ast
33
type ScalarArrayOpExpr struct {
44
Xpr Node
55
Opno Oid
6-
Opfuncid Oid
76
UseOr bool
87
Inputcollid Oid
98
Args *List

0 commit comments

Comments
 (0)