Skip to content

Commit dd8e154

Browse files
IdoKendoIdoKendo
authored
Merge branch 'sqlc-dev:main' into idokendo/fix-update-from-in-sqlite
2 parents afab5c9 + 34f8c1b commit dd8e154

File tree

2,829 files changed

+5160
-3092
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,829 files changed

+5160
-3092
lines changed

‎.github/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,11 @@ body:
99
description: What version of sqlc are you running? If you don't know, run `sqlc version`.
1010
multiple: false
1111
options:
12+
- 1.29.0
13+
- 1.28.0
1214
- 1.27.0
1315
- 1.26.0
1416
- 1.25.0
15-
- 1.24.0
16-
- 1.23.0
17-
- 1.22.0
18-
- 1.21.0
19-
- 1.20.0
20-
- 1.19.1
21-
- 1.19.0
22-
- 1.18.0
23-
- 1.17.2
24-
- 1.16.0
2517
- Other
2618
validations:
2719
required: true

‎.github/workflows/ci-kotlin.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ on:
66
pull_request:
77
jobs:
88
build:
9+
if: false
910
name: test
1011
runs-on: ubuntu-latest
1112
steps:
1213
- uses: actions/checkout@v4
1314
- uses: actions/setup-go@v5
1415
with:
15-
go-version: '1.21.3'
16+
go-version: '1.24.1'
1617
- name: install ./...
1718
run: go install ./...
1819
- uses: actions/checkout@v4

‎.github/workflows/ci-python.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ on:
66
pull_request:
77
jobs:
88
build:
9+
if: false
910
name: test
1011
runs-on: ubuntu-latest
1112
steps:
1213
- uses: actions/checkout@v4
1314
- uses: actions/setup-go@v5
1415
with:
15-
go-version: '1.21.3'
16+
go-version: '1.24.1'
1617
- name: install ./...
1718
run: go install ./...
1819
- uses: actions/checkout@v4

‎.github/workflows/ci-typescript.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ on:
66
pull_request:
77
jobs:
88
build:
9+
if: false
910
name: test
1011
runs-on: ubuntu-latest
1112
steps:
1213
- uses: actions/checkout@v4
1314
- uses: actions/setup-go@v5
1415
with:
15-
go-version: '1.21.3'
16+
go-version: '1.24.1'
1617
- name: install ./...
1718
run: go install ./...
1819
- uses: actions/checkout@v4

‎.github/workflows/ci.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
test:
99
strategy:
1010
matrix:
11-
# Disabling windows builds while we figure out why they're broken
12-
# os: [ubuntu-latest, macos-latest, windows-latest]
13-
os: [ubuntu-latest, macos-latest]
11+
# Disabling windows builds while we fix installing PostgreSQL 16
12+
# os: [ubuntu-22.04, macos-14, windows-2022]
13+
os: [ubuntu-22.04, macos-15]
1414
cgo: ['1', '0']
1515
# Workaround no native support for conditional matrix items
1616
# https://github.com/orgs/community/discussions/26253#discussioncomment-6745038
@@ -19,9 +19,9 @@ jobs:
1919
exclude:
2020
- isMain: false
2121
include:
22-
- os: ubuntu-latest
22+
- os: ubuntu-22.04
2323
cgo: '1'
24-
- os: ubuntu-latest
24+
- os: ubuntu-22.04
2525
cgo: '0'
2626
name: test ${{ matrix.os }} cgo=${{ matrix.cgo }}
2727
runs-on: ${{ matrix.os }}
@@ -30,14 +30,17 @@ jobs:
3030
- uses: actions/checkout@v4
3131
- uses: actions/setup-go@v5
3232
with:
33-
go-version: '1.22.8'
33+
go-version: '1.24.1'
3434

3535
- name: install gotestsum
3636
run: go install gotest.tools/gotestsum@latest
3737

3838
- name: install sqlc-gen-test
3939
run: go install github.com/sqlc-dev/[email protected]
4040

41+
- name: install test-json-process-plugin
42+
run: go install ./scripts/test-json-process-plugin/
43+
4144
- name: install ./...
4245
run: go install ./...
4346
env:
@@ -58,7 +61,7 @@ jobs:
5861
# Start a MySQL server
5962
- uses: shogo82148/actions-setup-mysql@v1
6063
with:
61-
mysql-version: "8.1"
64+
mysql-version: "9.0"
6265

6366
- name: test ./...
6467
run: gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m ./...
@@ -71,13 +74,8 @@ jobs:
7174
CGO_ENABLED: ${{ matrix.cgo }}
7275

