internal/dinosql: Handle schema-scoped enums (#310)

* internal/dinosql: Handle schema-scoped enums

Author: kyleconroy

internal/catalog/build.go

@@ -56,6 +56,34 @@ func ParseList(list nodes.List) (pg.FQN, error) {
 	return fqn, nil
 }
 
+func ParseString(name string) (pg.FQN, error) {
+	parts := strings.Split(name, ".")
+	var fqn pg.FQN
+	switch len(parts) {
+	case 1:
+		fqn = pg.FQN{
+			Catalog: "",
+			Schema:  "public",
+			Rel:     parts[0],
+		}
+	case 2:
+		fqn = pg.FQN{
+			Catalog: "",
+			Schema:  parts[0],
+			Rel:     parts[1],
+		}
+	case 3:
+		fqn = pg.FQN{
+			Catalog: parts[0],
+			Schema:  parts[1],
+			Rel:     parts[2],
+		}
+	default:
+		return fqn, fmt.Errorf("Invalid FQN: %s", name)
+	}
+	return fqn, nil
+}
+
 func wrap(e pg.Error, loc int) pg.Error {
 	return e
 }

internal/dinosql/gen.go

@@ -12,6 +12,7 @@ import (
 	"text/template"
 	"unicode"
 
+	"github.com/kyleconroy/sqlc/internal/catalog"
 	core "github.com/kyleconroy/sqlc/internal/pg"
 
 	"github.com/jinzhu/inflection"
@@ -700,20 +701,26 @@ func (r Result) goInnerType(col core.Column, settings CombinedSettings) string {
 		return "interface{}"
 
 	default:
+		fqn, err := catalog.ParseString(columnType)
+		if err != nil {
+			// TODO: Should this actually return an error here?
+			return "interface{}"
+		}
+
 		for name, schema := range r.Catalog.Schemas {
 			if name == "pg_catalog" {
 				continue
 			}
 			for _, enum := range schema.Enums {
-				if columnType == enum.Name {
+				if fqn.Rel == enum.Name && fqn.Schema == name {
 					if name == "public" {
 						return StructName(enum.Name, settings)
 					}
-
 					return StructName(name+"_"+enum.Name, settings)
 				}
 			}
 		}
+
 		log.Printf("unknown PostgreSQL type: %s\n", columnType)
 		return "interface{}"
 	}

internal/endtoend/testdata/schema_scoped_enum/go/db.go

@@ -0,0 +1,10 @@
+CREATE SCHEMA foo;
+
+CREATE TYPE foo.type_user_role AS ENUM ('admin', 'user');
+
+CREATE TABLE foo.users (
+    role foo.type_user_role
+);
+
+-- name: ListUsersByRole :many
+SELECT * FROM foo.users WHERE role = $1;

internal/endtoend/testdata/schema_scoped_enum/go/models.go

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