From 3850e2f070bb3c1227b78dcd1e8a34a89a9e9906 Mon Sep 17 00:00:00 2001 From: Ali Golzar <57574919+aliglzr@users.noreply.github.com> Date: Wed, 21 May 2025 13:34:38 +0330 Subject: feat: Add MySQL database support (#3024) * feat: Add MySQL database support - Add MySQL database support with environment-based configuration - Fix MySQL compatibility issue with 'key' column name - Maintain SQLite as default database - Add proper validation for MySQL configuration - Test and verify compatibility with existing database - Replaced raw SQL queries using JSON_EACH functions with standard GORM queries - Modified functions to handle JSON parsing in Go code instead of database since JSON_EACH is not available on MySQL or MariaDB: - getAllEmails() - GetClientTrafficByID() - getFallbackMaster() - MigrationRemoveOrphanedTraffics() The system now supports both MySQL and SQLite databases, with SQLite remaining as the default option. MySQL connection is only used when explicitly configured through environment variables. * refactor: prefix env variables of database with XUI_ to support direct environment usage without .env file All database configuration environment variables now start with the XUI_ prefix to avoid conflicts and allow configuration via system-level environment variables, not just the .env file. --- database/db.go | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) (limited to 'database/db.go') diff --git a/database/db.go b/database/db.go index c72d28cf..05fc64cb 100644 --- a/database/db.go +++ b/database/db.go @@ -9,14 +9,15 @@ import ( "path" "slices" + "gorm.io/driver/mysql" + "gorm.io/driver/sqlite" + "gorm.io/gorm" + "gorm.io/gorm/logger" + "x-ui/config" "x-ui/database/model" "x-ui/util/crypto" "x-ui/xray" - - "gorm.io/driver/sqlite" - "gorm.io/gorm" - "gorm.io/gorm/logger" ) var db *gorm.DB @@ -114,12 +115,22 @@ func isTableEmpty(tableName string) (bool, error) { } func InitDB(dbPath string) error { - dir := path.Dir(dbPath) - err := os.MkdirAll(dir, fs.ModePerm) + dbConfig, err := config.GetDatabaseConfig() if err != nil { return err } + if dbConfig.Connection != "mysql" { + // Connection is sqlite + // Need to create the directory if it doesn't exist + + dir := path.Dir(dbPath) + err = os.MkdirAll(dir, fs.ModePerm) + if err != nil { + return err + } + } + var gormLogger logger.Interface if config.IsDebug() { @@ -131,9 +142,18 @@ func InitDB(dbPath string) error { c := &gorm.Config{ Logger: gormLogger, } - db, err = gorm.Open(sqlite.Open(dbPath), c) - if err != nil { - return err + + if dbConfig.Connection == "mysql" { + db, err = gorm.Open(mysql.Open(dbPath), c) + if err != nil { + return err + } + } else { + // Connection is sqlite + db, err = gorm.Open(sqlite.Open(dbPath), c) + if err != nil { + return err + } } if err := initModels(); err != nil { -- cgit v1.2.3