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

dialect/sql/schema: alter table for postgres

Browse Source 
Summary: Pull Request resolved: https://github.com/facebookincubator/ent/pull/115

Reviewed By: alexsn

Differential Revision: D18065988

fbshipit-source-id: a7d33bbebd63b01659bc5ba562ac85642dcd3d83
This commit is contained in:
Ariel Mashraki
2019-10-22 12:54:04 -07:00
committed by Facebook Github Bot
parent dff3067639
commit 2789257849
4 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ func (d *Postgres) setRange(ctx context.Context, tx dialect.Tx, name string, val
func (d *Postgres) table(ctx context.Context, tx dialect.Tx, name string) (*Table, error) {
rows := &sql.Rows{}
query, args := sql.Dialect(dialect.Postgres).
Select("column_name", "data_type", "character_maximum_length", "is_nullable", "column_default").
Select("column_name", "data_type", "is_nullable", "column_default").
From(sql.Table("INFORMATION_SCHEMA.COLUMNS").Unquote()).
Where(sql.EQ("table_schema", sql.Raw("CURRENT_SCHEMA()")).And().EQ("table_name", name)).Query()
if err := tx.Query(ctx, query, args, rows); err != nil {
@@ -147,7 +147,7 @@ WHERE t.oid = idx.indrelid
func (d *Postgres) indexes(ctx context.Context, tx dialect.Tx, table string) (Indexes, error) {
rows := &sql.Rows{}
if err := tx.Query(ctx, fmt.Sprintf(indexesQuery, table), []interface{}{}, rows); err != nil {
return nil, fmt.Errorf("querying indexes for table %s", table)
return nil, fmt.Errorf("querying indexes for table %s: %v", table, err)
}
defer rows.Close()
var (
@@ -179,11 +179,10 @@ const maxCharSize = 10 << 20
// scanColumn scans the information a column from column description.
func (d *Postgres) scanColumn(c *Column, rows *sql.Rows) error {
var (
maxlen sql.NullInt64
nullable sql.NullString
defaults sql.NullString
)
if err := rows.Scan(&c.Name, &c.typ, &maxlen, &nullable, &defaults); err != nil {
if err := rows.Scan(&c.Name, &c.typ, &nullable, &defaults); err != nil {
return fmt.Errorf("scanning column description: %v", err)
}
if nullable.Valid {
@@ -205,9 +204,8 @@ func (d *Postgres) scanColumn(c *Column, rows *sql.Rows) error {
case "text":
c.Type = field.TypeString
c.Size = maxCharSize + 1
case "character":
case "character", "character varying":
c.Type = field.TypeString
c.Size = maxlen.Int64
case "timestamp with time zone":
c.Type = field.TypeTime
case "bytea":