aljaz/cdk
1
0
Fork 0
mirror of https://github.com/aljazceru/cdk.git synced 2026-02-23 14:06:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix postgres migration prefixes (#1037)

Browse Source 
* Fix migrations ordering

1. Fix postgres migration prefixes for unreleased migrations
2. Fix build script to try to sort, if provided, the filename prefix as a
   number, otherwise fallback to the sorting by filename as string

* Fixed clippy issues
This commit is contained in:
C
2025-09-05 14:39:54 -03:00
committed by GitHub
parent c6cff3f6f4
commit 3815c62d88
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/cdk-sql-common/build.rs
View File

@@ -10,7 +10,27 @@ fn main() {
// Step 2: Collect all files inside the migrations dir
let mut files = Vec::new();
visit_dirs(&migration_path, &mut files).expect("Failed to read migrations directory");
files.sort();
files.sort_by(|path_a, path_b| {
let path_a = path_a.file_name().unwrap().to_str().unwrap();
let path_b = path_b.file_name().unwrap().to_str().unwrap();
let prefix_a = path_a
.split("_")
.next()
.and_then(|prefix| prefix.parse::<usize>().ok())
.unwrap_or_default();
let prefix_b = path_b
.split("_")
.next()
.and_then(|prefix| prefix.parse::<usize>().ok())
.unwrap_or_default();
if prefix_a != 0 && prefix_b != 0 {
prefix_a.cmp(&prefix_b)
} else {
path_a.cmp(path_b)
}
});
// Step 3: Output file path (e.g., `src/db/migrations.rs`)
let parent = migration_path.parent().unwrap();

4
crates/cdk-sql-common/src/mint/auth/migrations.rs
View File

@@ -1,9 +1,9 @@
/// @generated
/// Auto-generated by build.rs
pub static MIGRATIONS: &[(&str, &str, &str)] = &[
("postgres", "1_init.sql", include_str!(r#"./migrations/postgres/1_init.sql"#)),
("postgres", "20250822104351_rename_blind_message_y_to_b.sql", include_str!(r#"./migrations/postgres/20250822104351_rename_blind_message_y_to_b.sql"#)),
("sqlite", "1_fix_sqlx_migration.sql", include_str!(r#"./migrations/sqlite/1_fix_sqlx_migration.sql"#)),
("postgres", "1_init.sql", include_str!(r#"./migrations/postgres/1_init.sql"#)),
("sqlite", "20250109143347_init.sql", include_str!(r#"./migrations/sqlite/20250109143347_init.sql"#)),
("sqlite", "20250822104351_rename_blind_message_y_to_b.sql", include_str!(r#"./migrations/sqlite/20250822104351_rename_blind_message_y_to_b.sql"#)),
("postgres", "20250822104351_rename_blind_message_y_to_b.sql", include_str!(r#"./migrations/postgres/20250822104351_rename_blind_message_y_to_b.sql"#)),
];

4
crates/cdk-sql-common/src/mint/migrations.rs
View File

@@ -1,10 +1,9 @@
/// @generated
/// Auto-generated by build.rs
pub static MIGRATIONS: &[(&str, &str, &str)] = &[
("sqlite", "1_fix_sqlx_migration.sql", include_str!(r#"./migrations/sqlite/1_fix_sqlx_migration.sql"#)),
("postgres", "1_initial.sql", include_str!(r#"./migrations/postgres/1_initial.sql"#)),
("postgres", "2_remove_request_lookup_kind_constraints.sql", include_str!(r#"./migrations/postgres/2_remove_request_lookup_kind_constraints.sql"#)),
("postgres", "3_add_kv_store.sql", include_str!(r#"./migrations/postgres/3_add_kv_store.sql"#)),
("sqlite", "1_fix_sqlx_migration.sql", include_str!(r#"./migrations/sqlite/1_fix_sqlx_migration.sql"#)),
("sqlite", "20240612124932_init.sql", include_str!(r#"./migrations/sqlite/20240612124932_init.sql"#)),
("sqlite", "20240618195700_quote_state.sql", include_str!(r#"./migrations/sqlite/20240618195700_quote_state.sql"#)),
("sqlite", "20240626092101_nut04_state.sql", include_str!(r#"./migrations/sqlite/20240626092101_nut04_state.sql"#)),
@@ -29,4 +28,5 @@ pub static MIGRATIONS: &[(&str, &str, &str)] = &[
("sqlite", "20250812132015_drop_melt_request.sql", include_str!(r#"./migrations/sqlite/20250812132015_drop_melt_request.sql"#)),
("sqlite", "20250819200000_remove_request_lookup_kind_constraints.sql", include_str!(r#"./migrations/sqlite/20250819200000_remove_request_lookup_kind_constraints.sql"#)),
("sqlite", "20250901090000_add_kv_store.sql", include_str!(r#"./migrations/sqlite/20250901090000_add_kv_store.sql"#)),
("postgres", "20250901090000_add_kv_store.sql", include_str!(r#"./migrations/postgres/20250901090000_add_kv_store.sql"#)),
];

0
crates/cdk-sql-common/src/mint/migrations/postgres/3_add_kv_store.sql → crates/cdk-sql-common/src/mint/migrations/postgres/20250901090000_add_kv_store.sql
View File

4
crates/cdk-sql-common/src/wallet/migrations.rs
View File

@@ -1,9 +1,8 @@
/// @generated
/// Auto-generated by build.rs
pub static MIGRATIONS: &[(&str, &str, &str)] = &[
("postgres", "1_initial.sql", include_str!(r#"./migrations/postgres/1_initial.sql"#)),
("postgres", "20250831215438_melt_quote_method.sql", include_str!(r#"./migrations/postgres/20250831215438_melt_quote_method.sql"#)),
("sqlite", "1_fix_sqlx_migration.sql", include_str!(r#"./migrations/sqlite/1_fix_sqlx_migration.sql"#)),
("postgres", "1_initial.sql", include_str!(r#"./migrations/postgres/1_initial.sql"#)),
("sqlite", "20240612132920_init.sql", include_str!(r#"./migrations/sqlite/20240612132920_init.sql"#)),
("sqlite", "20240618200350_quote_state.sql", include_str!(r#"./migrations/sqlite/20240618200350_quote_state.sql"#)),
("sqlite", "20240626091921_nut04_state.sql", include_str!(r#"./migrations/sqlite/20240626091921_nut04_state.sql"#)),
@@ -24,4 +23,5 @@ pub static MIGRATIONS: &[(&str, &str, &str)] = &[
("sqlite", "20250729111701_keyset_v2_u32.sql", include_str!(r#"./migrations/sqlite/20250729111701_keyset_v2_u32.sql"#)),
("sqlite", "20250812084621_keyset_plus_one.sql", include_str!(r#"./migrations/sqlite/20250812084621_keyset_plus_one.sql"#)),
("sqlite", "20250831215438_melt_quote_method.sql", include_str!(r#"./migrations/sqlite/20250831215438_melt_quote_method.sql"#)),
("postgres", "20250831215438_melt_quote_method.sql", include_str!(r#"./migrations/postgres/20250831215438_melt_quote_method.sql"#)),
];