Add --sqlite option (evcc-io#4841)

olafz · Oct 16, 2022 · 59bcc1f · 59bcc1f
1 parent b26cf6d
commit 59bcc1f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/cmd/config.go b/cmd/config.go
@@ -38,7 +38,7 @@ var conf = config{
 	},
 	Database: dbConfig{
 		Type: "sqlite",
-		Dsn:  "~/.evcc/evcc.db?_pragma=busy_timeout(5000)",
+		Dsn:  "~/.evcc/evcc.db",
 	},
 }
 

diff --git a/cmd/flags.go b/cmd/flags.go
@@ -8,6 +8,9 @@ import (
 )
 
 const (
+	flagSqlite            = "sqlite"
+	flagSqliteDescription = "Sqlite database file"
+
 	flagHeaders            = "log-headers"
 	flagHeadersDescription = "Log headers"
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -53,6 +53,8 @@ func init() {
 
 	rootCmd.PersistentFlags().Bool(flagHeaders, false, flagHeadersDescription)
 
+	rootCmd.PersistentFlags().String(flagSqlite, "", flagSqliteDescription)
+
 	// config file options
 	rootCmd.PersistentFlags().StringP("log", "l", "info", "Log level (fatal, error, warn, info, debug, trace)")
 	bindP(rootCmd, "log")

diff --git a/cmd/setup.go b/cmd/setup.go
@@ -85,6 +85,10 @@ func configureEnvironment(cmd *cobra.Command, conf config) (err error) {
 
 	// setup persistence
 	if err == nil && conf.Database.Dsn != "" {
+		if flag := cmd.Flags().Lookup(flagSqlite); flag.Changed {
+			conf.Database.Type = "sqlite"
+			conf.Database.Dsn = flag.Value.String()
+		}
 		err = configureDatabase(conf.Database)
 	}
 

diff --git a/server/db/db.go b/server/db/db.go
@@ -26,7 +26,8 @@ func New(driver, dsn string) (*gorm.DB, error) {
 		if err := os.MkdirAll(filepath.Dir(file), os.ModePerm); err != nil {
 			return nil, err
 		}
-		dialect = sqlite.Open(file)
+		// avoid busy errors
+		dialect = sqlite.Open(file + "?_pragma=busy_timeout(5000)")
 	// case "postgres":
 	// 	dialect = postgres.Open(dsn)
 	// case "mysql":