Skip to content

Commit e66b848

Browse files
git push origin feat/pgx_pool_supportMerge branch 'kyleconroy-main' into feat/pgx_pool_support
2 parents 2145685 + 95c0708 commit e66b848

File tree

49 files changed

+960
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+960
-23
lines changed

.github/workflows/ci-kotlin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- 3306:3306
3131

3232
steps:
33-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v2.3.4
3434
- uses: actions/setup-java@v2
3535
with:
3636
distribution: 'adopt'

.github/workflows/ci-python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
2424

2525
steps:
26-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v2.3.4
2727
- uses: actions/setup-python@v2
2828
with:
2929
python-version: 3.9

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- 3306:3306
3131

3232
steps:
33-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v2.3.4
3434

3535
- uses: actions/setup-go@v2
3636
with:

.github/workflows/docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
id: prep
1313
run: |
1414
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v2.3.4
1616
- uses: docker/setup-buildx-action@v1
17-
- uses: docker/login-action@v1
17+
- uses: docker/login-action@v1.9.0
1818
with:
1919
username: kjconroy
2020
password: ${{ secrets.DOCKER_PASSWORD }}
21-
- uses: docker/build-push-action@v2
21+
- uses: docker/build-push-action@v2.4.0
2222
with:
2323
context: .
2424
file: ./Dockerfile

.github/workflows/equinox.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: release --platforms windows
1212
runs-on: windows-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v2.3.4
1515
- uses: actions/setup-go@v2
1616
with:
1717
go-version: '1.16'
@@ -26,7 +26,7 @@ jobs:
2626
name: release --platforms darwin
2727
runs-on: macos-latest
2828
steps:
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v2.3.4
3030
- uses: actions/setup-go@v2
3131
with:
3232
go-version: '1.16'
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-latest
4343
needs: [macos, windows]
4444
steps:
45-
- uses: actions/checkout@v2
45+
- uses: actions/checkout@v2.3.4
4646
- uses: actions/setup-go@v2
4747
with:
4848
go-version: '1.16'

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.16.3 AS builder
2+
FROM golang:1.16.4 AS builder
33

44
COPY . /workspace
55
WORKDIR /workspace

examples/booktest/postgresql/db_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func TestBooks(t *testing.T) {
139139
t.Fatal(err)
140140
}
141141
for _, ab := range res {
142-
t.Logf("Book %d: '%s', Author: '%s', ISBN: '%s' Tags: '%v'\n", ab.BookID, ab.Title, ab.Name, ab.Isbn, ab.Tags)
142+
t.Logf("Book %d: '%s', Author: '%s', ISBN: '%s' Tags: '%v'\n", ab.BookID, ab.Title, ab.Name.String, ab.Isbn, ab.Tags)
143143
}
144144

145145
// TODO: call say_hello(varchar)

examples/booktest/postgresql/query.sql.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/kotlin/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ WHERE tags && ?::varchar[]
2323
data class BooksByTagsRow (
2424
val bookId: Int,
2525
val title: String,
26-
val name: String,
26+
val name: String?,
2727
val isbn: String,
2828
val tags: List<String>
2929
)

examples/python/src/booktest/query.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
class BooksByTagsRow:
2828
book_id: int
2929
title: str
30-
name: str
30+
name: Optional[str]
3131
isbn: str
3232
tags: List[str]
3333

0 commit comments

Comments
 (0)