7376
vuln_check:
74-
runs-on: ubuntu-latest
77+
runs-on: ubuntu-22.04
7578
timeout-minutes: 5
7679

7780
steps:
78-
- uses: actions/checkout@v4
79-
- uses: actions/setup-go@v5
80-
with:
81-
go-version: '1.22.8'
82-
- run: go install golang.org/x/vuln/cmd/govulncheck@latest
83-
- run: govulncheck ./...
81+
- uses: golang/govulncheck-action@v1

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# STEP 1: Build sqlc
2-
FROM golang:1.23.3 AS builder
2+
FROM golang:1.24.2 AS builder
33

44
COPY . /workspace
55
WORKDIR /workspace

‎Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ sqlc-pg-gen:
3232
sqlc-gen-json:
3333
go build -o ~/bin/sqlc-gen-json ./cmd/sqlc-gen-json
3434

35+
test-json-process-plugin:
36+
go build -o ~/bin/test-json-process-plugin ./scripts/test-json-process-plugin/
37+
3538
start:
3639
docker compose up -d
3740

‎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

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
author = 'Riza, Inc.'
2323

2424
# The full version, including alpha/beta/rc tags
25-
release = '1.27.0'
25+
release = '1.29.0'
2626

2727

2828
# -- General configuration ---------------------------------------------------

‎docs/guides/migrating-off-hosted-managed-databases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ docker compose up -d
5050

5151
## Upgrade sqlc
5252

53-
You must be running sqlc v1.27.0 or greater to have access to the `servers`
53+
You must be running sqlc v1.29.0 or greater to have access to the `servers`
5454
configuration.
5555

5656
## Add servers to configuration

‎docs/guides/plugins.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ For a complete working example see the following files:
7272
- A process-based plugin that serializes the CodeGenRequest to JSON
7373
- [process_plugin_sqlc_gen_json](https://github.com/sqlc-dev/sqlc/tree/main/internal/endtoend/testdata/process_plugin_sqlc_gen_json)
7474
- An example project showing how to use a process-based plugin
75+
- [process_plugin_sqlc_gen_json](https://github.com/sqlc-dev/sqlc/tree/main/internal/endtoend/testdata/process_plugin_format_json/)
76+
- An example project showing how to use a process-based plugin using json
7577

7678
## Environment variables
7779

@@ -99,4 +101,4 @@ plugins:
99101
```
100102

101103
A variable named `SQLC_VERSION` is always included in the plugin's
102-
environment, set to the version of the `sqlc` executable invoking it.
104+
environment, set to the version of the `sqlc` executable invoking it.

‎docs/howto/ci-cd.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- uses: actions/checkout@v3
6565
- uses: sqlc-dev/setup-sqlc@v3
6666
with:
67-
sqlc-version: '1.27.0'
67+
sqlc-version: '1.29.0'
6868
- run: sqlc diff
6969
```
7070
@@ -84,7 +84,7 @@ jobs:
8484
- uses: actions/checkout@v3
8585
- uses: sqlc-dev/setup-sqlc@v3
8686
with:
87-
sqlc-version: '1.27.0'
87+
sqlc-version: '1.29.0'
8888
# Start a PostgreSQL server
8989
- uses: sqlc-dev/action-setup-postgres@master
9090
with:
@@ -117,7 +117,7 @@ jobs:
117117
- uses: actions/checkout@v3
118118
- uses: sqlc-dev/setup-sqlc@v3
119119
with:
120-
sqlc-version: '1.27.0'
120+
sqlc-version: '1.29.0'
121121
- run: sqlc push
122122
env:
123123
SQLC_AUTH_TOKEN: ${{ secrets.SQLC_AUTH_TOKEN }}
@@ -139,7 +139,7 @@ jobs:
139139
- uses: actions/checkout@v3
140140
- uses: sqlc-dev/setup-sqlc@v3
141141
with:
142-
sqlc-version: '1.27.0'
142+
sqlc-version: '1.29.0'
143143
- uses: sqlc-dev/action-setup-postgres@master
144144
with:
145145
postgres-version: "16"
@@ -154,7 +154,7 @@ jobs:
154154
steps:
155155
- uses: sqlc-dev/setup-sqlc@v3
156156
with:
157-
sqlc-version: '1.27.0'
157+
sqlc-version: '1.29.0'
158158
- run: sqlc push
159159
env:
160160
SQLC_AUTH_TOKEN: ${{ secrets.SQLC_AUTH_TOKEN }}

0 commit comments

Comments
 (0)