From 1fece577cc7bd635cb134f1d1926beb0c0f89f7e Mon Sep 17 00:00:00 2001 From: Charles GTE Date: Sat, 20 Jun 2026 14:36:09 +0200 Subject: [PATCH] fix: tests and config.rs and backup.rs args --- src/domain/mysql/backup.rs | 2 ++ src/domain/postgres/database.rs | 1 - src/services/config.rs | 9 ++++++++- src/tests/domain/firebird.rs | 1 + src/tests/domain/mariadb.rs | 1 + src/tests/domain/mongodb.rs | 1 + src/tests/domain/mssql.rs | 1 + src/tests/domain/mysql.rs | 1 + src/tests/domain/postgres.rs | 2 ++ src/tests/domain/redis.rs | 1 + src/tests/domain/valkey.rs | 1 + 11 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/domain/mysql/backup.rs b/src/domain/mysql/backup.rs index 543bc20..49ea6c7 100644 --- a/src/domain/mysql/backup.rs +++ b/src/domain/mysql/backup.rs @@ -47,6 +47,8 @@ pub async fn run( .arg("--triggers") .arg("--verbose") .arg("--single-transaction") + .arg("--set-gtid-purged=OFF") + .arg("--no-tablespaces") .arg("--quick") .arg("--skip-lock-tables") .arg("--skip-add-drop-table") diff --git a/src/domain/postgres/database.rs b/src/domain/postgres/database.rs index af18f81..b1f160a 100644 --- a/src/domain/postgres/database.rs +++ b/src/domain/postgres/database.rs @@ -3,7 +3,6 @@ use async_trait::async_trait; use std::collections::HashMap; use std::path::{Path, PathBuf}; use std::sync::Arc; -use tracing::info; use super::{backup, format::PostgresDumpFormat, ping, restore}; use crate::domain::factory::Database; use crate::services::backup::logger::JobLogger; diff --git a/src/services/config.rs b/src/services/config.rs index 7efcecb..fe9f3c6 100644 --- a/src/services/config.rs +++ b/src/services/config.rs @@ -216,6 +216,13 @@ impl ConfigService { _ => optional(&db.path), }; + let max_packet_size = match db.db_type { + DbType::Mysql | DbType::Mariadb => { + db.max_packet_size.unwrap_or_else(|| "512M".to_string()) + } + _ => String::new(), + }; + databases.push(DatabaseConfig { name: db.name, database: database_name, @@ -226,7 +233,7 @@ impl ConfigService { port, generated_id: db.generated_id, path: path_val, - max_packet_size: db.max_packet_size.unwrap_or_else(|| "512M".to_string()), + max_packet_size, }); } diff --git a/src/tests/domain/firebird.rs b/src/tests/domain/firebird.rs index 228dfdf..2ae4320 100644 --- a/src/tests/domain/firebird.rs +++ b/src/tests/domain/firebird.rs @@ -39,6 +39,7 @@ async fn create_config() -> (ContainerAsync, DatabaseConfig) { host, generated_id: "3c445eb4-c2c6-4bde-a423-ee1385dcf6d2".to_string(), path: "".to_string(), + max_packet_size: "".to_string(), }; (container, config) diff --git a/src/tests/domain/mariadb.rs b/src/tests/domain/mariadb.rs index 836d211..1989bbd 100644 --- a/src/tests/domain/mariadb.rs +++ b/src/tests/domain/mariadb.rs @@ -31,6 +31,7 @@ async fn create_config() -> (ContainerAsync, DatabaseConfig) { host: host.to_string(), generated_id: "3c4b4eb4-c2c6-4bde-a423-ee1385dcf6d2".to_string(), path: "".to_string(), + max_packet_size: "512M".to_string(), }; (container, config) diff --git a/src/tests/domain/mongodb.rs b/src/tests/domain/mongodb.rs index e596435..d2d0688 100644 --- a/src/tests/domain/mongodb.rs +++ b/src/tests/domain/mongodb.rs @@ -29,6 +29,7 @@ async fn create_config() -> (ContainerAsync, DatabaseConfig) { host: host.to_string(), generated_id: "96d30a9f-ff4b-47c9-aaab-f3147bb34f16".to_string(), path: "".to_string(), + max_packet_size: "".to_string(), }; (container, config) diff --git a/src/tests/domain/mssql.rs b/src/tests/domain/mssql.rs index 520d854..d6a4001 100644 --- a/src/tests/domain/mssql.rs +++ b/src/tests/domain/mssql.rs @@ -54,6 +54,7 @@ fn make_config(host: String, port: u16, database: &str, generated_id: &str) -> D host, generated_id: generated_id.to_string(), path: "".to_string(), + max_packet_size: "".to_string(), } } diff --git a/src/tests/domain/mysql.rs b/src/tests/domain/mysql.rs index f912d64..7a48bea 100644 --- a/src/tests/domain/mysql.rs +++ b/src/tests/domain/mysql.rs @@ -31,6 +31,7 @@ async fn create_config() -> (ContainerAsync, DatabaseConfig) { host: host.to_string(), generated_id: "0f1bb8f2-35a0-4c91-8098-e36873d3ce31".to_string(), path: "".to_string(), + max_packet_size: "512M".to_string(), }; (container, config) diff --git a/src/tests/domain/postgres.rs b/src/tests/domain/postgres.rs index 04d4cde..c03bdcd 100644 --- a/src/tests/domain/postgres.rs +++ b/src/tests/domain/postgres.rs @@ -38,6 +38,7 @@ async fn create_config() -> (ContainerAsync, DatabaseConfig) { host: host.to_string(), generated_id: "40875631-e3d2-4dfe-a26b-2a347ecc64fd".to_string(), path: "".to_string(), + max_packet_size: "".to_string(), }; (container, config) @@ -140,6 +141,7 @@ async fn postgres_password_with_slash_test() { host: host.to_string(), generated_id: "5a1f0e3c-9b8a-4a8e-9b1b-0a1c2d3e4f5a".to_string(), path: "".to_string(), + max_packet_size: "".to_string(), }; let db = DatabaseFactory::create_for_backup(config.clone()).await; diff --git a/src/tests/domain/redis.rs b/src/tests/domain/redis.rs index ef56dac..9cd63ee 100644 --- a/src/tests/domain/redis.rs +++ b/src/tests/domain/redis.rs @@ -28,6 +28,7 @@ async fn create_config() -> (ContainerAsync, DatabaseConfig) { host: host.to_string(), generated_id: "40875631-e3d2-4dfe-a26b-2a347ecc64fd".to_string(), path: "".to_string(), + max_packet_size: "".to_string(), }; (container, config) diff --git a/src/tests/domain/valkey.rs b/src/tests/domain/valkey.rs index 42c6df6..4a78369 100644 --- a/src/tests/domain/valkey.rs +++ b/src/tests/domain/valkey.rs @@ -27,6 +27,7 @@ async fn create_config() -> (ContainerAsync, DatabaseConfig) { host: host.to_string(), generated_id: "40875485-e3d2-4dfe-a26b-2a347ecc64fd".to_string(), path: "".to_string(), + max_packet_size: "".to_string(), }; (container, config)