Fixes gobuffalo/buffalo#1109 (#129)

gobuffalo · Jun 16, 2018 · 786534c · 786534c
1 parent 5d13e5e
commit 786534c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/fizz/columns.go b/fizz/columns.go
@@ -21,7 +21,7 @@ type Column struct {
 	Name    string
 	ColType string
 	Primary bool
-	Options map[string]interface{}
+	Options Options
 }
 
 func (f fizzer) ChangeColumn() interface{} {

diff --git a/fizz/fizz.go b/fizz/fizz.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 )
 
-type Options map[string]interface{}
+type Options map[interface{}]interface{}
 
 type fizzer struct {
 	Bubbler *Bubbler

diff --git a/fizz/foreign_keys.go b/fizz/foreign_keys.go
@@ -53,7 +53,7 @@ func (f fizzer) DropForeignKey() interface{} {
 }
 
 func parseForeignKeyRef(refs interface{}) (fkr ForeignKeyRef) {
-	refMap, ok := refs.(map[string]interface{})
+	refMap, ok := refs.(map[interface{}]interface{})
 	if !ok {
 		fmt.Printf(`invalid references format %s\nmust be "{"table": ["colum1", "column2"]}"`, refs)
 		return
@@ -63,7 +63,7 @@ func parseForeignKeyRef(refs interface{}) (fkr ForeignKeyRef) {
 		return
 	}
 	for table, columns := range refMap {
-		fkr.Table = table
+		fkr.Table = fmt.Sprint(table)
 		for _, c := range columns.([]interface{}) {
 			fkr.Columns = append(fkr.Columns, fmt.Sprintf("%s", c))
 		}

diff --git a/fizz/tables.go b/fizz/tables.go
@@ -17,7 +17,7 @@ func (t *Table) DisableTimestamps() {
 	t.Options["timestamps"] = false
 }
 
-func (t *Table) Column(name string, colType string, options map[string]interface{}) {
+func (t *Table) Column(name string, colType string, options Options) {
 	var primary bool
 	if _, ok := options["primary"]; ok {
 		primary = true

diff --git a/fizz/translators/mysql_meta.go b/fizz/translators/mysql_meta.go
@@ -23,7 +23,7 @@ func (ti mysqlTableInfo) ToColumn() fizz.Column {
 		Name:    ti.Field,
 		ColType: ti.Type,
 		Primary: ti.Key == "PRI",
-		Options: map[string]interface{}{},
+		Options: fizz.Options{},
 	}
 	if strings.ToLower(ti.Null) == "yes" {
 		c.Options["null"] = true