Skip to content

Commit ad84cec

Browse files
kyleconroykyleconroy
authored
build: Upgrade to wazero@v1.9.0 (#3887)
* build: Upgrade to wazero@v1.9.0 * Upgrade to pg_query_go/v6 * Fix JSON tests * Upgrade to Go 1.24.0
1 parent 1fe7598 commit ad84cec

File tree

10 files changed

+31
-87
lines changed

10 files changed

+31
-87
lines changed

‎devenv.lock‎

Lines changed: 11 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
"devenv": {
44
"locked": {
55
"dir": "src/modules",
6-
"lastModified": 1693830477,
7-
"narHash": "sha256-6j1oNRpjGseDbgg6mJ9H3gmX5U+VAubOLV+iFL9WW30=",
6+
"lastModified": 1742659231,
87
"owner": "cachix",
98
"repo": "devenv",
10-
"rev": "f839f486b98609f3477c0410b31a6f831b390d48",
9+
"rev": "c651cb04013be972767aaecb3e9a98fc930d080e",
1110
"type": "github"
1211
},
1312
"original": {
@@ -20,11 +19,10 @@
2019
"flake-compat": {
2120
"flake": false,
2221
"locked": {
23-
"lastModified": 1673956053,
24-
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
22+
"lastModified": 1733328505,
2523
"owner": "edolstra",
2624
"repo": "flake-compat",
27-
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
25+
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
2826
"type": "github"
2927
},
3028
"original": {
@@ -33,24 +31,6 @@
3331
"type": "github"
3432
}
3533
},
36-
"flake-utils": {
37-
"inputs": {
38-
"systems": "systems"
39-
},
40-
"locked": {
41-
"lastModified": 1685518550,
42-
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
43-
"owner": "numtide",
44-
"repo": "flake-utils",
45-
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
46-
"type": "github"
47-
},
48-
"original": {
49-
"owner": "numtide",
50-
"repo": "flake-utils",
51-
"type": "github"
52-
}
53-
},
5434
"gitignore": {
5535
"inputs": {
5636
"nixpkgs": [
@@ -59,11 +39,10 @@
5939
]
6040
},
6141
"locked": {
62-
"lastModified": 1660459072,
63-
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
42+
"lastModified": 1709087332,
6443
"owner": "hercules-ci",
6544
"repo": "gitignore.nix",
66-
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
45+
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
6746
"type": "github"
6847
},
6948
"original": {
@@ -74,11 +53,10 @@
7453
},
7554
"nixpkgs": {
7655
"locked": {
77-
"lastModified": 1693844670,
78-
"narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
56+
"lastModified": 1742707865,
7957
"owner": "NixOS",
8058
"repo": "nixpkgs",
81-
"rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
59+
"rev": "dd613136ee91f67e5dba3f3f41ac99ae89c5406b",
8260
"type": "github"
8361
},
8462
"original": {
@@ -88,38 +66,19 @@
8866
"type": "github"
8967
}
9068
},
91-
"nixpkgs-stable": {
92-
"locked": {
93-
"lastModified": 1685801374,
94-
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
95-
"owner": "NixOS",
96-
"repo": "nixpkgs",
97-
"rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
98-
"type": "github"
99-
},
100-
"original": {
101-
"owner": "NixOS",
102-
"ref": "nixos-23.05",
103-
"repo": "nixpkgs",
104-
"type": "github"
105-
}
106-
},
10769
"pre-commit-hooks": {
10870
"inputs": {
10971
"flake-compat": "flake-compat",
110-
"flake-utils": "flake-utils",
11172
"gitignore": "gitignore",
11273
"nixpkgs": [
11374
"nixpkgs"
114-
],
115-
"nixpkgs-stable": "nixpkgs-stable"
75+
]
11676
},
11777
"locked": {
118-
"lastModified": 1692274144,
119-
"narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=",
78+
"lastModified": 1742649964,
12079
"owner": "cachix",
12180
"repo": "pre-commit-hooks.nix",
122-
"rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa",
81+
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
12382
"type": "github"
12483
},
12584
"original": {
@@ -134,21 +93,6 @@
13493
"nixpkgs": "nixpkgs",
13594
"pre-commit-hooks": "pre-commit-hooks"
13695
}
137-
},
138-
"systems": {
139-
"locked": {
140-
"lastModified": 1681028828,
141-
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
142-
"owner": "nix-systems",
143-
"repo": "default",
144-
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
145-
"type": "github"
146-
},
147-
"original": {
148-
"owner": "nix-systems",
149-
"repo": "default",
150-
"type": "github"
151-
}
15296
}
15397
},
15498
"root": "root",

‎devenv.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# https://devenv.sh/packages/
55
packages = [
66
pkgs.buf
7-
pkgs.go_1_21
7+
pkgs.go_1_24
88
pkgs.git
99
pkgs.git-cliff
1010
pkgs.govulncheck

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ require (
1414
github.com/jackc/pgx/v5 v5.7.2
1515
github.com/jinzhu/inflection v1.0.0
1616
github.com/lib/pq v1.10.9
17-
github.com/pganalyze/pg_query_go/v5 v5.1.0
17+
github.com/pganalyze/pg_query_go/v6 v6.0.0
1818
github.com/pingcap/tidb/pkg/parser v0.0.0-20241203170126-9812d85d0d25
1919
github.com/riza-io/grpc-go v0.2.0
2020
github.com/spf13/cobra v1.8.1
2121
github.com/spf13/pflag v1.0.6
22-
github.com/tetratelabs/wazero v1.8.2
23-
github.com/wasilibs/go-pgquery v0.0.0-20240606042535-c0843d6592cc
22+
github.com/tetratelabs/wazero v1.9.0
23+
github.com/wasilibs/go-pgquery v0.0.0-20250219053243-148840c597e6
2424
github.com/xeipuuv/gojsonschema v1.2.0
2525
golang.org/x/sync v0.11.0
2626
google.golang.org/grpc v1.70.0
@@ -51,7 +51,7 @@ require (
5151
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
5252
github.com/rogpeppe/go-internal v1.10.0 // indirect
5353
github.com/stoewer/go-strcase v1.2.0 // indirect
54-
github.com/wasilibs/wazero-helpers v0.0.0-20240604052452-61d7981e9a38 // indirect
54+
github.com/wasilibs/wazero-helpers v0.0.0-20240620070341-3dff1577cd52 // indirect
5555
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
5656
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
5757
go.uber.org/atomic v1.11.0 // indirect

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
127127
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
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/v5 v5.1.0 h1:MlxQqHZnvA3cbRQYyIrjxEjzo560P6MyTgtlaf3pmXg=
131-
github.com/pganalyze/pg_query_go/v5 v5.1.0/go.mod h1:FsglvxidZsVN+Ltw3Ai6nTgPVcK2BPukH3jCDEqc1Ug=
130+
github.com/pganalyze/pg_query_go/v6 v6.0.0 h1:in6RkR/apfqlAtvqgDxd4Y4o87a5Pr8fkKDB4DrDo2c=
131+
github.com/pganalyze/pg_query_go/v6 v6.0.0/go.mod h1:nvTHIuoud6e1SfrUaFwHqT0i4b5Nr+1rPWVds3B5+50=
132132
github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
133133
github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb h1:3pSi4EDG6hg0orE1ndHkXvX6Qdq2cZn8gAPir8ymKZk=
134134
github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb/go.mod h1:X2r9ueLEUZgtx2cIogM0v4Zj5uvvzhuuiu7Pn8HzMPg=
@@ -177,12 +177,12 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
177177
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
178178
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
179179
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
180-
github.com/tetratelabs/wazero v1.8.2 h1:yIgLR/b2bN31bjxwXHD8a3d+BogigR952csSDdLYEv4=
181-
github.com/tetratelabs/wazero v1.8.2/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
182-
github.com/wasilibs/go-pgquery v0.0.0-20240606042535-c0843d6592cc h1:Hgim1Xgk1+viV7p0aZh9OOrMRfG+E4mGA+JsI2uB0+k=
183-
github.com/wasilibs/go-pgquery v0.0.0-20240606042535-c0843d6592cc/go.mod h1:ah6UfXIl/oA0K3SbourB/UHggVJOBXwPZ2XudDmmFac=
184-
github.com/wasilibs/wazero-helpers v0.0.0-20240604052452-61d7981e9a38 h1:RBu75fhabyxyGJ2zhkoNuRyObBMhVeMoXqmeaPTg2CQ=
185-
github.com/wasilibs/wazero-helpers v0.0.0-20240604052452-61d7981e9a38/go.mod h1:Z80JvMwvze8KUlVQIdw9L7OSskZJ1yxlpi4AQhoQe4s=
180+
github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
181+
github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
182+
github.com/wasilibs/go-pgquery v0.0.0-20250219053243-148840c597e6 h1:dYn0B5w0a3CMqespZ0ieD/6JIeu37POqB/uBHBI2u94=
183+
github.com/wasilibs/go-pgquery v0.0.0-20250219053243-148840c597e6/go.mod h1:svJEu6OUmHY0+ySptMcgctboO29ON5U3hG3Wabfmwnk=
184+
github.com/wasilibs/wazero-helpers v0.0.0-20240620070341-3dff1577cd52 h1:OvLBa8SqJnZ6P+mjlzc2K7PM22rRUPE1x32G9DTPrC4=
185+
github.com/wasilibs/wazero-helpers v0.0.0-20240620070341-3dff1577cd52/go.mod h1:jMeV4Vpbi8osrE/pKUxRZkVaA0EX7NZN0A9/oRzgpgY=
186186
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
187187
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
188188
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=

‎internal/codegen/golang/postgresql_type.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
165165
}
166166
return "sql.NullBool"
167167

168-
case "json":
168+
case "json", "pg_catalog.json":
169169
switch driver {
170170
case opts.SQLDriverPGXV5:
171171
return "[]byte"
@@ -181,7 +181,7 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
181181
return "interface{}"
182182
}
183183

184-
case "jsonb":
184+
case "jsonb", "pg_catalog.jsonb":
185185
switch driver {
186186
case opts.SQLDriverPGXV5:
187187
return "[]byte"

‎internal/engine/postgresql/convert.go‎

Lines changed: 1 addition & 1 deletion
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/v5"
6+
pg "github.com/pganalyze/pg_query_go/v6"
77

88
"github.com/sqlc-dev/sqlc/internal/sql/ast"
99
)

‎internal/engine/postgresql/parse.go‎

Lines changed: 1 addition & 1 deletion
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/v5"
9+
nodes "github.com/pganalyze/pg_query_go/v6"
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package postgresql
44

55
import (
6-
nodes "github.com/pganalyze/pg_query_go/v5"
6+
nodes "github.com/pganalyze/pg_query_go/v6"
77
)
88

99
var Parse = nodes.Parse

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
package parser
44

5-
import "github.com/pganalyze/pg_query_go/v5/parser"
5+
import "github.com/pganalyze/pg_query_go/v6/parser"
66

77
type Error = parser.Error

‎internal/engine/postgresql/utils.go‎

Lines changed: 1 addition & 1 deletion
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/v5"
4+
nodes "github.com/pganalyze/pg_query_go/v6"
55
)
66

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

0 commit comments

Comments
 (0)