Respect "null": false in options

Closes #62
gobuffalo · Dec 2, 2021 · 28843d7 · 28843d7
1 parent 6023280
commit 28843d7
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 11 deletions.
diff --git a/translators/cockroach.go b/translators/cockroach.go
@@ -325,7 +325,7 @@ func (p *Cockroach) DropForeignKey(t fizz.Table) (string, error) {
 func (p *Cockroach) buildAddColumn(c fizz.Column) string {
 	s := fmt.Sprintf("\"%s\" %s", c.Name, p.colType(c))
 
-	if c.Options["null"] == nil || c.Primary {
+	if ok, _ := c.Options["null"].(bool); !ok || c.Primary {
 		s = fmt.Sprintf("%s NOT NULL", s)
 	}
 	if c.Options["default"] != nil {

diff --git a/translators/cockroach_test.go b/translators/cockroach_test.go
@@ -79,7 +79,7 @@ PRIMARY KEY("uuid"),
 
 	res, _ := fizz.AString(`
 	create_table("users") {
-		t.Column("first_name", "string", {})
+		t.Column("first_name", "string", {"null":false})
 		t.Column("last_name", "string", {})
 		t.Column("email", "string", {"size":20})
 		t.Column("permissions", "jsonb", {"null": true})

diff --git a/translators/mssqlserver.go b/translators/mssqlserver.go
@@ -82,7 +82,7 @@ func (p *MsSqlServer) ChangeColumn(t fizz.Table) (string, error) {
 
 	cmds := make([]string, 0)
 	s := fmt.Sprintf("ALTER TABLE %s ALTER COLUMN %s %s", t.Name, c.Name, p.colType(c))
-	if c.Options["null"] == nil {
+	if ok, _ := c.Options["null"].(bool); !ok {
 		s = fmt.Sprintf("%s NOT NULL", s)
 	} else {
 		s = fmt.Sprintf("%s NULL", s)

diff --git a/translators/mssqlserver_test.go b/translators/mssqlserver_test.go
@@ -45,7 +45,7 @@ updated_at DATETIME NOT NULL
 	res, _ := fizz.AString(`
 	create_table("users") {
 		t.Column("first_name", "string", {})
-		t.Column("last_name", "string", {})
+		t.Column("last_name", "string", {"null": false})
 		t.Column("email", "string", {"size":20})
 		t.Column("permissions", "text", {"null": true})
 		t.Column("age", "integer", {"null": true, "default": 40})

diff --git a/translators/mysql.go b/translators/mysql.go
@@ -210,7 +210,7 @@ func (p *MySQL) DropForeignKey(t fizz.Table) (string, error) {
 
 func (p *MySQL) buildColumn(c fizz.Column) string {
 	s := fmt.Sprintf("`%s` %s", c.Name, p.colType(c))
-	if c.Options["null"] == nil || c.Primary {
+	if ok, _ := c.Options["null"].(bool); !ok || c.Primary {
 		s = fmt.Sprintf("%s NOT NULL", s)
 	}
 	if c.Options["default"] != nil {

diff --git a/translators/mysql_test.go b/translators/mysql_test.go
@@ -64,7 +64,7 @@ PRIMARY KEY(` + "`id`" + `),
 	res, err := fizz.AString(`
 	create_table("users") {
 		t.Column("id", "integer", {"primary": true})
-		t.Column("first_name", "string", {})
+		t.Column("first_name", "string", {"null": false})
 		t.Column("last_name", "string", {})
 		t.Column("email", "string", {"size":20})
 		t.Column("permissions", "text", {"null": true})

diff --git a/translators/postgres.go b/translators/postgres.go
@@ -174,7 +174,7 @@ func (p *Postgres) DropForeignKey(t fizz.Table) (string, error) {
 func (p *Postgres) buildAddColumn(c fizz.Column) string {
 	s := fmt.Sprintf("\"%s\" %s", c.Name, p.colType(c))
 
-	if c.Options["null"] == nil || c.Primary {
+	if ok, _ := c.Options["null"].(bool); !ok || c.Primary {
 		s = fmt.Sprintf("%s NOT NULL", s)
 	}
 	if c.Options["default"] != nil {
@@ -191,7 +191,7 @@ func (p *Postgres) buildChangeColumn(c fizz.Column) string {
 	s := fmt.Sprintf("\"%s\" TYPE %s", c.Name, p.colType(c))
 
 	var sets []string
-	if c.Options["null"] == nil {
+	if ok, _ := c.Options["null"].(bool); !ok {
 		sets = append(sets, fmt.Sprintf("ALTER COLUMN \"%s\" SET NOT NULL", c.Name))
 	} else {
 		sets = append(sets, fmt.Sprintf("ALTER COLUMN \"%s\" DROP NOT NULL", c.Name))

diff --git a/translators/postgres_test.go b/translators/postgres_test.go
@@ -3,6 +3,7 @@ package translators_test
 import (
 	"github.com/gobuffalo/fizz"
 	"github.com/gobuffalo/fizz/translators"
+	_ "github.com/jackc/pgx/v4/stdlib"
 )
 
 var _ fizz.Translator = (*translators.Postgres)(nil)
@@ -27,7 +28,7 @@ PRIMARY KEY("id"),
 	res, _ := fizz.AString(`
 	create_table("users") {
 		t.Column("id", "integer", {"primary": true})
-		t.Column("first_name", "string", {})
+		t.Column("first_name", "string", {"null": false})
 		t.Column("last_name", "string", {})
 		t.Column("email", "string", {"size":20})
 		t.Column("permissions", "jsonb", {"null": true})

diff --git a/translators/sqlite.go b/translators/sqlite.go
@@ -376,7 +376,7 @@ func (p *SQLite) withForeignKeyPreservingTempTable(newTable fizz.Table, tableNam
 
 func (p *SQLite) buildColumn(c fizz.Column) string {
 	s := fmt.Sprintf("\"%s\" %s", c.Name, p.colType(c))
-	if c.Options["null"] == nil {
+	if ok, _ := c.Options["null"].(bool); !ok {
 		s = fmt.Sprintf("%s NOT NULL", s)
 	}
 	if c.Options["default"] != nil {

diff --git a/translators/sqlite_test.go b/translators/sqlite_test.go
@@ -88,7 +88,7 @@ func (p *SQLiteSuite) Test_SQLite_CreateTable() {
 		t.Column("permissions", "text", {"null": true})
 		t.Column("age", "integer", {"null": true, "default": 40})
 		t.Column("raw", "blob", {})
-		t.Column("into", "int", {})
+		t.Column("into", "int", {"null": false})
 		t.Column("flotante", "float", {})
 		t.Column("json", "json", {})
 		t.Column("bytes", "[]byte", {})