Merge branch 'main' of git://github.com/kyleconroy/sqlc

Author: timwmillard

.github/workflows/ci-kotlin.yml

@@ -30,7 +30,7 @@ jobs:
           - 3306:3306
 
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
       - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'

.github/workflows/ci-python.yml

@@ -23,7 +23,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
       - uses: actions/setup-python@v2
         with:
           python-version: 3.9

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
         - 3306:3306
 
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
 
     - uses: actions/setup-go@v2
       with:

.github/workflows/docker.yml

@@ -12,7 +12,7 @@ jobs:
       id: prep
       run: |
         echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - uses: docker/setup-buildx-action@v1
     - uses: docker/setup-qemu-action@v1
     - uses: docker/[email protected]

Dockerfile

@@ -1,5 +1,5 @@
 # STEP 1: Build sqlc
-FROM golang:1.17.2 AS builder
+FROM golang:1.17.3 AS builder
 
 COPY . /workspace
 WORKDIR /workspace

README.md

@@ -24,6 +24,7 @@ sqlc development is funded by our [generous
 sponsors](https://github.com/sponsors/kyleconroy), including the following
 companies:
 
+- [Context](https://context.app)
 - [Meter](https://meter.com)
 - [ngrok](https://ngrok.com)
 - [RStudio](https://www.rstudio.com/)

cliff.toml

@@ -0,0 +1,53 @@
+# configuration file for git-cliff (0.1.0)
+
+[changelog]
+# changelog header
+header = """
+# Changelog
+All notable changes to this project will be documented in this file.\n
+"""
+# template for the changelog body
+# https://tera.netlify.app/docs/#introduction
+body = """
+{% if version %}\
+    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else %}\
+    ## [unreleased]
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | upper_first }}
+    {% for commit in commits %}
+        - {{ commit.message | upper_first }}\
+    {% endfor %}
+{% endfor %}\n
+"""
+# remove the leading and trailing whitespaces from the template
+trim = true
+# changelog footer
+footer = """
+<!-- generated by git-cliff -->
+"""
+
+[git]
+# allow only conventional commits
+# https://www.conventionalcommits.org
+conventional_commits = true
+# regex for parsing and grouping commits
+commit_parsers = [
+    { message = "^feat", group = "Features"},
+    { message = "^fix", group = "Bug Fixes"},
+    { message = "^doc", group = "Documentation"},
+    { message = "^perf", group = "Performance"},
+    { message = "^refactor", group = "Refactor"},
+    { message = "^style", group = "Styling"},
+    { message = "^test", group = "Testing"},
+    { message = "^chore\\(release\\): prepare for", skip = true},
+    { message = "^chore", group = "Miscellaneous Tasks"},
+    { body = ".*security", group = "Security"},
+]
+# filter out the commits that are not matched by commit parsers
+filter_commits = false
+# glob pattern for matching git tags
+tag_pattern = "v[0-9]*"
+# regex for skipping tags
+skip_tags = "v0.1.0-beta.1"

docs/conf.py

@@ -22,7 +22,7 @@
 author = 'Kyle Conroy'
 
 # The full version, including alpha/beta/rc tags
-release = '1.10.0'
+release = '1.11.0'
 
 
 # -- General configuration ---------------------------------------------------

docs/howto/ddl.md

@@ -75,7 +75,7 @@ DROP TABLE people;
 package db
 
 type People struct {
-	ID    int32
+	ID int32
 }
 ```
 
@@ -91,13 +91,31 @@ DROP TABLE comment;
 package db
 
 type Comment struct {
-	ID     int32
-	Text   string
+	ID   int32
+	Text string
 }
 ```
 
 ### golang-migrate
 
+Warning: [golang-migrate specifies](https://github.com/golang-migrate/migrate/blob/master/MIGRATIONS.md#migration-filename-format) that the version number in the migration file name is to be interpreted numerically. However, sqlc executes the migration files in **lexicographic** order. If you choose to simply enumerate your migration versions, make sure to prepend enough zeros to the version number to avoid any unexpected behavior.
+
+Probably doesn't work as intended:
+```
+1_initial.up.sql
+...
+9_foo.up.sql
+# this migration file will be executed BEFORE 9_foo
+10_bar.up.sql
+```
+Works as was probably intended:
+```
+001_initial.up.sql
+...
+009_foo.up.sql
+010_bar.up.sql
+```
+
 In `20060102.up.sql`:
 
 ```sql

docs/howto/named_parameters.md

@@ -17,8 +17,8 @@ RETURNING *;
 
 ```go
 type UpdateAuthorNameParams struct {
-  Column1         bool           `json:""`
-  Column2_2       string         `json:"_2"`
+	Column1   bool   `json:""`
+	Column2_2 string `json:"_2"`
 }
 ```
 
@@ -38,8 +38,8 @@ RETURNING *;
 
 ```go
 type UpdateAuthorNameParams struct {
-  SetName         bool           `json:"set_name"`
-  Name            string         `json:"name"`
+	SetName bool   `json:"set_name"`
+	Name    string `json:"name"`
 }
 ```