Skip to content

Commit 0f40808

Browse files
authored
Merge branch 'main' into patch-1
2 parents 979af9e + 12d640f commit 0f40808

File tree

8 files changed

+16
-12
lines changed

8 files changed

+16
-12
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,4 @@ jobs:
7575
timeout-minutes: 5
7676

7777
steps:
78-
- uses: actions/checkout@v4
79-
- uses: actions/setup-go@v5
80-
with:
81-
go-version: '1.23.5'
82-
- run: go install golang.org/x/vuln/cmd/govulncheck@latest
83-
- run: govulncheck ./...
78+
- uses: golang/govulncheck-action@v1

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# STEP 1: Build sqlc
2-
FROM golang:1.23.5 AS builder
2+
FROM golang:1.23.6 AS builder
33

44
COPY . /workspace
55
WORKDIR /workspace

docs/reference/datatypes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ create table shapes(
235235
);
236236

237237
-- name: GetCentroids :many
238-
SELECT id, name, ST_Centriod(geom)::geometry FROM shapes;
238+
SELECT id, name, ST_Centroid(geom)::geometry FROM shapes;
239239
```
240240

241241
```json

docs/reference/language-support.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ New languages can be added via :doc:`plugins <../guides/plugins>`.
1919
======== ================================= =============== =============== ===============
2020
Language Plugin MySQL PostgreSQL SQLite
2121
======== ================================= =============== =============== ===============
22-
F# `kaashyapan/sqlc-gen-fsharp`_ Not implemented Beta Beta
2322
C# `DaredevilOSS/sqlc-gen-csharp`_ Beta Beta Beta
24-
Ruby `DaredevilOSS/sqlc-gen-ruby`_ Beta Beta Beta
25-
PHP `lcarilla/sqlc-plugin-php-dbal`_ Beta Not implemented Not implemented
26-
Java `tandemdude/sqlc-gen-java`_ Not implemented Beta Not implemented
23+
F# `kaashyapan/sqlc-gen-fsharp`_ N/A Beta Beta
24+
Java `tandemdude/sqlc-gen-java`_ N/A Beta N/A
25+
PHP `lcarilla/sqlc-plugin-php-dbal`_ Beta N/A N/A
26+
Ruby `DaredevilOSS/sqlc-gen-ruby`_ Beta Beta Beta
27+
Zig `tinyzimmer/sqlc-gen-zig`_ N/A Beta N/A
2728
[Any] `fdietze/sqlc-gen-from-template`_ Stable Stable Stable
2829
======== ================================= =============== =============== ===============
2930

@@ -37,6 +38,7 @@ Java `tandemdude/sqlc-gen-java`_ Not implemented Beta N
3738
.. _fdietze/sqlc-gen-from-template: https://github.com/fdietze/sqlc-gen-from-template
3839
.. _lcarilla/sqlc-plugin-php-dbal: https://github.com/lcarilla/sqlc-plugin-php-dbal
3940
.. _tandemdude/sqlc-gen-java: https://github.com/tandemdude/sqlc-gen-java
41+
.. _tinyzimmer/sqlc-gen-zig: https://github.com/tinyzimmer/sqlc-gen-zig
4042

4143
Future language support
4244
************************

examples/authors/sqlite/db_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
func TestAuthors(t *testing.T) {
1414
sdb, cleanup := sqltest.SQLite(t, []string{"schema.sql"})
15+
defer sdb.Close()
1516
defer cleanup()
1617

1718
ctx := context.Background()

examples/booktest/sqlite/db_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const (
1818

1919
func TestBooks(t *testing.T) {
2020
db, cleanup := sqltest.SQLite(t, []string{"schema.sql"})
21+
defer db.Close()
2122
defer cleanup()
2223

2324
ctx := context.Background()

examples/ondeck/sqlite/db_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ func TestPrepared(t *testing.T) {
149149
t.Parallel()
150150

151151
sdb, cleanup := sqltest.SQLite(t, []string{"schema"})
152+
defer sdb.Close()
152153
defer cleanup()
153154

154155
q, err := Prepare(context.Background(), sdb)
@@ -163,6 +164,7 @@ func TestQueries(t *testing.T) {
163164
t.Parallel()
164165

165166
sdb, cleanup := sqltest.SQLite(t, []string{"schema"})
167+
defer sdb.Close()
166168
defer cleanup()
167169

168170
runOnDeckQueries(t, New(sdb))

internal/sqltest/sqlite.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ func SQLite(t *testing.T, migrations []string) (*sql.DB, func()) {
1616
if err != nil {
1717
t.Fatal(err)
1818
}
19+
if err := source.Close(); err != nil {
20+
t.Fatal(err)
21+
}
1922
return CreateSQLiteDatabase(t, source.Name(), migrations)
2023
}
2124

0 commit comments

Comments
 (0)