Merge branch 'development'

gobuffalo · Oct 19, 2019 · 633326f · 633326f
2 parents 6c1d2c2 + 1c19a1a
commit 633326f
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/dialect_cockroach.go b/dialect_cockroach.go
@@ -23,8 +23,8 @@ import (
 const nameCockroach = "cockroach"
 const portCockroach = "26257"
 
-const selectTablesQueryCockroach = "select table_name from information_schema.tables where table_schema = 'public' and table_type = 'BASE TABLE' and table_catalog = ?"
-const selectTablesQueryCockroachV1 = "select table_name from information_schema.tables where table_schema = ?"
+const selectTablesQueryCockroach = "select table_name from information_schema.tables where table_schema = 'public' and table_type = 'BASE TABLE' and table_name <> ? and table_catalog = ?"
+const selectTablesQueryCockroachV1 = "select table_name from information_schema.tables where table_name <> ? and table_schema = ?"
 
 func init() {
 	AvailableDialects = append(AvailableDialects, nameCockroach)
@@ -209,7 +209,7 @@ func (p *cockroach) TruncateAll(tx *Connection) error {
 	tableQuery := p.tablesQuery()
 
 	var tables []table
-	if err := tx.RawQuery(tableQuery, tx.Dialect.Details().Database).All(&tables); err != nil {
+	if err := tx.RawQuery(tableQuery, tx.MigrationTableName(), tx.Dialect.Details().Database).All(&tables); err != nil {
 		return err
 	}
 

diff --git a/dialect_common.go b/dialect_common.go
@@ -31,7 +31,16 @@ func (commonDialect) Lock(fn func() error) error {
 }
 
 func (commonDialect) Quote(key string) string {
-	return fmt.Sprintf(`"%s"`, key)
+	parts := strings.Split(key, ".")
+
+	for i, part := range parts {
+		part = strings.Trim(part, `"`)
+		part = strings.TrimSpace(part)
+
+		parts[i] = fmt.Sprintf(`"%v"`, part)
+	}
+
+	return strings.Join(parts, ".")
 }
 
 func genericCreate(s store, model *Model, cols columns.Columns, quoter quotable) error {

diff --git a/dialect_postgresql_test.go b/dialect_postgresql_test.go
@@ -79,3 +79,12 @@ func Test_PostgreSQL_Connection_String_Failure(t *testing.T) {
 	r.Error(err)
 	r.Equal("postgres", cd.Dialect)
 }
+
+func Test_PostgreSQL_Quotable(t *testing.T) {
+	r := require.New(t)
+	p := postgresql{}
+
+	r.Equal(`"table_name"`, p.Quote("table_name"))
+	r.Equal(`"schema"."table_name"`, p.Quote("schema.table_name"))
+	r.Equal(`"schema"."table name"`, p.Quote(`"schema"."table name"`))
+}
diff --git a/genny/fizz/ctable/create_table_test.go b/genny/fizz/ctable/create_table_test.go
@@ -26,6 +26,16 @@ func Test_New(t *testing.T) {
 			},
 			`create_table("widgets") {
 	t.Timestamps()
+}`,
+		},
+		{
+			&Options{
+				TableName:              "widget",
+				Name:                   "create_widgets",
+				ForceDefaultTimestamps: true,
+			},
+			`create_table("widgets") {
+	t.Timestamps()
 }`,
 		},
 		{

diff --git a/genny/fizz/ctable/options.go b/genny/fizz/ctable/options.go
@@ -39,12 +39,13 @@ func (opts *Options) Validate() error {
 	if len(opts.TableName) == 0 {
 		return errors.New("you must set a name for your table")
 	}
+	opts.TableName = name.New(opts.TableName).Tableize().String()
 	if len(opts.Path) == 0 {
 		opts.Path = "migrations"
 	}
 	if len(opts.Name) == 0 {
 		timestamp := nowFunc().UTC().Format("20060102150405")
-		opts.Name = fmt.Sprintf("%s_create_%s", timestamp, name.New(opts.TableName).Tableize())
+		opts.Name = fmt.Sprintf("%s_create_%s", timestamp, opts.TableName)
 	}
 	if len(opts.Type) == 0 {
 		opts.Type = "fizz"