Merge branch 'main' into fix-embed-naming

Author: sapk

.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,6 +9,9 @@ body:
       description: What version of sqlc are you running? If you don't know, run `sqlc version`.
       multiple: false
       options:
+        - 1.27.0
+        - 1.26.0
+        - 1.25.0
         - 1.24.0
         - 1.23.0
         - 1.22.0

.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/ci-typescript.yml

@@ -19,5 +19,7 @@ jobs:
         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

@@ -7,9 +7,10 @@ on:
 jobs:
   test:
     strategy:
-      max-parallel: 2
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        # Disabling windows builds while we figure out why they're broken
+        # os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest]
         cgo: ['1', '0']
         # Workaround no native support for conditional matrix items
         # https://github.com/orgs/community/discussions/26253#discussioncomment-6745038
@@ -29,8 +30,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5
       with:
-        go-version-file: go.mod
-        check-latest: true
+        go-version: '1.22.5'
 
     - name: install gotestsum
       run: go install gotest.tools/gotestsum@latest
@@ -49,12 +49,25 @@ jobs:
       env:
         CGO_ENABLED: ${{ matrix.cgo }}
 
+    # Start a PostgreSQL server
+    - uses: sqlc-dev/action-setup-postgres@master
+      with:
+        postgres-version: "16"
+      id: postgres
+
+    # Start a MySQL server
+    - uses: shogo82148/actions-setup-mysql@v1
+      with:
+        mysql-version: "8.1"
+
     - name: test ./...
       run: gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m ./...
       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 }}
 
   vuln_check:
@@ -65,7 +78,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5
       with:
-        go-version-file: go.mod
-        check-latest: true
+        go-version: '1.22.5'
     - run: go install golang.org/x/vuln/cmd/govulncheck@latest
     - run: govulncheck ./...

Dockerfile

@@ -1,5 +1,5 @@
 # STEP 1: Build sqlc
-FROM golang:1.21.5 AS builder
+FROM golang:1.22.6 AS builder
 
 COPY . /workspace
 WORKDIR /workspace
@@ -13,7 +13,7 @@ ENV VERSION=$version
 RUN go run scripts/release.go -docker
 
 # STEP 2: Build a tiny image
-FROM scratch
+FROM gcr.io/distroless/base-debian12
 
 COPY --from=builder /workspace/sqlc /workspace/sqlc
 ENTRYPOINT ["/workspace/sqlc"]

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Riza, Inc.
+Copyright (c) 2024 Riza, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build build-endtoend test test-ci test-examples test-endtoend regen start psql mysqlsh proto
+.PHONY: build build-endtoend test test-ci test-examples test-endtoend start psql mysqlsh proto
 
 build:
 	go build ./...
@@ -9,6 +9,9 @@ install:
 test:
 	go test ./...
 
+test-managed:
+	MYSQL_SERVER_URI="invalid" POSTGRESQL_SERVER_URI="postgres://postgres:mysecretpassword@localhost:5432/postgres" go test -v ./...
+
 vet:
 	go vet ./...
 
@@ -20,9 +23,6 @@ build-endtoend:
 
 test-ci: test-examples build-endtoend vet
 
-regen: sqlc-dev sqlc-gen-json
-	go run ./scripts/regenerate/
-
 sqlc-dev:
 	go build -o ~/bin/sqlc-dev ./cmd/sqlc/
 

README.md

