Skip to content

Commit ebbbebd

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix-sqlite-order-by-args
* origin/main: (91 commits) build(deps): bump urllib3 from 2.6.2 to 2.6.3 in /docs (sqlc-dev#4259) build(deps): bump golang from 1.26.0 to 1.26.1 (sqlc-dev#4328) build(deps): bump the production-dependencies group across 1 directory with 4 updates (sqlc-dev#4348) Upgrade Go version to 1.26.0 (sqlc-dev#4312) Install PostgreSQL from theseus-rs/postgresql-binaries instead of apt (sqlc-dev#4310) build(deps): bump golang from 1.25.5 to 1.26.0 (sqlc-dev#4294) build(deps): bump the production-dependencies group across 1 directory with 2 updates (sqlc-dev#4296) Add sqlc-test-setup command for database test environment setup (sqlc-dev#4304) build(deps): bump filippo.io/edwards25519 from 1.1.0 to 1.1.1 (sqlc-dev#4303) build(deps): bump the production-dependencies group across 1 directory with 4 updates (sqlc-dev#4284) feat: add ClickHouse support to `sqlc parse` (sqlc-dev#4267) Add GitHub Topic to the plugins page (sqlc-dev#4258) build(deps): bump the production-dependencies group across 1 directory with 2 updates (sqlc-dev#4256) build(deps): bump the production-dependencies group across 1 directory with 4 updates (sqlc-dev#4248) fix(native): make MySQL connection check immediate on first attempt (sqlc-dev#4254) feat: graduate parsecmd experiment (sqlc-dev#4253) docs: Add Claude Code remote environment setup instructions (sqlc-dev#4246) Add parse subcommand with AST JSON output (sqlc-dev#4240) feat(postgresql): add analyzerv2 experiment for database-only analysis (sqlc-dev#4237) feat: add native database support for e2e tests without Docker (sqlc-dev#4236) ... # Conflicts: # internal/engine/sqlite/convert.go
2 parents 1c9ee2e + 4bf2159 commit ebbbebd

File tree

3,071 files changed

+16253
-5556
lines changed

Some content is hidden

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

3,071 files changed

+16253
-5556
lines changed

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ 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.30.0
1213
- 1.29.0
1314
- 1.28.0
1415
- 1.27.0

.github/workflows/buf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ jobs:
44
build:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v4
7+
- uses: actions/checkout@v6
88
- uses: bufbuild/buf-setup-action@v1
99
- uses: bufbuild/buf-lint-action@v1

.github/workflows/build.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: build
2+
on:
3+
workflow_dispatch:
4+
jobs:
5+
build:
6+
strategy:
7+
matrix:
8+
os: [ubuntu-24.04, macos-14, windows-2022]
9+
name: build ${{ matrix.os }}
10+
runs-on: ${{ matrix.os }}
11+
steps:
12+
- uses: actions/checkout@v6
13+
- uses: actions/setup-go@v6
14+
with:
15+
go-version: '1.26.0'
16+
- name: install ./...
17+
run: go build ./...
18+
env:
19+
CGO_ENABLED: "0"

.github/workflows/ci-kotlin.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
name: test
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
14-
- uses: actions/setup-go@v5
13+
- uses: actions/checkout@v6
14+
- uses: actions/setup-go@v6
1515
with:
16-
go-version: '1.24.1'
16+
go-version: '1.26.0'
1717
- name: install ./...
1818
run: go install ./...
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020
with:
2121
repository: sqlc-dev/sqlc-gen-kotlin
2222
path: kotlin

.github/workflows/ci-python.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
name: test
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
14-
- uses: actions/setup-go@v5
13+
- uses: actions/checkout@v6
14+
- uses: actions/setup-go@v6
1515
with:
16-
go-version: '1.24.1'
16+
go-version: '1.26.0'
1717
- name: install ./...
1818
run: go install ./...
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020
with:
2121
repository: sqlc-dev/sqlc-gen-python
2222
path: python

.github/workflows/ci-typescript.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
name: test
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
14-
- uses: actions/setup-go@v5
13+
- uses: actions/checkout@v6
14+
- uses: actions/setup-go@v6
1515
with:
16-
go-version: '1.24.1'
16+
go-version: '1.26.0'
1717
- name: install ./...
1818
run: go install ./...
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020
with:
2121
repository: sqlc-dev/sqlc-gen-typescript
2222
path: typescript

.github/workflows/ci.yml

Lines changed: 31 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,30 @@ on:
55
- main
66
pull_request:
77
jobs:
8-
test:
8+
build:
99
strategy:
1010
matrix:
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]
14-
cgo: ['1', '0']
15-
# Workaround no native support for conditional matrix items
16-
# https://github.com/orgs/community/discussions/26253#discussioncomment-6745038
17-
isMain:
18-
- ${{ github.ref == 'refs/heads/main' }}
19-
exclude:
20-
- isMain: false
21-
include:
22-
- os: ubuntu-22.04
23-
cgo: '1'
24-
- os: ubuntu-22.04
25-
cgo: '0'
26-
name: test ${{ matrix.os }} cgo=${{ matrix.cgo }}
27-
runs-on: ${{ matrix.os }}
28-
11+
goos: [darwin, linux, windows]
12+
goarch: [amd64, arm64]
13+
name: build ${{ matrix.goos }}/${{ matrix.goarch }}
14+
runs-on: ubuntu-24.04
15+
steps:
16+
- uses: actions/checkout@v6
17+
- uses: actions/setup-go@v6
18+
with:
19+
go-version: '1.26.0'
20+
- run: go build ./...
21+
env:
22+
CGO_ENABLED: "0"
23+
GOOS: ${{ matrix.goos }}
24+
GOARCH: ${{ matrix.goarch }}
25+
test:
26+
runs-on: ubuntu-24.04
2927
steps:
30-
- uses: actions/checkout@v4
31-
- uses: actions/setup-go@v5
28+
- uses: actions/checkout@v6
29+
- uses: actions/setup-go@v6
3230
with:
33-
go-version: '1.24.1'
31+
go-version: '1.26.0'
3432

