compiler: Find columns in default schemas (#1003)

Author: kyleconroy

internal/compiler/resolve.go

@@ -37,13 +37,17 @@ func resolveCatalogRefs(c *catalog.Catalog, rvs []*ast.RangeVar, args []paramRef
 		if defaultTable == nil {
 			defaultTable = table.Rel
 		}
-		if _, exists := typeMap[table.Rel.Schema]; !exists {
-			typeMap[table.Rel.Schema] = map[string]map[string]*catalog.Column{}
+		schema := table.Rel.Schema
+		if schema == "" {
+			schema = c.DefaultSchema
 		}
-		typeMap[table.Rel.Schema][table.Rel.Name] = map[string]*catalog.Column{}
+		if _, exists := typeMap[schema]; !exists {
+			typeMap[schema] = map[string]map[string]*catalog.Column{}
+		}
+		typeMap[schema][table.Rel.Name] = map[string]*catalog.Column{}
 		for _, c := range table.Columns {
 			cc := c
-			typeMap[table.Rel.Schema][table.Rel.Name][c.Name] = cc
+			typeMap[schema][table.Rel.Name][c.Name] = cc
 		}
 		return nil
 	}
@@ -146,7 +150,11 @@ func resolveCatalogRefs(c *catalog.Catalog, rvs []*ast.RangeVar, args []paramRef
 
 				var found int
 				for _, table := range search {
-					if c, ok := typeMap[table.Schema][table.Name][key]; ok {
+					schema := table.Schema
+					if schema == "" {
+						schema = c.DefaultSchema
+					}
+					if c, ok := typeMap[schema][table.Name][key]; ok {
 						found += 1
 						if ref.name != "" {
 							key = ref.name
@@ -308,6 +316,9 @@ func resolveCatalogRefs(c *catalog.Catalog, rvs []*ast.RangeVar, args []paramRef
 				schema = fqn.Schema
 				rel = fqn.Name
 			}
+			if schema == "" {
+				schema = c.DefaultSchema
+			}
 			if c, ok := typeMap[schema][rel][key]; ok {
 				a = append(a, Parameter{
 					Number: ref.ref.Number,

internal/endtoend/testdata/insert_values_public/mysql/go/db.go

@@ -0,0 +1,4 @@
+CREATE TABLE foo (a text, b integer);
+
+/* name: InsertValues :exec */
+INSERT INTO public.foo (a, b) VALUES (?, ?);

internal/endtoend/testdata/insert_values_public/mysql/go/models.go

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

internal/endtoend/testdata/insert_values_public/mysql/go/query.sql.go

@@ -0,0 +1,4 @@
+CREATE TABLE foo (a text, b integer);
+
+-- name: InsertValues :exec
+INSERT INTO public.foo (a, b) VALUES ($1, $2);

internal/endtoend/testdata/insert_values_public/mysql/query.sql

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