Merge branch 'sqlc-dev:main' into main

Author: mrmelon54

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -1,6 +1,6 @@
 name: Bug Report
 description: File a bug report
-labels: [bug, triage]
+labels: [bug]
 body:
   - type: dropdown
     id: version
@@ -9,17 +9,12 @@ body:
       description: What version of sqlc are you running? If you don't know, run `sqlc version`.
       multiple: false
       options:
+        - 1.30.0
+        - 1.29.0
+        - 1.28.0
+        - 1.27.0
+        - 1.26.0
         - 1.25.0
-        - 1.24.0
-        - 1.23.0
-        - 1.22.0
-        - 1.21.0
-        - 1.20.0
-        - 1.19.1
-        - 1.19.0
-        - 1.18.0
-        - 1.17.2
-        - 1.16.0
         - Other
     validations:
       required: true

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

@@ -1,6 +1,6 @@
 name: Feature Request
 description: Request a new feature or a change to an existing feature
-labels: [enhancement, triage]
+labels: [enhancement]
 body:
   - type: textarea
     id: feature

.github/dependabot.yml

@@ -4,6 +4,11 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+    groups:
+      production-dependencies:
+        dependency-type: "production"
+      development-dependencies:
+        dependency-type: "development"
   - package-ecosystem: "docker"
     directory: "/"
     schedule:
@@ -21,3 +26,9 @@ updates:
       # sphinx
       - dependency-name: "docutils"
       - dependency-name: "sphinx"
+    groups:
+      production-dependencies:
+        dependency-type: "production"
+      development-dependencies:
+        dependency-type: "development"
+

.github/workflows/buf.yml

@@ -4,6 +4,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: bufbuild/buf-setup-action@v1
       - uses: bufbuild/buf-lint-action@v1

.github/workflows/build.yml

@@ -0,0 +1,19 @@
+name: build
+on:
+  workflow_dispatch:
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-24.04, macos-14, windows-2022]
+    name: build ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v6
+    - uses: actions/setup-go@v6
+      with:
+        go-version: '1.26.0'
+    - name: install ./...
+      run: go build ./...
+      env:
+        CGO_ENABLED: "0"

.github/workflows/ci-kotlin.yml

@@ -6,16 +6,17 @@ on:
   pull_request:
 jobs:
   build:
+    if: false
     name: test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
-          go-version: '1.21.3'
+          go-version: '1.26.0'
       - name: install ./...
         run: go install ./...
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           repository: sqlc-dev/sqlc-gen-kotlin
           path: kotlin

.github/workflows/ci-python.yml

@@ -6,16 +6,17 @@ on:
   pull_request:
 jobs:
   build:
+    if: false
     name: test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
-          go-version: '1.21.3'
+          go-version: '1.26.0'
       - name: install ./...
         run: go install ./...
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           repository: sqlc-dev/sqlc-gen-python
           path: python

.github/workflows/ci-typescript.yml

@@ -6,16 +6,17 @@ on:
   pull_request:
 jobs:
   build:
+    if: false
     name: test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
-          go-version: '1.21.3'
+          go-version: '1.26.0'
       - name: install ./...
         run: go install ./...
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           repository: sqlc-dev/sqlc-gen-typescript
           path: typescript

.github/workflows/ci.yml

@@ -5,79 +5,70 @@ on:
       - main
   pull_request:
 jobs:
-  test:
+  build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        cgo: ['1', '0']
-        # Workaround no native support for conditional matrix items
-        # https://github.com/orgs/community/discussions/26253#discussioncomment-6745038
-        isMain:
-          - ${{ github.ref == 'refs/heads/main' }}
-        exclude:
-          - isMain: false
-        include:
-        - os: ubuntu-latest
-          cgo: '1'
-        - os: ubuntu-latest
-          cgo: '0'
-    name: test ${{ matrix.os }} cgo=${{ matrix.cgo }}
-    runs-on: ${{ matrix.os }}
-
+        goos: [darwin, linux, windows]
+        goarch: [amd64, arm64]
+    name: build ${{ matrix.goos }}/${{ matrix.goarch }}
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v6
+    - uses: actions/setup-go@v6
+      with:
+        go-version: '1.26.0'
+    - run: go build ./...
+      env:
+        CGO_ENABLED: "0"
+        GOOS: ${{ matrix.goos }}
+        GOARCH: ${{ matrix.goarch }}
+  test:
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
+    - uses: actions/checkout@v6
+    - uses: actions/setup-go@v6
       with:
-        go-version-file: go.mod
-        check-latest: true
+        go-version: '1.26.0'
 
     - name: install gotestsum
       run: go install gotest.tools/gotestsum@latest
 
     - name: install sqlc-gen-test
       run: go install github.com/sqlc-dev/sqlc-gen-test@v0.1.0
 
+    - name: install test-json-process-plugin
+      run: go install ./scripts/test-json-process-plugin/
+
     - name: install ./...
       run: go install ./...
       env:
-        CGO_ENABLED: ${{ matrix.cgo }}
+        CGO_ENABLED: "0"
 
     - name: build internal/endtoend
       run: go build ./...
       working-directory: internal/endtoend/testdata
       env:
-        CGO_ENABLED: ${{ matrix.cgo }}
+        CGO_ENABLED: "0"
 
-    # Start a PostgreSQL server
-    - uses: sqlc-dev/action-setup-postgres@master
-      with:
-        postgres-version: "16"
-      id: postgres
+    - name: install databases
+      run: go run ./cmd/sqlc-test-setup install
 
-    # Start a MySQL server
-    - uses: shogo82148/actions-setup-mysql@v1
-      with:
-        mysql-version: "8.1"
+    - name: start databases
+      run: go run ./cmd/sqlc-test-setup start
 
     - name: test ./...
-      run: gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m ./...
+      run: gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m -failfast ./...
       env:
         CI_SQLC_PROJECT_ID: ${{ secrets.CI_SQLC_PROJECT_ID }}
         CI_SQLC_AUTH_TOKEN: ${{ secrets.CI_SQLC_AUTH_TOKEN }}
         SQLC_AUTH_TOKEN: ${{ secrets.CI_SQLC_AUTH_TOKEN }}
-        MYSQL_SERVER_URI: root:@tcp(localhost:3306)/mysql?multiStatements=true&parseTime=true
-        POSTGRESQL_SERVER_URI: ${{ steps.postgres.outputs.connection-uri }}?sslmode=disable
-        CGO_ENABLED: ${{ matrix.cgo }}
+        POSTGRESQL_SERVER_URI: "postgres://postgres:postgres@127.0.0.1:5432/postgres?sslmode=disable"
+        MYSQL_SERVER_URI: "root:mysecretpassword@tcp(127.0.0.1:3306)/mysql?multiStatements=true&parseTime=true"
+        CGO_ENABLED: "0"
 
   vuln_check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 5
 
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-        check-latest: true
-    - run: go install golang.org/x/vuln/cmd/govulncheck@latest
-    - run: govulncheck ./...
+    - uses: golang/govulncheck-action@v1

.github/workflows/gen.yml

@@ -17,8 +17,8 @@ jobs:
         # needed because the postgres container does not provide a healthcheck
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
+    - uses: actions/checkout@v6
+    - uses: actions/setup-go@v6
       with:
         go-version-file: go.mod
         check-latest: true
@@ -32,7 +32,7 @@ jobs:
         PG_PASSWORD: postgres
         PG_PORT: ${{ job.services.postgres.ports['5432'] }}
     - name: Save results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: sqlc-pg-gen-results
         path: gen