diff --git a/apps/desktop/src/stores/__tests__/transferTaskStore.spec.ts b/apps/desktop/src/stores/__tests__/transferTaskStore.spec.ts index 152280c317..8871a226ab 100644 --- a/apps/desktop/src/stores/__tests__/transferTaskStore.spec.ts +++ b/apps/desktop/src/stores/__tests__/transferTaskStore.spec.ts @@ -122,10 +122,7 @@ describe("transferTaskStore", () => { vi.mocked(api.loadTransferTaskLibrary).mockResolvedValue({ version: 1, folders: [], - tasks: [ - saved, - { id: "legacy", name: "legacy", config: legacyConfig, createdAt: "2026-01-01T00:00:00.000Z", updatedAt: "2026-01-01T00:00:00.000Z" }, - ], + tasks: [saved, { id: "legacy", name: "legacy", config: legacyConfig, createdAt: "2026-01-01T00:00:00.000Z", updatedAt: "2026-01-01T00:00:00.000Z" }], } as unknown as TransferTaskLibrary); setActivePinia(createPinia()); diff --git a/crates/dbx-core/src/data/transfer.rs b/crates/dbx-core/src/data/transfer.rs index ae6dfee8e2..60c97c88d3 100644 --- a/crates/dbx-core/src/data/transfer.rs +++ b/crates/dbx-core/src/data/transfer.rs @@ -13300,7 +13300,8 @@ where && postgres_identity_target(source_db_type, target_db_type) && columns.iter().any(|column| column.is_primary_key && column_is_auto_increment(column)); if pg_compat_transfer || syncs_postgres_identity { - for statement in generate_postgres_sequence_sync_sql(&target_ddl_columns, &target_table, &request.target_schema) { + for statement in generate_postgres_sequence_sync_sql(&target_ddl_columns, &target_table, &request.target_schema) + { execute_on_pool(state, target_pool_key, &statement) .await .map_err(|e| format!("Failed to sync PostgreSQL sequence for {target_table}: {e}"))?; @@ -17004,16 +17005,8 @@ CREATE TABLE "Other"."prefix""Source"."NAME" ("ID" INT);"#; request.target_column_name_case = TransferColumnNameCase::Upper; let target_columns = request.target_columns(&columns); for target in [DatabaseType::Oracle, DatabaseType::OceanbaseOracle] { - let ddl = generate_create_table_ddl( - &target_columns, - "T", - "", - "APP", - &target, - &DatabaseType::Mysql, - None, - None, - ); + let ddl = + generate_create_table_ddl(&target_columns, "T", "", "APP", &target, &DatabaseType::Mysql, None, None); assert!(ddl.contains("\"UPDATEDTIME\" TIMESTAMP"), "{ddl}"); assert!(ddl.contains("\"UPDATEDBY\" VARCHAR(300"), "{ddl}"); assert!(ddl.contains("PRIMARY KEY (\"ID\")"), "{ddl}"); diff --git a/crates/dbx-core/src/data/transfer/structure_plan.rs b/crates/dbx-core/src/data/transfer/structure_plan.rs index 4dd4e21729..07f71f665a 100644 --- a/crates/dbx-core/src/data/transfer/structure_plan.rs +++ b/crates/dbx-core/src/data/transfer/structure_plan.rs @@ -435,7 +435,13 @@ async fn plan_table_structure( table_comment.as_deref(), request.quote_target_column_names, ); - operations.extend(comment_operations(&target_columns, table, target_table, target_db_type, table_comment.as_deref())); + operations.extend(comment_operations( + &target_columns, + table, + target_table, + target_db_type, + table_comment.as_deref(), + )); statements.extend(comment_statements); for sequence in &owned_sequences.owned_sequences { diff --git a/crates/dbx-core/src/persistence/task_history.rs b/crates/dbx-core/src/persistence/task_history.rs index a6fd63e2b4..63b1f4c42e 100644 --- a/crates/dbx-core/src/persistence/task_history.rs +++ b/crates/dbx-core/src/persistence/task_history.rs @@ -932,7 +932,7 @@ fn to_sqlite_count(value: u64) -> Option { mod tests { use super::*; use crate::data::transfer::{ - TransferMode, TransferObjectSelection, TransferOwnershipPolicy, TransferColumnNameCase, TransferTableNameCase, + TransferColumnNameCase, TransferMode, TransferObjectSelection, TransferOwnershipPolicy, TransferTableNameCase, }; #[tokio::test] diff --git a/crates/dbx-core/tests/live_mysql_transfer.rs b/crates/dbx-core/tests/live_mysql_transfer.rs index ddd3af53f5..d7c6bd39c9 100644 --- a/crates/dbx-core/tests/live_mysql_transfer.rs +++ b/crates/dbx-core/tests/live_mysql_transfer.rs @@ -3,7 +3,8 @@ use dbx_core::db::mysql; use dbx_core::models::connection::{ConnectionConfig, DatabaseType}; use dbx_core::transfer::{ drop_backup_tables, execute_on_pool, rename_tables_to_backup, sort_tables_by_fk_dependency_with_foreign_keys, - transfer_table, TransferContent, TransferMode, TransferOwnershipPolicy, TransferRequest, TransferColumnNameCase, TransferTableNameCase, + transfer_table, TransferColumnNameCase, TransferContent, TransferMode, TransferOwnershipPolicy, TransferRequest, + TransferTableNameCase, }; use serde_json::json; use std::sync::Arc; diff --git a/crates/dbx-core/tests/live_oracle_transfer.rs b/crates/dbx-core/tests/live_oracle_transfer.rs index 32903b4e1f..56e6dab5d2 100644 --- a/crates/dbx-core/tests/live_oracle_transfer.rs +++ b/crates/dbx-core/tests/live_oracle_transfer.rs @@ -2,8 +2,9 @@ use dbx_core::connection::AppState; use dbx_core::models::connection::{ConnectionConfig, DatabaseType}; use dbx_core::query::execute_sql_statement; use dbx_core::transfer::{ - ensure_transfer_pool, transfer_schema_objects, transfer_table, TransferContent, TransferMode, TransferObjectKind, - TransferObjectSelection, TransferOwnershipPolicy, TransferRequest, TransferColumnNameCase, TransferTableNameCase, + ensure_transfer_pool, transfer_schema_objects, transfer_table, TransferColumnNameCase, TransferContent, + TransferMode, TransferObjectKind, TransferObjectSelection, TransferOwnershipPolicy, TransferRequest, + TransferTableNameCase, }; use std::sync::Arc; diff --git a/crates/dbx-core/tests/live_postgres_transfer.rs b/crates/dbx-core/tests/live_postgres_transfer.rs index 0ef1a14009..d219bb13da 100644 --- a/crates/dbx-core/tests/live_postgres_transfer.rs +++ b/crates/dbx-core/tests/live_postgres_transfer.rs @@ -3,9 +3,9 @@ use dbx_core::db::postgres; use dbx_core::models::connection::{ConnectionConfig, DatabaseType}; use dbx_core::transfer::{ drop_backup_tables, get_db_type, preview_transfer_ownership, rename_tables_to_backup, - transfer_postgres_schema_dependencies, transfer_postgres_schema_objects, transfer_table, TransferContent, - TransferMode, TransferObjectKind, TransferObjectSelection, TransferOwnershipPolicy, TransferRequest, - TransferColumnNameCase, TransferTableNameCase, + transfer_postgres_schema_dependencies, transfer_postgres_schema_objects, transfer_table, TransferColumnNameCase, + TransferContent, TransferMode, TransferObjectKind, TransferObjectSelection, TransferOwnershipPolicy, + TransferRequest, TransferTableNameCase, }; use serde_json::json; use std::sync::Arc; diff --git a/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs b/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs index 154c88a63d..30931aaf22 100644 --- a/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs +++ b/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs @@ -8,7 +8,8 @@ use dbx_core::connection::AppState; use dbx_core::models::connection::{ConnectionConfig, DatabaseType}; use dbx_core::transfer::{ - transfer_table, TransferContent, TransferMode, TransferOwnershipPolicy, TransferRequest, TransferColumnNameCase, TransferTableNameCase, + transfer_table, TransferColumnNameCase, TransferContent, TransferMode, TransferOwnershipPolicy, TransferRequest, + TransferTableNameCase, }; use std::collections::HashMap; use std::sync::Arc; diff --git a/crates/dbx-core/tests/live_sqlserver_transfer.rs b/crates/dbx-core/tests/live_sqlserver_transfer.rs index 60d5e63430..a9d73da264 100644 --- a/crates/dbx-core/tests/live_sqlserver_transfer.rs +++ b/crates/dbx-core/tests/live_sqlserver_transfer.rs @@ -2,8 +2,8 @@ use dbx_core::connection::AppState; use dbx_core::models::connection::{ConnectionConfig, DatabaseType}; use dbx_core::transfer::{ clear_foreign_key_linked_overwrite_targets, drop_backup_tables, rename_tables_to_backup, - sort_tables_by_fk_dependency_with_foreign_keys, transfer_table, transfer_table_with_result, TransferContent, - TransferMode, TransferOwnershipPolicy, TransferRequest, TransferColumnNameCase, TransferTableNameCase, + sort_tables_by_fk_dependency_with_foreign_keys, transfer_table, transfer_table_with_result, TransferColumnNameCase, + TransferContent, TransferMode, TransferOwnershipPolicy, TransferRequest, TransferTableNameCase, }; use std::collections::HashMap; use std::sync::Arc; diff --git a/crates/dbx-web/src/routes/transfer.rs b/crates/dbx-web/src/routes/transfer.rs index 29c988a1a8..7a5a90c4f2 100644 --- a/crates/dbx-web/src/routes/transfer.rs +++ b/crates/dbx-web/src/routes/transfer.rs @@ -320,7 +320,8 @@ mod tests { }; use dbx_core::persistence::task_history::{TaskRunItemsQuery, TaskRunStatus, TransferObjectSelectionMode}; use dbx_core::transfer::{ - TransferContent, TransferMode, TransferOwnershipPolicy, TransferRequest, TransferColumnNameCase, TransferTableNameCase, + TransferColumnNameCase, TransferContent, TransferMode, TransferOwnershipPolicy, TransferRequest, + TransferTableNameCase, }; fn sqlite_config(id: &str, path: &str) -> ConnectionConfig {