Re-enable type replacements based on nullability

Author: stephenafamo

gen/gen_test.go

@@ -11,16 +11,18 @@ func TestProcessTypeReplacements(t *testing.T) {
 		{
 			Columns: []drivers.Column{
 				{
-					Name:    "id",
-					Type:    "int",
-					DBType:  "serial",
-					Default: "some db nonsense",
+					Name:     "id",
+					Type:     "int",
+					DBType:   "serial",
+					Default:  "some db nonsense",
+					Nullable: false,
 				},
 				{
-					Name:    "name",
-					Type:    "null.String",
-					DBType:  "serial",
-					Default: "some db nonsense",
+					Name:     "name",
+					Type:     "null.String",
+					DBType:   "serial",
+					Default:  "some db nonsense",
+					Nullable: true,
 				},
 				{
 					Name:       "domain",
@@ -29,41 +31,48 @@ func TestProcessTypeReplacements(t *testing.T) {
 					DomainName: "domain name",
 				},
 				{
-					Name:    "by_named",
-					Type:    "int",
-					DBType:  "numeric",
-					Default: "some db nonsense",
+					Name:     "by_named",
+					Type:     "int",
+					DBType:   "numeric",
+					Default:  "some db nonsense",
+					Nullable: false,
 				},
 				{
-					Name:    "by_comment",
-					Type:    "string",
-					DBType:  "text",
-					Default: "some db nonsense",
-					Comment: "xid",
+					Name:     "by_comment",
+					Type:     "string",
+					DBType:   "text",
+					Default:  "some db nonsense",
+					Nullable: false,
+					Comment:  "xid",
 				},
 			},
 		},
 		{
 			Key: "named_table",
 			Columns: []drivers.Column{
 				{
-					Name:    "id",
-					Type:    "int",
-					DBType:  "serial",
-					Default: "some db nonsense",
+					Name:     "id",
+					Type:     "int",
+					DBType:   "serial",
+					Default:  "some db nonsense",
+					Nullable: false,
 				},
 				{
-					Name:    "by_comment",
-					Type:    "string",
-					DBType:  "text",
-					Default: "some db nonsense",
-					Comment: "xid",
+					Name:     "by_comment",
+					Type:     "string",
+					DBType:   "text",
+					Default:  "some db nonsense",
+					Nullable: false,
+					Comment:  "xid",
 				},
 			},
 		},
 	}
 
 	types := map[string]drivers.Type{
+		"excellent.Type": {
+			Imports: []string{`"rock.com/excellent"`},
+		},
 		"excellent.NamedType": {
 			Imports: []string{`"rock.com/excellent-name"`},
 		},
@@ -82,6 +91,12 @@ func TestProcessTypeReplacements(t *testing.T) {
 	}
 
 	replacements := []Replace{
+		{
+			Match: drivers.Column{
+				DBType: "serial",
+			},
+			Replace: "excellent.Type",
+		},
 		{
 			Tables: []string{"named_table"},
 			Match: drivers.Column{
@@ -91,7 +106,8 @@ func TestProcessTypeReplacements(t *testing.T) {
 		},
 		{
 			Match: drivers.Column{
-				Type: "null.String",
+				Type:     "null.String",
+				Nullable: true,
 			},
 			Replace: "int",
 		},
@@ -117,7 +133,7 @@ func TestProcessTypeReplacements(t *testing.T) {
 
 	processTypeReplacements(types, replacements, tables)
 
-	if typ := tables[0].Columns[0].Type; typ != "int" {
+	if typ := tables[0].Columns[0].Type; typ != "excellent.Type" {
 		t.Error("type was wrong:", typ)
 	}
 

gen/types.go

@@ -98,6 +98,9 @@ func matchColumn(c, m drivers.Column) bool {
 	if m.Generated != c.Generated {
 		return false
 	}
+	if m.Nullable != c.Nullable {
+		return false
+	}
 
 	return true
 }