aboutsummaryrefslogtreecommitdiffstats
path: root/internal
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2024-01-28 19:57:15 -0500
committerEugene Triguba <eugenetriguba@gmail.com>2024-01-28 19:57:15 -0500
commitfb84192eef75c909d031aa867d407f1b7797e9db (patch)
tree0badb974c62c4fb180d695378c2e9d7f88eaf4df /internal
parentWrap db repo and console errs to give better errors (diff)
downloadcli-fb84192eef75c909d031aa867d407f1b7797e9db.zip
Add more wrapped errors
Diffstat (limited to 'internal')
-rw-r--r--internal/repositories/migration_db_repo.go16
-rw-r--r--internal/sqlparse/sqlparse.go3
-rw-r--r--internal/storage/db.go11
3 files changed, 20 insertions, 10 deletions
diff --git a/internal/repositories/migration_db_repo.go b/internal/repositories/migration_db_repo.go
index 93b9c73..b9e2d78 100644
--- a/internal/repositories/migration_db_repo.go
+++ b/internal/repositories/migration_db_repo.go
@@ -25,7 +25,10 @@ func NewMigrationDBRepo(db *sql.DB) (*MigrationDBRepo, error) {
);
`)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf(
+ "unable to create bolt_migrations database table: %w",
+ err,
+ )
}
return &MigrationDBRepo{db: db}, nil
@@ -38,7 +41,11 @@ func NewMigrationDBRepo(db *sql.DB) (*MigrationDBRepo, error) {
func (mr *MigrationDBRepo) List() (map[string]*models.Migration, error) {
rows, err := mr.db.Query(`SELECT version FROM bolt_migrations;`)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf(
+ "unable to execute query to select versions from "+
+ "bolt_migrations database table: %w",
+ err,
+ )
}
defer rows.Close()
@@ -47,7 +54,10 @@ func (mr *MigrationDBRepo) List() (map[string]*models.Migration, error) {
var version string
err := rows.Scan(&version)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf(
+ "unable to scan version row from applied migrations: %w",
+ err,
+ )
}
trimmedVersion := strings.TrimSpace(version)
migrations[trimmedVersion] = &models.Migration{
diff --git a/internal/sqlparse/sqlparse.go b/internal/sqlparse/sqlparse.go
index 9ded618..25960c5 100644
--- a/internal/sqlparse/sqlparse.go
+++ b/internal/sqlparse/sqlparse.go
@@ -2,6 +2,7 @@ package sqlparse
import (
"bufio"
+ "fmt"
"io"
"strings"
)
@@ -37,7 +38,7 @@ func (sp *SqlParser) Parse() (*ExecutionOptions, error) {
}
if err := scanner.Err(); err != nil {
- return nil, err
+ return nil, fmt.Errorf("parsing sql file encountered an error: %w", err)
}
return options, nil
diff --git a/internal/storage/db.go b/internal/storage/db.go
index 9032dc3..e329e71 100644
--- a/internal/storage/db.go
+++ b/internal/storage/db.go
@@ -15,16 +15,15 @@ import (
func DBConnect(driver string, connectionParams string) (*sql.DB, error) {
db, err := sql.Open(driver, connectionParams)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("invalid database connection parameters: %w", err)
}
- // Note: `sql.Open` only validates the connection string we provided
- // it is sane. It doesn't actually open up a connection to the database.
- // For that, we ping the database to ensure the connection string is fully
- // valid.
+ // Note: `sql.Open` only validates the connection string we provided is sane.
+ // It doesn't actually open up a connection to the database. For that, we ping
+ // the database to ensure the connection string is fully valid.
err = db.Ping()
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("unable to ping database: %w", err)
}
return db, nil