Skip to content

Commit a3bbb0d

Browse files
authored
Merge branch 'sqlc-dev:main' into nullable-subselect
2 parents c99d5f6 + 7ff8e6f commit a3bbb0d

File tree

2,769 files changed

+52049
-15459
lines changed

Some content is hidden

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

2,769 files changed

+52049
-15459
lines changed

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ body:
99
description: What version of sqlc are you running? If you don't know, run `sqlc version`.
1010
multiple: false
1111
options:
12+
- 1.19.1
13+
- 1.19.0
14+
- 1.18.0
1215
- 1.17.2
1316
- 1.16.0
14-
- 1.15.0
15-
- 1.14.0
1617
- Other
1718
validations:
1819
required: true
@@ -70,8 +71,9 @@ body:
7071
label: What database engines are you using?
7172
multiple: true
7273
options:
73-
- PostgreSQL
7474
- MySQL
75+
- PostgreSQL
76+
- SQLite
7577
- type: dropdown
7678
id: languages
7779
attributes:

.github/dependabot.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,12 @@ updates:
1212
directory: "/"
1313
schedule:
1414
interval: "daily"
15+
- package-ecosystem: "pip"
16+
directory: "/docs"
17+
schedule:
18+
interval: "daily"
19+
ignore:
20+
# sphinx-rtd-theme does not support the latest versions of docutils and
21+
# sphinx
22+
- dependency-name: "docutils"
23+
- dependency-name: "sphinx"

.github/workflows/buf.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: buf
2+
on: pull_request
3+
jobs:
4+
build:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v3
8+
- uses: bufbuild/buf-setup-action@v1
9+
- uses: bufbuild/buf-lint-action@v1

.github/workflows/ci.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v3
1313
- uses: actions/setup-go@v4
1414
with:
15-
go-version: '1.20'
15+
go-version: '1.20.6'
1616
- run: go build ./...
1717

1818
darwin-build:
@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@v3
2323
- uses: actions/setup-go@v4
2424
with:
25-
go-version: '1.20'
25+
go-version: '1.20.6'
2626
- run: go build ./...
2727

2828
build:
@@ -31,29 +31,29 @@ jobs:
3131

3232
services:
3333
postgres:
34-
image: postgres:11
34+
image: "postgres:15"
3535
env:
36-
POSTGRES_USER: postgres
37-
POSTGRES_PASSWORD: postgres
3836
POSTGRES_DB: postgres
37+
POSTGRES_PASSWORD: postgres
38+
POSTGRES_USER: postgres
3939
ports:
4040
- 5432:5432
4141
# needed because the postgres container does not provide a healthcheck
4242
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
4343
mysql:
44-
image: mysql:8
44+
image: "mysql/mysql-server:8.0"
4545
env:
46-
MYSQL_ROOT_PASSWORD: mysecretpassword
4746
MYSQL_DATABASE: mysql
47+
MYSQL_ROOT_HOST: '%'
48+
MYSQL_ROOT_PASSWORD: mysecretpassword
4849
ports:
4950
- 3306:3306
5051

5152
steps:
5253
- uses: actions/checkout@v3
53-
5454
- uses: actions/setup-go@v4
5555
with:
56-
go-version: '1.20'
56+
go-version: '1.20.6'
5757

5858
- name: gotestsum
5959
run: go install gotest.tools/gotestsum@latest
@@ -83,3 +83,15 @@ jobs:
8383
run: ./scripts/report.sh
8484
env:
8585
BUILDKITE_ANALYTICS_TOKEN: ${{ secrets.BUILDKITE_ANALYTICS_TOKEN }}
86+
87+
vuln_check:
88+
runs-on: ubuntu-latest
89+
timeout-minutes: 5
90+
91+
steps:
92+
- uses: actions/checkout@v3
93+
- uses: actions/setup-go@v4
94+
with:
95+
go-version: '1.20.6'
96+
- run: go install golang.org/x/vuln/cmd/govulncheck@latest
97+
- run: govulncheck ./...

.github/workflows/gen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v3
2121
- uses: actions/setup-go@v4
2222
with:
23-
go-version: '1.20'
23+
go-version: '1.20.6'
2424
- run: go build -o sqlc-pg-gen ./internal/tools/sqlc-pg-gen
2525
- run: mkdir -p gen/contrib
2626
- run: ./sqlc-pg-gen gen

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
/.idea/
22
__pycache__
33
.DS_Store
4+
5+
# Devenv
6+
.envrc
7+
.direnv
8+
.devenv*
9+
devenv.local.nix
10+

.readthedocs.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# .readthedocs.yaml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
# Set the version of Python and other tools you might need
9+
build:
10+
os: ubuntu-22.04
11+
tools:
12+
python: "3.11"
13+
14+
# Build documentation in the docs/ directory with Sphinx
15+
sphinx:
16+
configuration: docs/conf.py
17+
18+
# We recommend specifying your dependencies to enable reproducible builds:
19+
# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
20+
python:
21+
install:
22+
- requirements: docs/requirements.txt

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

44
COPY . /workspace
55
WORKDIR /workspace

buf.gen.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ version: v1
22
managed:
33
enabled: true
44
plugins:
5-
- remote: buf.build/protocolbuffers/plugins/go:v1.28.1-1
5+
- plugin: buf.build/protocolbuffers/go:v1.30.0
66
out: internal
77
opt: paths=source_relative
8-
- remote: buf.build/planetscale/plugins/vtproto:v0.3.0
8+
- plugin: buf.build/community/planetscale-vtprotobuf:v0.4.0
99
out: internal
10-
opt: paths=source_relative
10+
opt: paths=source_relative

buf.lock

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Generated by buf. DO NOT EDIT.
2+
version: v1

0 commit comments

Comments
 (0)