fix: use go-migrate pkg to init or update db schema
Instead to implement own logic how the database scheme should be updated or migrated to a newer or older version flucky use now instead the go-migrate package.
This commit is contained in:
@ -7,8 +7,9 @@ import (
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
postgresdml "git.cryptic.systems/volker.raschek/flucky/pkg/repository/db/postgres/dml"
|
||||
sqlite3dml "git.cryptic.systems/volker.raschek/flucky/pkg/repository/db/sqlite3/dml"
|
||||
"git.cryptic.systems/volker.raschek/flucky/pkg/types"
|
||||
"git.cryptic.systems/volker.raschek/go-logger"
|
||||
)
|
||||
@ -25,7 +26,7 @@ type Database interface {
|
||||
InsertOrUpdateMeasuredValues(ctx context.Context, measuredValues ...*types.MeasuredValue) error
|
||||
InsertSensors(ctx context.Context, sensors ...*types.Sensor) error
|
||||
InsertOrUpdateSensors(ctx context.Context, sensors ...*types.Sensor) error
|
||||
Scheme(ctx context.Context) error
|
||||
Migrate(ctx context.Context) error
|
||||
SelectDevice(ctx context.Context, deviceID string) (*types.Device, error)
|
||||
SelectDevices(ctx context.Context) ([]*types.Device, error)
|
||||
SelectHumidity(ctx context.Context, id string) (*types.MeasuredValue, error)
|
||||
@ -41,11 +42,11 @@ type Database interface {
|
||||
}
|
||||
|
||||
// New returns a new database backend interface
|
||||
func New(dsnURL *url.URL, flogger logger.Logger) (Database, error) {
|
||||
func New(databaseURL *url.URL, flogger logger.Logger) (Database, error) {
|
||||
|
||||
// Check of nil pointer
|
||||
for _, parameter := range []interface{}{
|
||||
dsnURL,
|
||||
databaseURL,
|
||||
flogger,
|
||||
} {
|
||||
if parameter == nil {
|
||||
@ -53,72 +54,78 @@ func New(dsnURL *url.URL, flogger logger.Logger) (Database, error) {
|
||||
}
|
||||
}
|
||||
|
||||
// Load Queryfiles
|
||||
queries := make(map[string]string, 0)
|
||||
for _, asset := range AssetNames() {
|
||||
|
||||
if !strings.Contains(asset, dsnURL.Scheme) {
|
||||
continue
|
||||
}
|
||||
|
||||
body, err := Asset(asset)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
queryFile := filepath.Base(asset)
|
||||
|
||||
queries[queryFile] = string(body)
|
||||
}
|
||||
|
||||
var (
|
||||
database Database
|
||||
err error
|
||||
)
|
||||
|
||||
switch dsnURL.Scheme {
|
||||
switch databaseURL.Scheme {
|
||||
case "postgres":
|
||||
|
||||
// postgres://[user]:[password]@[host]:[port]/[path]?[query]
|
||||
newDBO, err := sql.Open(dsnURL.Scheme, dsnURL.String())
|
||||
newDBO, err := sql.Open(databaseURL.Scheme, databaseURL.String())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
queries := make(map[string]string, 0)
|
||||
for _, assetName := range postgresdml.AssetNames() {
|
||||
body, err := postgresdml.Asset(assetName)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Failed to load asset %v, %w", assetName, err)
|
||||
}
|
||||
queries[assetName] = string(body)
|
||||
}
|
||||
|
||||
database = &Postgres{
|
||||
dbo: newDBO,
|
||||
flogger: flogger,
|
||||
queries: queries,
|
||||
databaseURL: databaseURL,
|
||||
dbo: newDBO,
|
||||
flogger: flogger,
|
||||
queries: queries,
|
||||
}
|
||||
|
||||
case "sqlite3":
|
||||
|
||||
// Create directory where the db file will be created if not exists.
|
||||
if _, err := os.Stat(filepath.Dir(dsnURL.Path)); os.IsNotExist(err) {
|
||||
err := os.MkdirAll(filepath.Dir(dsnURL.Path), 0755)
|
||||
// Create directory if not exist
|
||||
if _, err := os.Stat(filepath.Dir(databaseURL.Path)); os.IsNotExist(err) {
|
||||
err := os.MkdirAll(filepath.Dir(databaseURL.Path), 0755)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
// sqlite3:///[path]?[query] flucky dsn
|
||||
// file:///[path]?[query] sql-lib dsn
|
||||
newDBO, err := sql.Open(dsnURL.Scheme, fmt.Sprintf("file://%v?%v", dsnURL.Path, dsnURL.RawQuery))
|
||||
// enable foreign keys
|
||||
values := databaseURL.Query()
|
||||
values.Set("_foreign_keys", "on")
|
||||
|
||||
customRawURL := fmt.Sprintf("file://%v?%v", databaseURL.Path, values.Encode())
|
||||
|
||||
sqlDB, err := sql.Open("sqlite3", customRawURL)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
queries := make(map[string]string, 0)
|
||||
for _, assetName := range sqlite3dml.AssetNames() {
|
||||
body, err := sqlite3dml.Asset(assetName)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Failed to load asset %v, %w", assetName, err)
|
||||
}
|
||||
queries[assetName] = string(body)
|
||||
}
|
||||
|
||||
database = &SQLite{
|
||||
dbo: newDBO,
|
||||
flogger: flogger,
|
||||
queries: queries,
|
||||
databaseURL: databaseURL,
|
||||
dbo: sqlDB,
|
||||
flogger: flogger,
|
||||
queries: queries,
|
||||
}
|
||||
default:
|
||||
return nil, fmt.Errorf("Unsupported database scheme: %v", dsnURL.Scheme)
|
||||
return nil, fmt.Errorf("Unsupported database scheme: %v", databaseURL.Scheme)
|
||||
}
|
||||
|
||||
// Initialize database scheme if not exists
|
||||
err = database.Scheme(context.Background())
|
||||
err = database.Migrate(context.Background())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
Reference in New Issue
Block a user