Skip to content

Commit 1fcf31b

Browse files
authored
Merge branch 'main' into diretnan/run-outside-migration
2 parents acee735 + 057ef74 commit 1fcf31b

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

examples/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ enums = ["refinery/enums"]
1313

1414
[dependencies]
1515
refinery = { path = "../refinery", features = ["rusqlite"] }
16-
rusqlite = "0.35"
16+
rusqlite = "0.37"
1717
barrel = { version = "0.7", features = ["sqlite3"] }
1818
log = "0.4"
1919
env_logger = "0.11"

refinery_core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ url = "2.0"
2929
walkdir = "2.3.1"
3030

3131
# allow multiple versions of the same dependency if API is similar
32-
rusqlite = { version = ">= 0.23, <= 0.35", optional = true }
32+
rusqlite = { version = ">= 0.23, <= 0.37", optional = true }
3333
postgres = { version = ">=0.17, <= 0.19", optional = true }
3434
tokio-postgres = { version = ">= 0.5, <= 0.7", optional = true }
3535
mysql = { version = ">= 21.0.0, <= 26", optional = true, default-features = false, features = ["minimal"] }

refinery_core/src/traits/async.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,13 @@ async fn migrate_grouped<T: AsyncExecutor>(
102102
log::info!("not going to apply any migration as fake flag is enabled");
103103
}
104104
Target::Latest | Target::Version(_) => {
105+
let migrations_display = applied_migrations
106+
.iter()
107+
.map(ToString::to_string)
108+
.collect::<Vec<String>>()
109+
.join("\n");
105110
log::info!(
106-
"going to apply batch migrations in single transaction: {:#?}",
107-
applied_migrations.iter().map(ToString::to_string)
111+
"going to apply batch migrations in single transaction:\n{migrations_display}"
108112
);
109113
}
110114
};

refinery_core/src/traits/sync.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ fn migrate_grouped<T: Executor>(
6060
}
6161
Target::Latest | Target::Version(_) => {
6262
log::info!(
63-
"going to apply batch migrations in single transaction: {:#?}",
64-
applied_migrations.iter().map(ToString::to_string)
63+
"going to batch apply {} migrations in single transaction.",
64+
applied_migrations.len()
6565
);
6666
}
6767
};

0 commit comments

Comments
 (0)