compiler: Return error if relation not found (#1059)

Fix panic when accessing defaultTable

Author: kyleconroy

internal/compiler/parse.go

@@ -87,12 +87,11 @@ func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query,
 		refs = uniqueParamRefs(refs)
 		sort.Slice(refs, func(i, j int) bool { return refs[i].ref.Number < refs[j].ref.Number })
 	}
-	params, err := resolveCatalogRefs(c.catalog, rvs, refs, namedParams)
+	qc, err := buildQueryCatalog(c.catalog, raw.Stmt)
 	if err != nil {
 		return nil, err
 	}
-
-	qc, err := buildQueryCatalog(c.catalog, raw.Stmt)
+	params, err := resolveCatalogRefs(c.catalog, qc, rvs, refs, namedParams)
 	if err != nil {
 		return nil, err
 	}

internal/compiler/resolve.go

@@ -18,7 +18,7 @@ func dataType(n *ast.TypeName) string {
 	}
 }
 
-func resolveCatalogRefs(c *catalog.Catalog, rvs []*ast.RangeVar, args []paramRef, names map[int]string) ([]Parameter, error) {
+func resolveCatalogRefs(c *catalog.Catalog, qc *QueryCatalog, rvs []*ast.RangeVar, args []paramRef, names map[int]string) ([]Parameter, error) {
 	aliasMap := map[string]*ast.TableName{}
 	// TODO: Deprecate defaultTable
 	var defaultTable *ast.TableName
@@ -62,6 +62,10 @@ func resolveCatalogRefs(c *catalog.Catalog, rvs []*ast.RangeVar, args []paramRef
 		}
 		table, err := c.GetTable(fqn)
 		if err != nil {
+			// If the table name doesn't exist, fisrt check if it's a CTE
+			if _, qcerr := qc.GetTable(fqn); qcerr != nil {
+				return nil, err
+			}
 			continue
 		}
 		err = indexTable(table)
@@ -299,15 +303,19 @@ func resolveCatalogRefs(c *catalog.Catalog, rvs []*ast.RangeVar, args []paramRef
 			if err != nil {
 				return nil, err
 			}
+
 		case *ast.ResTarget:
 			if n.Name == nil {
 				return nil, fmt.Errorf("*ast.ResTarget has nil name")
 			}
 			key := *n.Name
 
+			var schema, rel string
 			// TODO: Deprecate defaultTable
-			schema := defaultTable.Schema
-			rel := defaultTable.Name
+			if defaultTable != nil {
+				schema = defaultTable.Schema
+				rel = defaultTable.Name
+			}
 			if ref.rv != nil {
 				fqn, err := ParseTableName(ref.rv)
 				if err != nil {
@@ -319,7 +327,13 @@ func resolveCatalogRefs(c *catalog.Catalog, rvs []*ast.RangeVar, args []paramRef
 			if schema == "" {
 				schema = c.DefaultSchema
 			}
-			if c, ok := typeMap[schema][rel][key]; ok {
+
+			tableMap, ok := typeMap[schema][rel]
+			if !ok {
+				return nil, sqlerr.RelationNotFound(rel)
+			}
+
+			if c, ok := tableMap[key]; ok {
 				a = append(a, Parameter{
 					Number: ref.ref.Number,
 					Column: &Column{

internal/endtoend/testdata/relation_does_not_exist/postgresql/query.sql

@@ -0,0 +1,11 @@
+-- name: MissingSelect :many
+SELECT * FROM nonexisting_relation WHERE name = 'foo';
+
+-- name: MissingParam :many
+SELECT * FROM nonexisting_relation WHERE name = $1;
+
+-- name: MissingUpdate :exec
+UPDATE nonexisting_relation SET name = $1;
+
+-- name: MisingInsert :exec
+INSERT INTO nonexisting_relation (id) VALUES ($1);

internal/endtoend/testdata/relation_does_not_exist/postgresql/sqlc.json

@@ -0,0 +1,11 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}

internal/endtoend/testdata/relation_does_not_exist/postgresql/stderr.txt

@@ -0,0 +1,5 @@
+# package querytest
+query.sql:1:1: relation "nonexisting_relation" does not exist
+query.sql:5:1: relation "nonexisting_relation" does not exist
+query.sql:8:1: relation "nonexisting_relation" does not exist
+query.sql:11:1: relation "nonexisting_relation" does not exist