Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: simplify sqlite string, and make sure postgres migrations work
Kyle Mendell1a01113aa77c
diff --git a/backend/internal/bootstrap/db_bootstrap.go b/backend/internal/bootstrap/db_bootstrap.goindex 4a91e07bb..4651ad86d 100644--- a/backend/internal/bootstrap/db_bootstrap.go+++ b/backend/internal/bootstrap/db_bootstrap.go@@ -15,6 +15,7 @@ func initializeDBAndMigrate(cfg *config.Config) (*database.DB, error) {}log.Printf("Running database migrations...")+ log.Printf("DB URL: %s", cfg.DatabaseURL)if err := db.Migrate(); err != nil {db.Close()return nil, fmt.Errorf("failed to run migrations: %w", err)diff --git a/backend/internal/config/config.go b/backend/internal/config/config.goindex 7b1b7d70d..c4494f9df 100644--- a/backend/internal/config/config.go+++ b/backend/internal/config/config.go@@ -5,6 +5,10 @@ import ("strconv")+const (+ defaultSqliteString string = "file:data/arcane.db?_pragma=journal_mode(WAL)&_pragma=busy_timeout(2500)&_txlock=immediate"+)+type Config struct {AppUrl stringDatabaseURL string@@ -29,9 +33,9 @@ func Load() *Config {return &Config{AppUrl: getEnvOrDefault("APP_URL", "http://localhost:8080"),- DatabaseURL: getEnvOrDefault("DATABASE_URL", "sqlite3://./data/arcane.db"),+ DatabaseURL: getEnvOrDefault("DATABASE_URL", defaultSqliteString),Port: getEnvOrDefault("PORT", "8080"),- Environment: getEnvOrDefault("ENVIRONMENT", "development"),+ Environment: getEnvOrDefault("ENVIRONMENT", "production"),JWTSecret: getEnvOrDefault("JWT_SECRET", "default-jwt-secret-change-me"),EncryptionKey: getEnvOrDefault("ENCRYPTION_KEY", "arcane-dev-key-32-characters!!!"),diff --git a/backend/internal/database/database.go b/backend/internal/database/database.goindex 707454f46..e62fb8f72 100644--- a/backend/internal/database/database.go+++ b/backend/internal/database/database.go@@ -3,6 +3,7 @@ package databaseimport ("fmt""log"+ "net/url""os""strings""time"@@ -23,44 +24,27 @@ func Initialize(databaseURL string, environment string) (*DB, error) {var dialector gorm.Dialectorswitch {- case strings.HasPrefix(databaseURL, "sqlite://"):- dbPath := strings.TrimPrefix(databaseURL, "sqlite://")- dialector = sqlite.Open(dbPath)- case strings.HasPrefix(databaseURL, "sqlite3://"):- dbPath := strings.TrimPrefix(databaseURL, "sqlite3://")- dialector = sqlite.Open(dbPath)+ case strings.HasPrefix(databaseURL, "file:"):+ connString, err := parseSqliteConnectionString(databaseURL)+ if err != nil {+ return nil, fmt.Errorf("failed to parse SQLite connection string: %w", err)+ }+ dialector = sqlite.Open(connString)case strings.HasPrefix(databaseURL, "postgres"):dialector = postgres.Open(databaseURL)default:return nil, fmt.Errorf("unsupported database type in URL: %s", databaseURL)}- var logLevel logger.LogLevel- switch environment {- case "development":- logLevel = logger.Info // Show all SQL queries and info- case "production":- logLevel = logger.Silent // Show nothing- default:- logLevel = logger.Warn // Show warnings and errors only- }-- gormLogger := logger.New(- log.New(os.Stdout, "\r\n", log.LstdFlags),- logger.Config{- SlowThreshold: time.Second,- LogLevel: logLevel,- IgnoreRecordNotFoundError: true,- Colorful: environment == "development",- },- )+ gormLogger := getLogger(environment)db, err := gorm.Open(dialector, &gorm.Config{Logger: gormLogger,NowFunc: func() time.Time {return time.Now().UTC()},- PrepareStmt: true,+ PrepareStmt: true,+ IgnoreRelationshipsWhenMigrating: true,})if err != nil {@@ -79,6 +63,60 @@ func Initialize(databaseURL string, environment string) (*DB, error) {return &DB{db}, nil}+func parseSqliteConnectionString(connString string) (string, error) {+ if !strings.HasPrefix(connString, "file:") {+ connString = "file:" + connString+ }++ connStringUrl, err := url.Parse(connString)+ if err != nil {+ return "", fmt.Errorf("failed to parse SQLite connection string: %w", err)+ }++ qs := make(url.Values, len(connStringUrl.Query()))+ for k, v := range connStringUrl.Query() {+ switch k {+ case "_journal_mode":+ qs.Add("_pragma", "journal_mode("+v[0]+")")+ case "_busy_timeout", "_timeout":+ qs.Add("_pragma", "busy_timeout("+v[0]+")")+ case "_foreign_keys", "_fk":+ qs.Add("_pragma", "foreign_keys("+v[0]+")")+ case "_synchronous", "_sync":+ qs.Add("_pragma", "synchronous("+v[0]+")")+ case "_txlock":+ qs.Add("_txlock", v[0])+ default:+ qs[k] = v+ }+ }++ connStringUrl.RawQuery = qs.Encode()+ return connStringUrl.String(), nil+}++func getLogger(environment string) logger.Interface {+ var logLevel logger.LogLevel+ switch environment {+ case "development":+ logLevel = logger.Info+ case "production":+ logLevel = logger.Silent+ default:+ logLevel = logger.Warn+ }++ return logger.New(+ log.New(os.Stdout, "\r\n", log.LstdFlags),+ logger.Config{+ SlowThreshold: time.Second,+ LogLevel: logLevel,+ IgnoreRecordNotFoundError: true,+ Colorful: environment == "development",+ },+ )+}+func (db *DB) Migrate() error {err := db.AutoMigrate(&models.Settings{},