Garmelon/vault
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass size of migration array to migration

Browse source
This commit is contained in:
Joscha 2022-12-11 21:34:16 +01:00
parent b1448d21a9
commit cdc20941fb
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/tokio.rs
View file

@ -48,8 +48,9 @@ pub type Result<R> = result::Result<R, Error>;
/// A single database migration. /// A single database migration.
/// ///
/// It receives a [`Transaction`] to perform database operations in, and its /// It receives a [`Transaction`] to perform database operations in, its index
/// index in the migration array. The latter might be useful for logging. /// in the migration array and the size of the migration array. The latter two
/// might be useful for logging.
/// ///
/// The transaction spans all migrations currently being performed. If any /// The transaction spans all migrations currently being performed. If any
/// single migration fails, all migrations are rolled back and the database is /// single migration fails, all migrations are rolled back and the database is
@ -57,7 +58,7 @@ pub type Result<R> = result::Result<R, Error>;
/// ///
/// The migration does not need to update the `user_version` or commit the /// The migration does not need to update the `user_version` or commit the
/// transaction. /// transaction.
pub type Migration = fn(&mut Transaction<'_>, usize) -> rusqlite::Result<()>; pub type Migration = fn(&mut Transaction<'_>, usize, usize) -> rusqlite::Result<()>;
fn migrate(conn: &mut Connection, migrations: &[Migration]) -> rusqlite::Result<()> { fn migrate(conn: &mut Connection, migrations: &[Migration]) -> rusqlite::Result<()> {
let mut tx = conn.transaction()?; let mut tx = conn.transaction()?;
@ -68,7 +69,7 @@ fn migrate(conn: &mut Connection, migrations: &[Migration]) -> rusqlite::Result<
let total = migrations.len(); let total = migrations.len();
assert!(user_version <= total, "malformed database schema"); assert!(user_version <= total, "malformed database schema");
for (i, migration) in migrations.iter().enumerate().skip(user_version) { for (i, migration) in migrations.iter().enumerate().skip(user_version) {
migration(&mut tx, i)?; migration(&mut tx, i, total)?;
} }
tx.pragma_update(None, "user_version", total)?; tx.pragma_update(None, "user_version", total)?;