diff options
Diffstat (limited to 'lib/sql')
| -rw-r--r-- | lib/sql/client.go | 17 | ||||
| -rw-r--r-- | lib/sql/row.go | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/lib/sql/client.go b/lib/sql/client.go index c281dab8..344ed76b 100644 --- a/lib/sql/client.go +++ b/lib/sql/client.go @@ -49,6 +49,7 @@ func NewClient(opts ClientOptions) (cl *Client, err error) { // FetchTableNames return the table names in current database schema sorted // in ascending order. func (cl *Client) FetchTableNames() (tableNames []string, err error) { + var logp = `FetchTableNames` var q, v string switch cl.DriverName { @@ -63,27 +64,31 @@ func (cl *Client) FetchTableNames() (tableNames []string, err error) { ` } - rows, err := cl.DB.Query(q) + var rows *sql.Rows + + rows, err = cl.DB.Query(q) if err != nil { - return nil, fmt.Errorf("FetchTableNames: " + err.Error()) + return nil, fmt.Errorf(`%s: %w`, logp, err) } if len(cl.TableNames) > 0 { cl.TableNames = cl.TableNames[:0] } + defer func() { + _ = rows.Close() + }() for rows.Next() { err = rows.Scan(&v) if err != nil { - _ = rows.Close() - return cl.TableNames, err + return cl.TableNames, fmt.Errorf(`%s: %w`, logp, err) } cl.TableNames = append(cl.TableNames, v) } err = rows.Err() if err != nil { - return nil, err + return nil, fmt.Errorf(`%s: %w`, logp, err) } return cl.TableNames, nil @@ -313,7 +318,7 @@ func (cl *Client) TruncateTable(tableName string) (err error) { _, err = cl.DB.Exec(q) if err != nil { - return fmt.Errorf("TruncateTable %q: %s", tableName, err) + return fmt.Errorf(`TruncateTable %q: %w`, tableName, err) } return nil } diff --git a/lib/sql/row.go b/lib/sql/row.go index 1fdbfb7b..693ee51e 100644 --- a/lib/sql/row.go +++ b/lib/sql/row.go @@ -14,7 +14,7 @@ import ( // the column's value. // This type can be used to create dynamic insert-update fields. // -// DEPRECATED: use [Meta] instead. +// Deprecated: use [Meta] instead. type Row map[string]interface{} // Meta convert the Row into Meta. |