Merge branch 'main' of https://github.com/sqlc-dev/sqlc into fix-sqlite-order-by-args

* 'main' of https://github.com/sqlc-dev/sqlc:
  Map xid8 to pgtype.Uint64 for pgx/v5 (#4387)
  Rename :one return variable when it conflicts with a parameter (#4383)
  Coerce SQLite JSONB output regardless of type casing (#4385)
  Dedupe sqlc.arg parameters wrapped in a type cast for MySQL (#4384)
  Preserve MySQL optimizer hints in generated query text (#4382)
  Skip CI/RTD builds when the change is irrelevant (#4381)
  build(deps): bump the production-dependencies group across 1 directory with 11 updates (#4380)
  build(deps): bump the production-dependencies group across 1 directory with 5 updates (#4368)
  build(deps): bump pygments from 2.19.2 to 2.20.0 in /docs (#4363)
  build(deps): bump requests from 2.32.5 to 2.33.0 in /docs (#4357)
  Remove github.com/jackc/pgx/v4 dependency (#4379)
  Upgrade Go toolchain to 1.26.2 (#4378)
  build(deps): bump actions/upload-artifact from 6 to 7 (#4320)
  docs: add sqlc-gen-sqlx to community language support (#4371)
  build(deps): bump github.com/jackc/pgx/v5 from 5.8.0 to 5.9.0 (#4377)
  Catch invalid ON CONFLICT DO UPDATE column references (#4366)

Author: khepin

.github/workflows/buf.yml

@@ -1,5 +1,9 @@
 name: buf
-on: pull_request
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
-        go-version: '1.26.0'
+        go-version: '1.26.2'
     - name: install ./...
       run: go build ./...
       env:

.github/workflows/ci-kotlin.yml

@@ -3,7 +3,13 @@ on:
   push:
     branches:
       - main
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
   pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
 jobs:
   build:
     if: false
@@ -13,7 +19,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
-          go-version: '1.26.0'
+          go-version: '1.26.2'
       - name: install ./...
         run: go install ./...
       - uses: actions/checkout@v6

.github/workflows/ci-python.yml

@@ -3,7 +3,13 @@ on:
   push:
     branches:
       - main
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
   pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
 jobs:
   build:
     if: false
@@ -13,7 +19,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
-          go-version: '1.26.0'
+          go-version: '1.26.2'
       - name: install ./...
         run: go install ./...
       - uses: actions/checkout@v6

.github/workflows/ci-typescript.yml

@@ -3,7 +3,13 @@ on:
   push:
     branches:
       - main
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
   pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
 jobs:
   build:
     if: false
@@ -13,7 +19,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
-          go-version: '1.26.0'
+          go-version: '1.26.2'
       - name: install ./...
         run: go install ./...
       - uses: actions/checkout@v6

.github/workflows/ci.yml

@@ -3,7 +3,13 @@ on:
   push:
     branches:
       - main
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
   pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '.readthedocs.yaml'
 jobs:
   build:
     strategy:
@@ -16,7 +22,7 @@ jobs:
     - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
-        go-version: '1.26.0'
+        go-version: '1.26.2'
     - run: go build ./...
       env:
         CGO_ENABLED: "0"
@@ -28,7 +34,7 @@ jobs:
     - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
-        go-version: '1.26.0'
+        go-version: '1.26.2'
 
     - name: install gotestsum
       run: go install gotest.tools/gotestsum@latest

.github/workflows/gen.yml

@@ -32,7 +32,7 @@ jobs:
         PG_PASSWORD: postgres
         PG_PORT: ${{ job.services.postgres.ports['5432'] }}
     - name: Save results
-      uses: actions/upload-artifact@v6
+      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:

CLAUDE.md

@@ -6,7 +6,7 @@ This document provides essential information for working with the sqlc codebase,
 
 ### Prerequisites
 
-- **Go 1.26.0+** - Required for building and testing
+- **Go 1.26.2+** - Required for building and testing
 - **Docker & Docker Compose** - Required for integration tests with databases (local development)
 - **Git** - For version control
 
@@ -147,7 +147,7 @@ make start             # Start database containers
 ### GitHub Actions Workflow
 
 - **File:** `.github/workflows/ci.yml`
-- **Go Version:** 1.26.0
+- **Go Version:** 1.26.2
 - **Database Setup:** Uses `sqlc-test-setup` (not Docker) to install and start PostgreSQL and MySQL directly on the runner
 - **Test Command:** `gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m ./...`
 - **Additional Checks:** `govulncheck` for vulnerability scanning

Dockerfile

@@ -1,5 +1,5 @@
 # STEP 1: Build sqlc
-FROM golang:1.26.1 AS builder
+FROM golang:1.26.2 AS builder
 
 COPY . /workspace
 WORKDIR /workspace