diff options
Diffstat (limited to 'src/dbx')
-rw-r--r-- | src/dbx/db.go | 14 | ||||
-rw-r--r-- | src/dbx/mintages.go | 4 | ||||
-rw-r--r-- | src/dbx/users.go | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/dbx/db.go b/src/dbx/db.go index b5a0cfe..e0c8e30 100644 --- a/src/dbx/db.go +++ b/src/dbx/db.go @@ -15,19 +15,19 @@ import ( ) var ( - DB *sql.DB DBName string + db *sql.DB //go:embed "sql/*.sql" migrations embed.FS ) func Init() { var err error - if DB, err = sql.Open("sqlite3", DBName); err != nil { + if db, err = sql.Open("sqlite3", DBName); err != nil { log.Fatal(err) } - if err = DB.Ping(); err != nil { + if err = db.Ping(); err != nil { log.Fatal(err) } @@ -57,11 +57,15 @@ func Init() { } } +func Close() { + db.Close() +} + func applyMigrations(dir string) error { var latest int migratedp := true - rows, err := DB.Query("SELECT latest FROM migration") + rows, err := db.Query("SELECT latest FROM migration") if err != nil { e, ok := err.(sqlite3.Error) /* IDK if there is a better way to do this… lol */ @@ -103,7 +107,7 @@ func applyMigrations(dir string) error { return err } - tx, err := DB.Begin() + tx, err := db.Begin() if err != nil { return err } diff --git a/src/dbx/mintages.go b/src/dbx/mintages.go index ad13906..4a6d5d3 100644 --- a/src/dbx/mintages.go +++ b/src/dbx/mintages.go @@ -41,7 +41,7 @@ const ndenoms = 8 func GetMintages(country string) (MintageData, error) { var zero MintageData - srows, err := DB.Query(`SELECT * FROM mintages_s WHERE country = ?`, country) + srows, err := db.Query(`SELECT * FROM mintages_s WHERE country = ?`, country) if err != nil { return zero, err } @@ -51,7 +51,7 @@ func GetMintages(country string) (MintageData, error) { return zero, err } - crows, err := DB.Query(`SELECT * FROM mintages_c WHERE country = ?`, country) + crows, err := db.Query(`SELECT * FROM mintages_c WHERE country = ?`, country) if err != nil { return zero, err } diff --git a/src/dbx/users.go b/src/dbx/users.go index 2eb3bbd..d8305f8 100644 --- a/src/dbx/users.go +++ b/src/dbx/users.go @@ -26,7 +26,7 @@ func CreateUser(user User) error { return err } - _, err = DB.Exec(` + _, err = db.Exec(` INSERT INTO users ( email, username, @@ -42,7 +42,7 @@ func Login(username, password string) (User, error) { password = norm.NFC.String(password) /* TODO: Pass a context here? */ - rs, err := DB.Query(`SELECT * FROM users WHERE username = ?`, username) + rs, err := db.Query(`SELECT * FROM users WHERE username = ?`, username) if err != nil { return User{}, err } |