@@ -20,7 +20,44 @@ Check out [an interactive example](https://play.sqlc.dev/) to see it in action,
 - [Downloads](https://downloads.sqlc.dev/)
 - [Community](https://discord.gg/EcXzGe5SEs)
 
-## Acknowledgments
-
-sqlc was inspired by [PugSQL](https://pugsql.org/) and
-[HugSQL](https://www.hugsql.org/).
+## Supported languages
+
+- [sqlc-gen-go](https://github.com/sqlc-dev/sqlc-gen-go)
+- [sqlc-gen-kotlin](https://github.com/sqlc-dev/sqlc-gen-kotlin)
+- [sqlc-gen-python](https://github.com/sqlc-dev/sqlc-gen-python)
+- [sqlc-gen-typescript](https://github.com/sqlc-dev/sqlc-gen-typescript)
+
+Additional languages can be added via [plugins](https://docs.sqlc.dev/en/latest/reference/language-support.html#community-language-support).
+
+## Sponsors
+
+Development is possible thanks to our sponsors. If you would like to support sqlc,
+please consider [sponsoring on GitHub](https://github.com/sponsors/kyleconroy).
+
+<p align="center">
+  <a href="https://riza.io?utm_source=sqlc+readme"><img width=400 src="https://sqlc.dev/sponsors/riza-readme.png" alt="Riza.io"></a>
+</p>
+
+<p align="center">
+  <a href="https://coder.com?utm_source=sqlc+readme"><img width=200 src="https://sqlc.dev/sponsors/coder-readme.png" alt="Coder.com" /></a>
+  <a href="https://mint.fun?utm_source=sqlc+readme"><img width=200 src="https://sqlc.dev/sponsors/mint-readme.png" alt="Mint.fun" /></a>
+  <a href="https://mux.com?utm_source=sqlc+readme"><img width=200 src="https://sqlc.dev/sponsors/mux-readme.png" alt="Mux.com" /></a>
+</p>
+
+<p align="center">
+  <a href="https://github.com/Cyberax">Cyberax</a> - 
+  <a href="https://github.com/NaNuNaNu">NaNuNaNu</a> - 
+  <a href="https://github.com/Stumble">Stumble</a> - 
+  <a href="https://github.com/WestfalNamur">WestfalNamur</a> - 
+  <a href="https://github.com/alecthomas">alecthomas</a> - 
+  <a href="https://github.com/cameronnewman">cameronnewman</a> - 
+  <a href="https://github.com/danielbprice">danielbprice</a> - 
+  <a href="https://github.com/davherrmann">davherrmann</a> - 
+  <a href="https://github.com/dvob">dvob</a> - 
+  <a href="https://github.com/gilcrest">gilcrest</a> - 
+  <a href="https://github.com/gzuidhof">gzuidhof</a> - 
+  <a href="https://github.com/jeffreylo">jeffreylo</a> - 
+  <a href="https://github.com/mmcloughlin">mmcloughlin</a> - 
+  <a href="https://github.com/ryohei1216">ryohei1216</a> - 
+  <a href="https://github.com/sgielen">sgielen</a>
+</p>

docker-compose.yml

@@ -10,72 +10,12 @@ services:
       MYSQL_ROOT_PASSWORD: mysecretpassword
       MYSQL_ROOT_HOST: '%'
 
-  mysql5:
-    image: "mysql/mysql-server:5.7"
-    ports:
-      - "3305:3306"
-    restart: always
-    environment:
-      MYSQL_DATABASE: dinotest
-      MYSQL_ROOT_PASSWORD: mysecretpassword
-      MYSQL_ROOT_HOST: '%'
-    profiles:
-      - mysql
-
   postgresql:
-    image: "postgres:15"
+    image: "postgres:16"
     ports:
       - "5432:5432"
     restart: always
     environment:
       POSTGRES_DB: postgres
       POSTGRES_PASSWORD: mysecretpassword
       POSTGRES_USER: postgres
-
-  postgresql14:
-    image: "postgres:14"
-    ports:
-      - "5414:5432"
-    restart: always
-    environment:
-      POSTGRES_DB: postgres
-      POSTGRES_PASSWORD: mysecretpassword
-      POSTGRES_USER: postgres
-    profiles:
-      - postgres
-
-  postgresql13:
-    image: "postgres:13"
-    ports:
-      - "5413:5432"
-    restart: always
-    environment:
-      POSTGRES_DB: postgres
-      POSTGRES_PASSWORD: mysecretpassword
-      POSTGRES_USER: postgres
-    profiles:
-      - postgres
-
-  postgresql12:
-    image: "postgres:12"
-    ports:
-      - "5412:5432"
-    restart: always
-    environment:
-      POSTGRES_DB: postgres
-      POSTGRES_PASSWORD: mysecretpassword
-      POSTGRES_USER: postgres
-    profiles:
-      - postgres
-
-  postgresql11:
-    image: "postgres:11"
-    ports:
-      - "5411:5432"
-    restart: always
-    environment:
-      POSTGRES_DB: postgres
-      POSTGRES_PASSWORD: mysecretpassword
-      POSTGRES_USER: postgres
-    profiles:
-      - postgres

docs/_static/customize.css

@@ -14,4 +14,9 @@
 #banner > div > a {
   color: #F0F0F4;
   text-decoration: underline;
-}
+}
+
+#sponsorship > img {
+  width: 100%;
+  max-width: 200px;
+}

docs/_templates/breadcrumbs.html

@@ -2,9 +2,6 @@
 
 {% block breadcrumbs %}
 {% if show_banner %}
-<header id="banner">
-  <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() }}
 {% endblock %}

docs/_templates/layout.html

@@ -1,6 +1,16 @@
 {% extends "!layout.html" %}
 
 {% block extrahead %}
-<script defer data-domain="docs.sqlc.dev" src="https://plausible.io/js/plausible.js"></script>
+<script defer data-domain="docs.sqlc.dev" data-api="https://proxy.sqlc.dev/api/event" src="https://proxy.sqlc.dev/js/script.js"></script>
 {{ super() }}
-{% endblock %}
+{% endblock %}
+
+{% block menu %}
+{{ super() }}
+<p class="caption" role="heading"><span class="caption-text">Sponsored By</span></p>
+<div>
+<a id="sponsorship" href="https://riza.io?utm_source=sqlc+docs">
+<img src="https://sqlc.dev/sponsors/riza-readme.png" alt="Riza logo" />
+</a>
+</div>
+{% endblock %}

docs/conf.py

@@ -18,11 +18,11 @@
 # -- Project information -----------------------------------------------------
 
 project = 'sqlc'
-copyright = '2023, Riza, Inc.'
+copyright = '2024, Riza, Inc.'
 author = 'Riza, Inc.'
 
 # The full version, including alpha/beta/rc tags
-release = '1.24.0'
+release = '1.27.0'
 
 
 # -- General configuration ---------------------------------------------------

docs/guides/development.md

@@ -8,6 +8,12 @@ For local development, install `sqlc` under an alias. We suggest `sqlc-dev`.
 go build -o ~/go/bin/sqlc-dev ./cmd/sqlc
 ```
 
+Install `sqlc-gen-json` to avoid test failure.
+
+```
+go build -o ~/go/bin/sqlc-gen-json ./cmd/sqlc-gen-json
+```
+
 ## Running Tests
 
 ```
@@ -53,16 +59,3 @@ MYSQL_USER      root
 MYSQL_ROOT_PASSWORD  mysecretpassword
 MYSQL_DATABASE  dinotest
 ```
-
-## Regenerate expected test output
-
-If you need to update a large number of expected test output in the
-`internal/endtoend/testdata` directory, run the `regenerate` script.
-
-```
-go build -o ~/go/bin/sqlc-dev ./cmd/sqlc
-go run scripts/regenerate/main.go
-```
-
-Note that this uses the `sqlc-dev` binary, not `sqlc` so make sure you have an
-up to date `sqlc-dev` binary.