fix: move db driver imports to db package

charmbracelet · Aug 25, 2023 · 72d4c3b · 72d4c3b
1 parent a041c7a
commit 72d4c3b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/cmd/soft/root.go b/cmd/soft/root.go
@@ -18,8 +18,6 @@ import (
 	"github.com/charmbracelet/soft-serve/server/version"
 	"github.com/spf13/cobra"
 	"go.uber.org/automaxprocs/maxprocs"
-
-	_ "modernc.org/sqlite" // sqlite driver
 )
 
 var (

diff --git a/server/db/db.go b/server/db/db.go
@@ -9,6 +9,7 @@ import (
 	"github.com/charmbracelet/log"
 	"github.com/charmbracelet/soft-serve/server/config"
 	"github.com/jmoiron/sqlx"
+	_ "github.com/lib/pq"  // postgres driver
 	_ "modernc.org/sqlite" // sqlite driver
 )
 

diff --git a/server/db/errors.go b/server/db/errors.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/lib/pq"
 	sqlite "modernc.org/sqlite"
-	sqlite3 "modernc.org/sqlite/lib"
+	sqlitelib "modernc.org/sqlite/lib"
 )
 
 var (
@@ -28,9 +28,9 @@ func WrapError(err error) error {
 		// Handle sqlite constraint error.
 		if liteErr, ok := err.(*sqlite.Error); ok {
 			code := liteErr.Code()
-			if code == sqlite3.SQLITE_CONSTRAINT_PRIMARYKEY ||
-				code == sqlite3.SQLITE_CONSTRAINT_FOREIGNKEY ||
-				code == sqlite3.SQLITE_CONSTRAINT_UNIQUE {
+			if code == sqlitelib.SQLITE_CONSTRAINT_PRIMARYKEY ||
+				code == sqlitelib.SQLITE_CONSTRAINT_FOREIGNKEY ||
+				code == sqlitelib.SQLITE_CONSTRAINT_UNIQUE {
 				return ErrDuplicateKey
 			}
 		}