golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-06 01:20:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

dialect/sql/schema: skip default value parsing on pg functions (#951)

Browse Source 
Closes #934
This commit is contained in:
Ariel Mashraki
2020-11-15 22:55:52 +02:00
committed by GitHub
parent d5b69da9e0
commit 77eaad0df6
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dialect/sql/schema/postgres.go
View File

@@ -251,7 +251,7 @@ func (d *Postgres) scanColumn(c *Column, rows *sql.Rows) error {
c.Type = field.TypeUUID
}
switch {
case !defaults.Valid || c.Type == field.TypeTime:
case !defaults.Valid || c.Type == field.TypeTime || seqfunc(defaults.String):
return nil
case strings.Contains(defaults.String, "::"):
parts := strings.Split(defaults.String, "::")
@@ -447,3 +447,13 @@ func (d *Postgres) alterColumns(table string, add, modify, drop []*Column) sql.Q
}
return sql.Queries{b}
}
// seqfunc reports if the given string is a sequence function.
func seqfunc(defaults string) bool {
for _, fn := range [...]string{"currval", "lastval", "setval", "nextval"} {
if strings.HasPrefix(defaults, fn+"(") && strings.HasSuffix(defaults, ")") {
return true
}
}
return false
}

26
dialect/sql/schema/postgres_test.go
View File

@@ -175,6 +175,32 @@ func TestPostgres_Create(t *testing.T) {
mock.ExpectCommit()
},
},
{
name: "scan table with default set to serial",
tables: []*Table{
{
Name: "users",
Columns: []*Column{
{Name: "id", Type: field.TypeInt, Increment: true},
},
PrimaryKey: []*Column{
{Name: "id", Type: field.TypeInt, Increment: true},
},
},
},
before: func(mock pgMock) {
mock.start("120000")
mock.tableExists("users", true)
mock.ExpectQuery(escape(`SELECT "column_name", "data_type", "is_nullable", "column_default" FROM INFORMATION_SCHEMA.COLUMNS WHERE "table_schema" = CURRENT_SCHEMA() AND "table_name" = $1`)).
WithArgs("users").
WillReturnRows(sqlmock.NewRows([]string{"column_name", "data_type", "is_nullable", "column_default"}).
AddRow("id", "bigint", "NO", "nextval('users_colname_seq'::regclass)"))
mock.ExpectQuery(escape(fmt.Sprintf(indexesQuery, "users"))).
WillReturnRows(sqlmock.NewRows([]string{"index_name", "column_name", "primary", "unique", "seq_in_index"}).
AddRow("users_pkey", "id", "t", "t", 0))
mock.ExpectCommit()
},
},
{
name: "add column to table",
tables: []*Table{