Merge upstream v1.31.1

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -9,6 +9,8 @@ body:
       description: What version of sqlc are you running? If you don't know, run `sqlc version`.
       multiple: false
       options:
+        - 1.31.1
+        - 1.31.0
         - 1.30.0
         - 1.29.0
         - 1.28.0

.github/workflows/buf.yml

@@ -1,9 +1,13 @@
 name: buf
-on: pull_request
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: bufbuild/buf-setup-action@v1
       - uses: bufbuild/buf-lint-action@v1

.github/workflows/build.yml

@@ -9,10 +9,10 @@ jobs:
     name: build ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
-        go-version: '1.25.0'
+        go-version: '1.26.2'
     - name: install ./...
       run: go build ./...
       env:

.github/workflows/ci-kotlin.yml

@@ -3,20 +3,26 @@ 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@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
-          go-version: '1.24.1'
+          go-version: '1.26.2'
       - name: install ./...
         run: go install ./...
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           repository: sqlc-dev/sqlc-gen-kotlin
           path: kotlin

.github/workflows/ci-python.yml

@@ -3,20 +3,26 @@ 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@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
-          go-version: '1.24.1'
+          go-version: '1.26.2'
       - name: install ./...
         run: go install ./...
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           repository: sqlc-dev/sqlc-gen-python
           path: python

.github/workflows/ci-typescript.yml

@@ -3,20 +3,26 @@ 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@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
-          go-version: '1.24.1'
+          go-version: '1.26.2'
       - name: install ./...
         run: go install ./...
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           repository: sqlc-dev/sqlc-gen-typescript
           path: typescript

.github/workflows/ci.yml

@@ -13,10 +13,10 @@ jobs:
     name: build ${{ matrix.goos }}/${{ matrix.goarch }}
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
-        go-version: '1.25.0'
+        go-version: '1.26.2'
     - run: go build ./...
       env:
         CGO_ENABLED: "0"
@@ -25,10 +25,10 @@ jobs:
   test:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
-        go-version: '1.25.0'
+        go-version: '1.26.2'
 
     - name: install gotestsum
       run: go install gotest.tools/gotestsum@latest
@@ -50,13 +50,20 @@ jobs:
       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 ./...
-      if: ${{ matrix.os }} != "windows-2022"
+      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:[email protected]: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:

.github/workflows/gen.yml

@@ -17,7 +17,7 @@ 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@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
         go-version-file: go.mod
@@ -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@v7
       with:
         name: sqlc-pg-gen-results
         path: gen

.readthedocs.yaml

@@ -10,6 +10,14 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3.11"
+  jobs:
+    post_checkout:
+      # Cancel PR builds that don't touch the docs.
+      # https://docs.readthedocs.io/en/stable/build-customization.html#cancel-build-based-on-a-condition
+      - |
+        if [ "$READTHEDOCS_VERSION_TYPE" = "external" ] && git diff --quiet origin/main -- docs/ .readthedocs.yaml; then
+          exit 183
+        fi
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx: