db: remove implicit singleton pattern, move functions under a struct object
This commit is contained in:
@@ -20,7 +20,7 @@ func TestCreateAndConnectToDB(t *testing.T) {
|
||||
schema_sql := string(_schema_sql)
|
||||
migrations := []string{}
|
||||
|
||||
db.Init(&schema_sql, &migrations)
|
||||
config := db.Init(&schema_sql, &migrations)
|
||||
|
||||
data_dir := "../../sample_data/data"
|
||||
_ = os.MkdirAll(data_dir, os.FileMode(0o644))
|
||||
@@ -28,9 +28,9 @@ func TestCreateAndConnectToDB(t *testing.T) {
|
||||
dbPath := filepath.Join(data_dir, "test.db")
|
||||
_ = os.Remove(dbPath) // Delete it if it exists
|
||||
|
||||
_, err = db.Create(dbPath)
|
||||
_, err = config.Create(dbPath)
|
||||
assert.NoError(err)
|
||||
_, err = db.Connect(dbPath)
|
||||
_, err = config.Connect(dbPath)
|
||||
assert.NoError(err)
|
||||
}
|
||||
|
||||
@@ -44,9 +44,9 @@ func TestVersionUpgrade(t *testing.T) {
|
||||
insert into db_version values(0);
|
||||
`
|
||||
migrations := []string{}
|
||||
db.Init(&initial_schema, &migrations)
|
||||
config := db.Init(&initial_schema, &migrations)
|
||||
|
||||
connection, err := db.Create(":memory:")
|
||||
connection, err := config.Create(":memory:")
|
||||
require.NoError(err)
|
||||
|
||||
get_version := func(c *sqlx.DB) (ret int) {
|
||||
@@ -63,7 +63,7 @@ func TestVersionUpgrade(t *testing.T) {
|
||||
// Create a migration to add a new Item
|
||||
migrations = append(migrations, "insert into items (rowid) values (1)")
|
||||
db.Init(&initial_schema, &migrations) // Reinitialize with the new migration
|
||||
db.UpgradeFromXToY(connection, uint(len(migrations)-1), uint(len(migrations)))
|
||||
config.UpgradeFromXToY(connection, uint(len(migrations)-1), uint(len(migrations)))
|
||||
|
||||
var items2 []int
|
||||
require.NoError(connection.Select(&items2, "select * from items"))
|
||||
@@ -72,8 +72,8 @@ func TestVersionUpgrade(t *testing.T) {
|
||||
|
||||
// Create a migration to add a new Item
|
||||
migrations = append(migrations, `alter table items add column name string default 'asdf'`)
|
||||
db.Init(&initial_schema, &migrations) // Reinitialize with the new migration
|
||||
db.UpgradeFromXToY(connection, uint(len(migrations)-1), uint(len(migrations)))
|
||||
config = db.Init(&initial_schema, &migrations) // Reinitialize with the new migration
|
||||
config.UpgradeFromXToY(connection, uint(len(migrations)-1), uint(len(migrations)))
|
||||
|
||||
var items3 []struct {
|
||||
ID uint64 `db:"rowid"`
|
||||
|
||||
Reference in New Issue
Block a user