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
+      - uses: actions/checkout@v2.3.4
       - 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
+      - uses: actions/checkout@v2.3.4
       - 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
+    - uses: actions/checkout@v2.3.4
 
     - uses: actions/setup-go@v2
       with:

.github/workflows/docker.yml

@@ -12,13 +12,13 @@ jobs:
       id: prep
       run: |
         echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
     - uses: docker/setup-buildx-action@v1
-    - uses: docker/login-action@v1
+    - uses: docker/login-action@v1.9.0
       with:
         username: kjconroy
         password: ${{ secrets.DOCKER_PASSWORD }}
-    - uses: docker/build-push-action@v2
+    - uses: docker/build-push-action@v2.4.0
       with:
         context: .
         file: ./Dockerfile

.github/workflows/equinox.yml

@@ -11,7 +11,7 @@ jobs:
     name: release --platforms windows
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
     - uses: actions/setup-go@v2
       with:
         go-version: '1.16'
@@ -26,7 +26,7 @@ jobs:
     name: release --platforms darwin
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
     - uses: actions/setup-go@v2
       with:
         go-version: '1.16'
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [macos, windows]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
     - uses: actions/setup-go@v2
       with:
         go-version: '1.16'

internal/compiler/output_columns.go

@@ -299,20 +299,24 @@ func sourceTables(qc *QueryCatalog, node ast.Node) ([]*Table, error) {
 	var tables []*Table
 	for _, item := range list.Items {
 		switch n := item.(type) {
+
 		case *ast.FuncName:
+			// If the function or table can't be found, don't error out.  There
+			// are many queries that depend on functions unknown to sqlc.
 			fn, err := qc.GetFunc(n)
 			if err != nil {
-				return nil, err
+				continue
 			}
 			table, err := qc.GetTable(&ast.TableName{
 				Catalog: fn.ReturnType.Catalog,
 				Schema:  fn.ReturnType.Schema,
 				Name:    fn.ReturnType.Name,
 			})
 			if err != nil {
-				return nil, err
+				continue
 			}
 			tables = append(tables, table)
+
 		case *ast.RangeSubselect:
 			cols, err := outputColumns(qc, n.Subquery)
 			if err != nil {
@@ -345,6 +349,7 @@ func sourceTables(qc *QueryCatalog, node ast.Node) ([]*Table, error) {
 				}
 			}
 			tables = append(tables, table)
+
 		default:
 			return nil, fmt.Errorf("sourceTable: unsupported list item type: %T", n)
 		}

internal/endtoend/testdata/func_return/go/query.sql.go

@@ -2,3 +2,8 @@
 SELECT *
 FROM users_func()
 WHERE first_name != '';
+
+/* name: GenerateSeries :many */
+SELECT ($1::inet) + i
+FROM generate_series(0, $2::int) AS i
+LIMIT 1;