3533
- name: install gotestsum
3634
run: go install gotest.tools/gotestsum@latest
@@ -44,37 +42,32 @@ jobs:
4442
- name: install ./...
4543
run: go install ./...
4644
env:
47-
CGO_ENABLED: ${{ matrix.cgo }}
45+
CGO_ENABLED: "0"
4846

4947
- name: build internal/endtoend
5048
run: go build ./...
5149
working-directory: internal/endtoend/testdata
5250
env:
53-
CGO_ENABLED: ${{ matrix.cgo }}
51+
CGO_ENABLED: "0"
5452

55-
# Start a PostgreSQL server
56-
- uses: sqlc-dev/action-setup-postgres@master
57-
with:
58-
postgres-version: "16"
59-
id: postgres
53+
- name: install databases
54+
run: go run ./cmd/sqlc-test-setup install
6055

61-
# Start a MySQL server
62-
- uses: shogo82148/actions-setup-mysql@v1
63-
with:
64-
mysql-version: "9.0"
56+
- name: start databases
57+
run: go run ./cmd/sqlc-test-setup start
6558

6659
- name: test ./...
67-
run: gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m ./...
60+
run: gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m -failfast ./...
6861
env:
6962
CI_SQLC_PROJECT_ID: ${{ secrets.CI_SQLC_PROJECT_ID }}
7063
CI_SQLC_AUTH_TOKEN: ${{ secrets.CI_SQLC_AUTH_TOKEN }}
7164
SQLC_AUTH_TOKEN: ${{ secrets.CI_SQLC_AUTH_TOKEN }}
72-
MYSQL_SERVER_URI: root:@tcp(localhost:3306)/mysql?multiStatements=true&parseTime=true
73-
POSTGRESQL_SERVER_URI: ${{ steps.postgres.outputs.connection-uri }}?sslmode=disable
74-
CGO_ENABLED: ${{ matrix.cgo }}
65+
POSTGRESQL_SERVER_URI: "postgres://postgres:postgres@127.0.0.1:5432/postgres?sslmode=disable"
66+
MYSQL_SERVER_URI: "root:mysecretpassword@tcp(127.0.0.1:3306)/mysql?multiStatements=true&parseTime=true"
67+
CGO_ENABLED: "0"
7568

7669
vuln_check:
77-
runs-on: ubuntu-22.04
70+
runs-on: ubuntu-24.04
7871
timeout-minutes: 5
7972

8073
steps:

.github/workflows/gen.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
# needed because the postgres container does not provide a healthcheck
1818
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
1919
steps:
20-
- uses: actions/checkout@v4
21-
- uses: actions/setup-go@v5
20+
- uses: actions/checkout@v6
21+
- uses: actions/setup-go@v6
2222
with:
2323
go-version-file: go.mod
2424
check-latest: true
@@ -32,7 +32,7 @@ jobs:
3232
PG_PASSWORD: postgres
3333
PG_PORT: ${{ job.services.postgres.ports['5432'] }}
3434
- name: Save results
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@v6
3636
with:
3737
name: sqlc-pg-gen-results
3838
path: gen

0 commit comments

Comments
 (0)