Sync upstream v1.31.1 and isolate wicked Go code generation

.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,13 +9,14 @@ body:
       description: What version of sqlc are you running? If you don't know, run `sqlc version`.
       multiple: false
       options:
-        - 1.21.0
-        - 1.20.0
-        - 1.19.1
-        - 1.19.0
-        - 1.18.0
-        - 1.17.2
-        - 1.16.0
+        - 1.31.1
+        - 1.31.0
+        - 1.30.0
+        - 1.29.0
+        - 1.28.0
+        - 1.27.0
+        - 1.26.0
+        - 1.25.0
         - Other
     validations:
       required: true
@@ -50,7 +51,7 @@ body:
     id: config
     attributes:
       label: Configuration
-      description: Please include the sqlc.yaml or sqlc.json file you using in your project. This will be automatically formatted, so no need for backticks.
+      description: Please include the sqlc.(yaml|yml) or sqlc.json file you using in your project. This will be automatically formatted, so no need for backticks.
       render: yaml
   - type: input
     id: playground

.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

@@ -0,0 +1,13 @@
+name: buf
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - 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.8'
+    - name: install ./...
+      run: go build ./...
+      env:
+        CGO_ENABLED: "0"

.github/workflows/ci-kotlin.yml

@@ -0,0 +1,32 @@
+name: kotlin
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
+jobs:
+  build:
+    if: false
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
+        with:
+          go-version: '1.26.8'
+      - name: install ./...
+        run: go install ./...
+      - uses: actions/checkout@v6
+        with:
+          repository: sqlc-dev/sqlc-gen-kotlin
+          path: kotlin
+      - run: make test
+        working-directory: kotlin
+      - run: sqlc diff
+        working-directory: kotlin/examples

.github/workflows/ci-python.yml

@@ -0,0 +1,32 @@
+name: python
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
+jobs:
+  build:
+    if: false
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
+        with:
+          go-version: '1.26.8'
+      - name: install ./...
+        run: go install ./...
+      - uses: actions/checkout@v6
+        with:
+          repository: sqlc-dev/sqlc-gen-python
+          path: python
+      - run: make test
+        working-directory: python
+      - run: sqlc diff
+        working-directory: python/examples

.github/workflows/ci-typescript.yml

@@ -0,0 +1,32 @@
+name: typescript
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
+jobs:
+  build:
+    if: false
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
+        with:
+          go-version: '1.26.8'
+      - name: install ./...
+        run: go install ./...
+      - uses: actions/checkout@v6
+        with:
+          repository: sqlc-dev/sqlc-gen-typescript
+          path: typescript
+          # v0.1.3
+          ref: daaf539092421adc15f6c3164279a3470716b560
+      - run: sqlc diff
+        working-directory: typescript/examples

.github/workflows/ci.yml

@@ -0,0 +1,76 @@
+name: go
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+jobs:
+  build:
+    strategy:
+      matrix:
+        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.8'
+    - run: go build ./...
+      env:
+        CGO_ENABLED: "0"
+        GOOS: ${{ matrix.goos }}
+        GOARCH: ${{ matrix.goarch }}
+  test:
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v6
+    - uses: actions/setup-go@v6
+      with:
+        go-version: '1.26.8'
+
+    - 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: "0"
+
+    - name: build internal/endtoend
+      run: go build ./...
+      working-directory: internal/endtoend/testdata
+      env:
+        CGO_ENABLED: "0"
+
+    - name: install databases
+      run: go run ./cmd/sqlc-test-setup install
+
+    - name: start databases
+      run: go run ./cmd/sqlc-test-setup start
+
+    - name: test ./...
+      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 }}
+        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-24.04
+    timeout-minutes: 5
+
+    steps:
+    - uses: golang/govulncheck-action@v1
+      with:
+        go-version-input: '1.26.8'

.github/workflows/gen.yml

@@ -0,0 +1,39 @@
+name: sqlc-pg-gen
+on:
+  workflow_dispatch:
+jobs:
+  gen:
+    name: sqlc-pg-gen
+    runs-on: ubuntu-22.04
+    services:
+      postgres:
+        image: postgres:15.0-alpine
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        ports:
+        - 5432:5432
+        # 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@v6
+    - uses: actions/setup-go@v6
+      with:
+        go-version-file: go.mod
+        check-latest: true
+    - run: go build -o sqlc-pg-gen ./internal/tools/sqlc-pg-gen
+    - run: mkdir -p gen/contrib
+    - run: ./sqlc-pg-gen gen
+      env:
+        PG_USER: postgres
+        PG_HOST: localhost
+        PG_DATABASE: postgres
+        PG_PASSWORD: postgres
+        PG_PORT: ${{ job.services.postgres.ports['5432'] }}
+    - name: Save results
+      uses: actions/upload-artifact@v7
+      with:
+        name: sqlc-pg-gen-results
+        path: gen
+

.github/workflows/wicked.yml

@@ -0,0 +1,33 @@
+name: wicked
+on:
+  pull_request:
+  push:
+    branches: [main]
+permissions:
+  contents: read
+jobs:
+  bookstore:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
+        with:
+          go-version-file: go.mod
+      - run: make build COMMIT_HASH=v2.4.0-dev
+      - name: Check generated consumer and JSON contracts
+        working-directory: internal/endtoend/testdata
+        run: go test ./wicked_compat/go
+      - uses: actions/checkout@v6
+        with:
+          repository: Stumble/bookstore
+          ref: 2a7f7e396451821a8fe3054eb265037b830af68d
+          path: bookstore
+      - name: Check generated API and code
+        working-directory: bookstore
+        run: |
+          make sqlc SQLC="$GITHUB_WORKSPACE/bin/sqlc"
+          make sqlc-verify SQLC="$GITHUB_WORKSPACE/bin/sqlc"
+          git diff --exit-code -- pkg/repos
+      - name: Run runtime contracts
+        working-directory: bookstore
+        run: go test -race -count=1 -p 1 -timeout 10m ./pkg/usecases