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

avoid multiple rows.Err calls on error path

Browse Source 
Signed-off-by: Alex Snast <alexsn@fb.com>
This commit is contained in:
Alex Snast
2020-05-11 14:25:31 +03:00
parent 997a060043
commit 68db86be76
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,8 +31,8 @@ func (d *MySQL) init(ctx context.Context, tx dialect.Tx) error {
}
defer rows.Close()
if !rows.Next() {
if rows.Err() != nil {
return rows.Err()
if err := rows.Err(); err != nil {
return err
}
return fmt.Errorf("mysql: version variable was not found")
}
@@ -78,8 +78,8 @@ func (d *MySQL) table(ctx context.Context, tx dialect.Tx, name string) (*Table,
}
t.AddColumn(c)
}
if rows.Err() != nil {
return nil, rows.Err()
if err := rows.Err(); err != nil {
return nil, err
}
if err := rows.Close(); err != nil {
return nil, fmt.Errorf("mysql: closing rows %v", err)
@@ -432,8 +432,8 @@ func (d *MySQL) scanIndexes(rows *sql.Rows) (Indexes, error) {
}
idx.columns = append(idx.columns, column)
}
if rows.Err() != nil {
return nil, rows.Err()
if err := rows.Err(); err != nil {
return nil, err
}
return i, nil
}

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

@@ -29,8 +29,8 @@ func (d *Postgres) init(ctx context.Context, tx dialect.Tx) error {
}
defer rows.Close()
if !rows.Next() {
if rows.Err() != nil {
return rows.Err()
if err := rows.Err(); err != nil {
return err
}
return fmt.Errorf("server_version_num variable was not found")
}
@@ -96,8 +96,8 @@ func (d *Postgres) table(ctx context.Context, tx dialect.Tx, name string) (*Tabl
}
t.AddColumn(c)
}
if rows.Err() != nil {
return nil, rows.Err()
if err := rows.Err(); err != nil {
return nil, err
}
if err := rows.Close(); err != nil {
return nil, fmt.Errorf("closing rows %v", err)
@@ -190,8 +190,8 @@ func (d *Postgres) indexes(ctx context.Context, tx dialect.Tx, table string) (In
}
idx.columns = append(idx.columns, column)
}
if rows.Err() != nil {
return nil, rows.Err()
if err := rows.Err(); err != nil {
return nil, err
}
return idxs, nil
}

8
dialect/sql/schema/sqlite.go
View File

@@ -168,8 +168,8 @@ func (d *SQLite) table(ctx context.Context, tx dialect.Tx, name string) (*Table,
}
t.AddColumn(c)
}
if rows.Err() != nil {
return nil, rows.Err()
if err := rows.Err(); err != nil {
return nil, err
}
if err := rows.Close(); err != nil {
return nil, fmt.Errorf("sqlite: closing rows %v", err)
@@ -218,8 +218,8 @@ func (d *SQLite) indexes(ctx context.Context, tx dialect.Tx, name string) (Index
i.primary = origin.String == "pk"
idx = append(idx, i)
}
if rows.Err() != nil {
return nil, rows.Err()
if err := rows.Err(); err != nil {
return nil, err
}
if err := rows.Close(); err != nil {
return nil, fmt.Errorf("closing rows %v", err)