diff --git a/src/config/config.go b/src/config/config.go index 4e84c40..03b2d42 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -10,6 +10,8 @@ import ( type Configuration struct { AssetsDir string `yaml:"assets"` Port string `yaml:"port"` + DBSys string `yaml:"dbsys"` + DBPath string `yaml:"dbpath"` } var ( diff --git a/src/expenses/categories.go b/src/expenses/categories.go index e2dc9f4..d29ae77 100644 --- a/src/expenses/categories.go +++ b/src/expenses/categories.go @@ -5,6 +5,8 @@ import ( "fmt" "log" + "expenses/config" + _ "github.com/mattn/go-sqlite3" ) @@ -25,7 +27,9 @@ func NewCategory() Category { } func GetAllCategories() ([]Category, error) { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return nil, err } @@ -53,7 +57,9 @@ func GetAllCategories() ([]Category, error) { } func GetCategory(catID int) (Category, error) { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return Category{}, err } @@ -73,7 +79,9 @@ func GetCategory(catID int) (Category, error) { } func (cat *Category) Insert() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } @@ -96,17 +104,14 @@ func (cat *Category) Insert() error { } func (cat *Category) Delete() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } defer db.Close() - _, err = db.Exec("PRAGMA foreign_keys = ON") - if err != nil { - return err - } - query := "DELETE FROM categories WHERE CategoryID = ?" res, err := db.Exec(query, cat.CategoryID) if err != nil { @@ -124,17 +129,14 @@ func (cat *Category) Delete() error { } func (cat *Category) Update() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } defer db.Close() - _, err = db.Exec("PRAGMA foreign_keys = ON") - if err != nil { - return err - } - query := "UPDATE categories SET CategoryName = ? WHERE CategoryID = ?" res, err := db.Exec(query, cat.CategoryName, cat.CategoryID) if err != nil { diff --git a/src/expenses/expensePayments.go b/src/expenses/expensePayments.go index 67a657d..5657e38 100644 --- a/src/expenses/expensePayments.go +++ b/src/expenses/expensePayments.go @@ -1,6 +1,8 @@ package expenses import ( + "expenses/config" + "database/sql" "log" "fmt" @@ -15,7 +17,9 @@ type ExpensePayment struct { } func (e *Expense) GetPayments() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return err } @@ -47,7 +51,9 @@ func (e *Expense) GetPayments() error { } func (p *ExpensePayment) Insert(expID int) error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } @@ -74,7 +80,9 @@ func (p *ExpensePayment) Insert(expID int) error { } func (p *ExpensePayment) Update() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return err } @@ -102,7 +110,9 @@ func (p *ExpensePayment) Update() error { } func (p *ExpensePayment) Delete() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return err } diff --git a/src/expenses/expenseShares.go b/src/expenses/expenseShares.go index f6ecab6..20a7f29 100644 --- a/src/expenses/expenseShares.go +++ b/src/expenses/expenseShares.go @@ -1,6 +1,8 @@ package expenses import ( + "expenses/config" + "database/sql" "fmt" "log" @@ -15,7 +17,9 @@ type ExpenseShare struct { } func (e *Expense) GetShares() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return err } @@ -47,7 +51,9 @@ func (e *Expense) GetShares() error { } func (sh *ExpenseShare) Insert(expID int) error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } @@ -74,7 +80,9 @@ func (sh *ExpenseShare) Insert(expID int) error { } func (sh *ExpenseShare) Update() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return err } diff --git a/src/expenses/expenses.go b/src/expenses/expenses.go index 6afb055..8d473be 100644 --- a/src/expenses/expenses.go +++ b/src/expenses/expenses.go @@ -1,6 +1,8 @@ package expenses import ( + "expenses/config" + "database/sql" "fmt" "log" @@ -38,7 +40,9 @@ func NewExpense() Expense { } func GetAllExpenses() ([]Expense, error) { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return nil, err } @@ -79,7 +83,9 @@ func GetAllExpenses() ([]Expense, error) { } func GetExpense(expID int) (Expense, error) { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return Expense{}, err } @@ -119,7 +125,9 @@ func GetExpense(expID int) (Expense, error) { } func (exp *Expense) Insert() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } @@ -168,7 +176,9 @@ func (exp *Expense) Insert() error { } func (exp *Expense) Update() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return err } @@ -227,7 +237,9 @@ func (exp *Expense) Update() error { } func (e *Expense) Delete() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return err } @@ -253,7 +265,9 @@ func (e *Expense) Delete() error { // SHITTY QUERIES THAT I NEED TO PUT IN SOMEWHERE MORE OGRANHJASLD func GetExpensesRange(start int64, end int64) ([]Expense, error) { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return nil, err } diff --git a/src/expenses/stores.go b/src/expenses/stores.go index ff3d2b8..39941cc 100644 --- a/src/expenses/stores.go +++ b/src/expenses/stores.go @@ -1,6 +1,8 @@ package expenses import ( + "expenses/config" + "database/sql" "fmt" "log" @@ -21,7 +23,9 @@ func NewStore() Store { } func GetAllStores() ([]Store, error) { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return nil, err } @@ -49,7 +53,9 @@ func GetAllStores() ([]Store, error) { } func GetStore(storeID int) (Store, error) { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return Store{}, err } @@ -69,7 +75,9 @@ func GetStore(storeID int) (Store, error) { } func (s *Store) Insert() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } @@ -92,17 +100,14 @@ func (s *Store) Insert() error { } func (s *Store) Update() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } defer db.Close() - _, err = db.Exec("PRAGMA foreign_keys = ON") - if err != nil { - return err - } - query := "UPDATE stores SET StoreName = ? WHERE StoreID = ?" res, err := db.Exec(query, s.StoreName, s.StoreID) if err != nil { @@ -120,17 +125,14 @@ func (s *Store) Update() error { } func (s *Store) Delete() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } defer db.Close() - _, err = db.Exec("PRAGMA foreign_keys = ON") - if err != nil { - return err - } - query := "DELETE FROM stores WHERE StoreID = ?" res, err := db.Exec(query, s.StoreID) if err != nil { diff --git a/src/expenses/types.go b/src/expenses/types.go index b1fd6fe..84ef662 100644 --- a/src/expenses/types.go +++ b/src/expenses/types.go @@ -1,6 +1,8 @@ package expenses import ( + "expenses/config" + "database/sql" "fmt" "log" @@ -21,7 +23,9 @@ func NewType() Type { } func GetAllTypes() ([]Type, error) { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return nil, err } @@ -49,7 +53,9 @@ func GetAllTypes() ([]Type, error) { } func GetType(typID int) (Type, error) { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return Type{}, err } @@ -69,7 +75,9 @@ func GetType(typID int) (Type, error) { } func (typ *Type) Insert() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } @@ -92,17 +100,14 @@ func (typ *Type) Insert() error { } func (typ *Type) Delete() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } defer db.Close() - _, err = db.Exec("PRAGMA foreign_keys = ON") - if err != nil { - return err - } - query := "DELETE FROM expenseTypes WHERE TypeID = ?" res, err := db.Exec(query, typ.TypeID) if err != nil { @@ -120,17 +125,14 @@ func (typ *Type) Delete() error { } func (typ *Type) Update() error { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, "file:"+cfg.DBPath+"?_foreign_keys=on") if err != nil { return err } defer db.Close() - _, err = db.Exec("PRAGMA foreign_keys = ON") - if err != nil { - return err - } - query := "UPDATE expenseTypes SET TypeName = ? WHERE TypeID = ?" res, err := db.Exec(query, typ.TypeName, typ.TypeID) if err != nil { diff --git a/src/expenses/users.go b/src/expenses/users.go index 5d8a0da..aca08eb 100644 --- a/src/expenses/users.go +++ b/src/expenses/users.go @@ -1,6 +1,8 @@ package expenses import ( + "expenses/config" + "database/sql" "log" @@ -20,7 +22,9 @@ func NewUser() User { } func GetAllUsers() ([]User, error) { - db, err := sql.Open("sqlite3", "./data/data.db") + cfg := config.GetInstance() + + db, err := sql.Open(cfg.DBSys, cfg.DBPath) if err != nil { return nil, err }