Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
kyleconroy authored Feb 7, 2025
2 parents 979af9e + 12d640f commit 0f40808
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 12 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,4 @@ jobs:
timeout-minutes: 5

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.23.5'
- run: go install golang.org/x/vuln/cmd/govulncheck@latest
- run: govulncheck ./...
- uses: golang/govulncheck-action@v1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# STEP 1: Build sqlc
FROM golang:1.23.5 AS builder
FROM golang:1.23.6 AS builder

COPY . /workspace
WORKDIR /workspace
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/datatypes.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ create table shapes(
);

-- name: GetCentroids :many
SELECT id, name, ST_Centriod(geom)::geometry FROM shapes;
SELECT id, name, ST_Centroid(geom)::geometry FROM shapes;
```

```json
Expand Down
10 changes: 6 additions & 4 deletions docs/reference/language-support.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ New languages can be added via :doc:`plugins <../guides/plugins>`.
======== ================================= =============== =============== ===============
Language Plugin MySQL PostgreSQL SQLite
======== ================================= =============== =============== ===============
F# `kaashyapan/sqlc-gen-fsharp`_ Not implemented Beta Beta
C# `DaredevilOSS/sqlc-gen-csharp`_ Beta Beta Beta
Ruby `DaredevilOSS/sqlc-gen-ruby`_ Beta Beta Beta
PHP `lcarilla/sqlc-plugin-php-dbal`_ Beta Not implemented Not implemented
Java `tandemdude/sqlc-gen-java`_ Not implemented Beta Not implemented
F# `kaashyapan/sqlc-gen-fsharp`_ N/A Beta Beta
Java `tandemdude/sqlc-gen-java`_ N/A Beta N/A
PHP `lcarilla/sqlc-plugin-php-dbal`_ Beta N/A N/A
Ruby `DaredevilOSS/sqlc-gen-ruby`_ Beta Beta Beta
Zig `tinyzimmer/sqlc-gen-zig`_ N/A Beta N/A
[Any] `fdietze/sqlc-gen-from-template`_ Stable Stable Stable
======== ================================= =============== =============== ===============

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

Future language support
************************
Expand Down
1 change: 1 addition & 0 deletions examples/authors/sqlite/db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

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

ctx := context.Background()
Expand Down
1 change: 1 addition & 0 deletions examples/booktest/sqlite/db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const (

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

ctx := context.Background()
Expand Down
2 changes: 2 additions & 0 deletions examples/ondeck/sqlite/db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ func TestPrepared(t *testing.T) {
t.Parallel()

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

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

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

runOnDeckQueries(t, New(sdb))
Expand Down
3 changes: 3 additions & 0 deletions internal/sqltest/sqlite.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ func SQLite(t *testing.T, migrations []string) (*sql.DB, func()) {
if err != nil {
t.Fatal(err)
}
if err := source.Close(); err != nil {
t.Fatal(err)
}
return CreateSQLiteDatabase(t, source.Name(), migrations)
}

Expand Down

0 comments on commit 0f40808

Please sign in to comment.