PostgreSQL backup tool with Point-In-Time-Recovery and restore verification
TypeScript backupbackupsdatabasedatabase-backupdevopsdockergolangkubernetesmariadbmongodbmysqlpgpostgrespostgresqls3self-hostedsystem-administrationtoolsweb-ui
FIX (mariadb): Fix events exclusion
Rostislav Duginb42c820bb212
diff --git a/backend/internal/features/backups/backups/usecases/mariadb/create_backup_uc.go b/backend/internal/features/backups/backups/usecases/mariadb/create_backup_uc.goindex eef9d43e..e5e131e6 100644--- a/backend/internal/features/backups/backups/usecases/mariadb/create_backup_uc.go+++ b/backend/internal/features/backups/backups/usecases/mariadb/create_backup_uc.go@@ -115,7 +115,8 @@ func (uc *CreateMariadbBackupUsecase) buildMariadbDumpArgs(if mdb.HasPrivilege("TRIGGER") {args = append(args, "--triggers")}- if mdb.HasPrivilege("EVENT") {++ if mdb.HasPrivilege("EVENT") && !mdb.IsExcludeEvents {args = append(args, "--events")}diff --git a/backend/internal/features/databases/databases/mariadb/model.go b/backend/internal/features/databases/databases/mariadb/model.goindex 06bdd61c..9a97af1c 100644--- a/backend/internal/features/databases/databases/mariadb/model.go+++ b/backend/internal/features/databases/databases/mariadb/model.go@@ -25,13 +25,14 @@ type MariadbDatabase struct {Version tools.MariadbVersion `json:"version" gorm:"type:text;not null"`- Host string `json:"host" gorm:"type:text;not null"`- Port int `json:"port" gorm:"type:int;not null"`- Username string `json:"username" gorm:"type:text;not null"`- Password string `json:"password" gorm:"type:text;not null"`- Database *string `json:"database" gorm:"type:text"`- IsHttps bool `json:"isHttps" gorm:"type:boolean;default:false"`- Privileges string `json:"privileges" gorm:"column:privileges;type:text;not null;default:''"`+ Host string `json:"host" gorm:"type:text;not null"`+ Port int `json:"port" gorm:"type:int;not null"`+ Username string `json:"username" gorm:"type:text;not null"`+ Password string `json:"password" gorm:"type:text;not null"`+ Database *string `json:"database" gorm:"type:text"`+ IsHttps bool `json:"isHttps" gorm:"type:boolean;default:false"`+ IsExcludeEvents bool `json:"isExcludeEvents" gorm:"type:boolean;default:false"`+ Privileges string `json:"privileges" gorm:"column:privileges;type:text;not null;default:''"`}func (m *MariadbDatabase) TableName() string {@@ -124,6 +125,7 @@ func (m *MariadbDatabase) Update(incoming *MariadbDatabase) {m.Username = incoming.Usernamem.Database = incoming.Databasem.IsHttps = incoming.IsHttps+ m.IsExcludeEvents = incoming.IsExcludeEventsm.Privileges = incoming.Privilegesif incoming.Password != "" {diff --git a/backend/internal/features/tests/mariadb_backup_restore_test.go b/backend/internal/features/tests/mariadb_backup_restore_test.goindex 03f10102..43f2cf7c 100644--- a/backend/internal/features/tests/mariadb_backup_restore_test.go+++ b/backend/internal/features/tests/mariadb_backup_restore_test.go@@ -147,6 +147,26 @@ func Test_BackupAndRestoreMariadb_WithReadOnlyUser_RestoreIsSuccessful(t *testin}}+func Test_BackupAndRestoreMariadb_WithExcludeEvents_EventsNotRestored(t *testing.T) {+ env := config.GetEnv()+ cases := []struct {+ name string+ version tools.MariadbVersion+ port string+ }{+ {"MariaDB 10.5", tools.MariadbVersion105, env.TestMariadb105Port},+ {"MariaDB 10.11", tools.MariadbVersion1011, env.TestMariadb1011Port},+ {"MariaDB 11.4", tools.MariadbVersion114, env.TestMariadb114Port},+ }++ for _, tc := range cases {+ t.Run(tc.name, func(t *testing.T) {+ t.Parallel()+ testMariadbBackupRestoreWithExcludeEventsForVersion(t, tc.version, tc.port)+ })+ }+}+func testMariadbBackupRestoreForVersion(t *testing.T,mariadbVersion tools.MariadbVersion,@@ -702,3 +722,145 @@ func updateMariadbDatabaseCredentialsViaAPI(return &updatedDatabase}++func testMariadbBackupRestoreWithExcludeEventsForVersion(+ t *testing.T,+ mariadbVersion tools.MariadbVersion,+ port string,+) {+ container, err := connectToMariadbContainer(mariadbVersion, port)+ if err != nil {+ t.Skipf("Skipping MariaDB %s test: %v", mariadbVersion, err)+ return+ }+ defer func() {+ if container.DB != nil {+ container.DB.Close()+ }+ }()++ setupMariadbTestData(t, container.DB)++ _, err = container.DB.Exec(`+ CREATE EVENT IF NOT EXISTS test_event+ ON SCHEDULE EVERY 1 DAY+ DO BEGIN+ INSERT INTO test_data (name, value) VALUES ('event_test', 999);+ END+ `)+ if err != nil {+ t.Skipf(+ "Skipping test: MariaDB version doesn't support events or event scheduler disabled: %v",+ err,+ )+ return+ }++ router := createTestRouter()+ user := users_testing.CreateTestUser(users_enums.UserRoleMember)+ workspace := workspaces_testing.CreateTestWorkspace(+ "MariaDB Exclude Events Test Workspace",+ user,+ router,+ )++ storage := storages.CreateTestStorage(workspace.ID)++ database := createMariadbDatabaseViaAPI(+ t, router, "MariaDB Exclude Events Test Database", workspace.ID,+ container.Host, container.Port,+ container.Username, container.Password, container.Database,+ container.Version,+ user.Token,+ )++ database.Mariadb.IsExcludeEvents = true+ w := workspaces_testing.MakeAPIRequest(+ router,+ "POST",+ "/api/v1/databases/update",+ "Bearer "+user.Token,+ database,+ )+ if w.Code != http.StatusOK {+ t.Fatalf(+ "Failed to update database with IsExcludeEvents. Status: %d, Body: %s",+ w.Code,+ w.Body.String(),+ )+ }++ enableBackupsViaAPI(+ t, router, database.ID, storage.ID,+ backups_config.BackupEncryptionNone, user.Token,+ )++ createBackupViaAPI(t, router, database.ID, user.Token)++ backup := waitForBackupCompletion(t, router, database.ID, user.Token, 5*time.Minute)+ assert.Equal(t, backups_core.BackupStatusCompleted, backup.Status)++ newDBName := "restoreddb_mariadb_no_events"+ _, err = container.DB.Exec(fmt.Sprintf("DROP DATABASE IF EXISTS %s;", newDBName))+ assert.NoError(t, err)++ _, err = container.DB.Exec(fmt.Sprintf("CREATE DATABASE %s;", newDBName))+ assert.NoError(t, err)++ newDSN := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?parseTime=true",+ container.Username, container.Password, container.Host, container.Port, newDBName)+ newDB, err := sqlx.Connect("mysql", newDSN)+ assert.NoError(t, err)+ defer newDB.Close()++ createMariadbRestoreViaAPI(+ t, router, backup.ID,+ container.Host, container.Port,+ container.Username, container.Password, newDBName,+ container.Version,+ user.Token,+ )++ restore := waitForMariadbRestoreCompletion(t, router, backup.ID, user.Token, 5*time.Minute)+ assert.Equal(t, restores_core.RestoreStatusCompleted, restore.Status)++ var tableExists int+ err = newDB.Get(+ &tableExists,+ "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = ? AND table_name = 'test_data'",+ newDBName,+ )+ assert.NoError(t, err)+ assert.Equal(t, 1, tableExists, "Table 'test_data' should exist in restored database")++ verifyMariadbDataIntegrity(t, container.DB, newDB)++ var eventCount int+ err = newDB.Get(+ &eventCount,+ "SELECT COUNT(*) FROM information_schema.events WHERE event_schema = ? AND event_name = 'test_event'",+ newDBName,+ )+ assert.NoError(t, err)+ assert.Equal(+ t,+ 0,+ eventCount,+ "Event 'test_event' should NOT exist in restored database when IsExcludeEvents is true",+ )++ err = os.Remove(filepath.Join(config.GetEnv().DataFolder, backup.ID.String()))+ if err != nil {+ t.Logf("Warning: Failed to delete backup file: %v", err)+ }++ test_utils.MakeDeleteRequest(+ t,+ router,+ "/api/v1/databases/"+database.ID.String(),+ "Bearer "+user.Token,+ http.StatusNoContent,+ )+ storages.RemoveTestStorage(storage.ID)+ workspaces_testing.RemoveTestWorkspace(workspace, router)+}diff --git a/backend/migrations/20260213131117_add_mariadb_event_exclusion.sql b/backend/migrations/20260213131117_add_mariadb_event_exclusion.sqlnew file mode 100644index 00000000..a32af430--- /dev/null+++ b/backend/migrations/20260213131117_add_mariadb_event_exclusion.sql@@ -0,0 +1,11 @@+-- +goose Up+-- +goose StatementBegin+ALTER TABLE mariadb_databases+ ADD COLUMN IF NOT EXISTS is_exclude_events BOOLEAN NOT NULL DEFAULT FALSE;+-- +goose StatementEnd++-- +goose Down+-- +goose StatementBegin+ALTER TABLE mariadb_databases+ DROP COLUMN IF EXISTS is_exclude_events;+-- +goose StatementEnd