Merge branch 'main' into fix-embed-naming

Author: sapk

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -9,6 +9,7 @@ body:
       description: What version of sqlc are you running? If you don't know, run `sqlc version`.
       multiple: false
       options:
+        - 1.24.0
         - 1.23.0
         - 1.22.0
         - 1.21.0

.github/workflows/ci-kotlin.yml

@@ -5,48 +5,22 @@ on:
       - main
   pull_request:
 jobs:
-
   build:
     name: test
     runs-on: ubuntu-latest
-
-    services:
-      postgres:
-        image: postgres:11
-        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
-      mysql:
-        image: mysql:8
-        env:
-          MYSQL_ROOT_PASSWORD: mysecretpassword
-          MYSQL_DATABASE: mysql
-        ports:
-          - 3306:3306
-
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-go@v5
         with:
-          distribution: 'adopt'
-          java-version: '11'
-      - uses: eskatos/gradle-command-action@v2
-        env:
-          PG_USER: postgres
-          PG_HOST: localhost
-          PG_DATABASE: postgres
-          PG_PASSWORD: postgres
-          PG_PORT: ${{ job.services.postgres.ports['5432'] }}
-          MYSQL_DATABASE: mysql
-          MYSQL_HOST: localhost
-          MYSQL_PORT: ${{ job.services.mysql.ports['3306'] }}
-          MYSQL_ROOT_PASSWORD: mysecretpassword
+          go-version: '1.21.3'
+      - name: install ./...
+        run: go install ./...
+      - uses: actions/checkout@v4
         with:
-          build-root-directory: examples/kotlin
-          wrapper-directory: examples/kotlin
-          arguments: test --scan
+          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

@@ -5,40 +5,21 @@ on:
       - main
   pull_request:
 jobs:
-
   build:
     name: test
     runs-on: ubuntu-latest
-
-    services:
-      postgres:
-        image: postgres:11
-        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@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-go@v5
         with:
-          python-version: 3.9
-      - name: Install python dependencies
-        working-directory: ./examples/python
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install -r requirements.txt
-      - name: Test python code
-        working-directory: ./examples/python
-        env:
-          PG_USER: postgres
-          PG_HOST: localhost
-          PG_DATABASE: postgres
-          PG_PASSWORD: postgres
-          PG_PORT: ${{ job.services.postgres.ports['5432'] }}
-        run: |
-          pytest src/tests
+          go-version: '1.21.3'
+      - name: install ./...
+        run: go install ./...
+      - uses: actions/checkout@v4
+        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,23 @@
+name: typescript
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+jobs:
+  build:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.21.3'
+      - name: install ./...
+        run: go install ./...
+      - uses: actions/checkout@v4
+        with:
+          repository: sqlc-dev/sqlc-gen-typescript
+          path: typescript
+      - run: sqlc diff
+        working-directory: typescript/examples

.github/workflows/ci.yml

@@ -5,45 +5,32 @@ on:
       - main
   pull_request:
 jobs:
-  windows-build:
-    if: ${{ github.ref == 'refs/heads/main' }}
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v4
-      with:
-        go-version: '1.21.3'
-    - run: go build ./...
-
-  darwin-build:
-    if: ${{ github.ref == 'refs/heads/main' }}
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v4
-      with:
-        go-version: '1.21.3'
-    - run: go build ./...
-
-  build:
-    name: test
-    runs-on: ubuntu-latest
-
-    services:
-      mysql:
-        image: "mysql/mysql-server:8.0"
-        env:
-          MYSQL_DATABASE: mysql
-          MYSQL_ROOT_HOST: '%'
-          MYSQL_ROOT_PASSWORD: mysecretpassword
-        ports:
-        - 3306:3306
+  test:
+    strategy:
+      max-parallel: 2
+      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 }}
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
-        go-version: '1.21.3'
+        go-version-file: go.mod
+        check-latest: true
 
     - name: install gotestsum
       run: go install gotest.tools/gotestsum@latest
@@ -53,30 +40,32 @@ jobs:
 
     - name: install ./...
       run: go install ./...
+      env:
+        CGO_ENABLED: ${{ matrix.cgo }}
 
     - name: build internal/endtoend
       run: go build ./...
       working-directory: internal/endtoend/testdata
+      env:
+        CGO_ENABLED: ${{ matrix.cgo }}
 
     - name: test ./...
       run: gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m ./...
       env:
-        MYSQL_DATABASE: mysql
-        MYSQL_HOST: localhost
-        MYSQL_PORT: ${{ job.services.mysql.ports['3306'] }}
-        MYSQL_ROOT_PASSWORD: mysecretpassword
         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 }}
+        CGO_ENABLED: ${{ matrix.cgo }}
 
   vuln_check:
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
-        go-version: '1.21.3'
+        go-version-file: go.mod
+        check-latest: true
     - run: go install golang.org/x/vuln/cmd/govulncheck@latest
     - run: govulncheck ./...

.github/workflows/gen.yml

@@ -18,9 +18,10 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
-        go-version: '1.21.3'
+        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
@@ -31,7 +32,7 @@ jobs:
         PG_PASSWORD: postgres
         PG_PORT: ${{ job.services.postgres.ports['5432'] }}
     - name: Save results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: sqlc-pg-gen-results
         path: gen

Dockerfile

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

buf.gen.yaml

@@ -1,6 +1,8 @@
 version: v1
 managed:
   enabled: true
+  go_package_prefix:
+    default: "github.com/sqlc-dev/sqlc/internal"
 plugins:
   - plugin: buf.build/protocolbuffers/go:v1.30.0
     out: internal

buf.yaml

@@ -3,7 +3,7 @@
 {% block breadcrumbs %}
 {% if show_banner %}
 <header id="banner">
-  <div>Query analysis, now <a href="https://sqlc.dev/posts/2023/10/24/sqlc-v1-23-0-database-backed-analyzer/">powered by PostgreSQL</a>.</div>
+  <div>Introducing <a href="https://sqlc.dev/posts/2023/12/04/preview-typescript-support-with-sqlc-gen-typescript/">sqlc-gen-typescript</a>: Generate TypeScript from SQL.</div>
 </header>
 {% endif %}
 {{ super() }}

docs/_templates/breadcrumbs.html

@@ -22,7 +22,7 @@
 author = 'Riza, Inc.'
 
 # The full version, including alpha/beta/rc tags
-release = '1.23.0'
+release = '1.24.0'
 
 
 # -- General configuration ---------------------------------------------------
@@ -33,7 +33,8 @@
 extensions = [
     'myst_parser',
     'sphinx_rtd_theme',
-    "sphinx_favicon",
+    'sphinx_favicon',
+    'sphinxext.rediraffe',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -75,4 +76,8 @@ def setup(app):
 myst_enable_extensions = [
     "attrs_inline",
     "colon_fence",
-]
+]
+
+rediraffe_redirects = {
+    "howto/upload.md": "howto/push.md",
+}