feat: Allow use of table and column aliases for table functions retur…

…ning unknown types

Signed-off-by: Andrew Haines <andrew@haines.org.nz>

internal/compiler/output_columns.go

@@ -430,7 +430,7 @@ func sourceTables(qc *QueryCatalog, node ast.Node) ([]*Table, error) {
 	case *ast.SelectStmt:
 		list = astutils.Search(n.FromClause, func(node ast.Node) bool {
 			switch node.(type) {
-			case *ast.RangeVar, *ast.RangeSubselect, *ast.FuncName:
+			case *ast.RangeVar, *ast.RangeSubselect, *ast.RangeFunction:
 				return true
 			default:
 				return false
@@ -455,10 +455,20 @@ func sourceTables(qc *QueryCatalog, node ast.Node) ([]*Table, error) {
 	for _, item := range list.Items {
 		switch n := item.(type) {
 
-		case *ast.FuncName:
+		case *ast.RangeFunction:
 			// 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)
+			var funcCall *ast.FuncCall
+			switch f := n.Functions.Items[0].(type) {
+			case *ast.List:
+				funcCall = f.Items[0].(*ast.FuncCall)
+			case *ast.FuncCall:
+				funcCall = f
+			default:
+				return nil, fmt.Errorf("sourceTables: unsupported function call type %T", n.Functions.Items[0])
+			}
+
+			fn, err := qc.GetFunc(funcCall.Func)
 			if err != nil {
 				continue
 			}
@@ -468,7 +478,22 @@ func sourceTables(qc *QueryCatalog, node ast.Node) ([]*Table, error) {
 				Name:    fn.ReturnType.Name,
 			})
 			if err != nil {
-				continue
+				if n.Alias == nil || len(n.Alias.Colnames.Items) == 0 {
+					continue
+				}
+
+				table = &Table{}
+				for _, colName := range n.Alias.Colnames.Items {
+					table.Columns = append(table.Columns, &Column{
+						Name:     colName.(*ast.String).Str,
+						DataType: "any",
+					})
+				}
+			}
+			if n.Alias != nil {
+				table.Rel = &ast.TableName{
+					Name: *n.Alias.Aliasname,
+				}
 			}
 			tables = append(tables, table)
 

internal/endtoend/testdata/unnest/postgresql/pgx/v4/query.sql

@@ -4,3 +4,6 @@ SELECT
     unnest(@vampire_id::uuid[]) AS vampire_id
 RETURNING
     *;
+
+-- name: GetVampireIDs :many
+SELECT vampires.id::uuid FROM unnest(@vampire_id::uuid[]) AS vampires (id);

internal/endtoend/testdata/unnest/postgresql/pgx/v5/query.sql

@@ -4,3 +4,6 @@ SELECT
     unnest(@vampire_id::uuid[]) AS vampire_id
 RETURNING
     *;
+
+-- name: GetVampireIDs :many
+SELECT vampires.id::uuid FROM unnest(@vampire_id::uuid[]) AS vampires (id);

internal/endtoend/testdata/unnest/postgresql/stdlib/query.sql

@@ -4,3 +4,6 @@ SELECT
     unnest(@vampire_id::uuid[]) AS vampire_id
 RETURNING
     *;
+
+-- name: GetVampireIDs :many
+SELECT vampires.id::uuid FROM unnest(@vampire_id::uuid[]) AS vampires (id);

internal/endtoend/testdata/unnest_with_ordinality/postgresql/pgx/v4/query.sql

@@ -0,0 +1,3 @@
+-- name: GetValues :many
+SELECT id, index::bigint, value::text
+FROM array_values AS x, unnest(values) WITH ORDINALITY AS y (value, index);

internal/endtoend/testdata/unnest_with_ordinality/postgresql/pgx/v4/schema.sql

@@ -0,0 +1,4 @@
+CREATE TABLE array_values (
+    id bigserial PRIMARY KEY,
+    values text[] NOT NULL
+);

internal/endtoend/testdata/unnest_with_ordinality/postgresql/pgx/v4/sqlc.json

@@ -0,0 +1,14 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v4",
+      "name": "querytest",
+      "schema": "schema.sql",
+      "queries": "query.sql",
+      "emit_interface": true
+    }
+  ]
+}