From 6923cbdd8dc26762fe2e9e3c772821531acafa5b Mon Sep 17 00:00:00 2001 From: totoro Date: Wed, 1 Apr 2020 12:04:14 +0900 Subject: [PATCH] back to previous behavior concerning database migration. update_db_version with only DB_Version parameter --- database/migration_sqlite3.anubis | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/database/migration_sqlite3.anubis b/database/migration_sqlite3.anubis index df12b31..339d15f 100644 --- a/database/migration_sqlite3.anubis +++ b/database/migration_sqlite3.anubis @@ -210,16 +210,16 @@ public define Maybe(One) define Maybe(One) do_table_indexes ( - SQLite3DataBase db, - (LogLevel, String) -> One logger, - Migration _migration, - (SQLite3DataBase , DB_Version) -> One update_db_version + SQLite3DataBase db, + (LogLevel, String) -> One logger, + Migration _migration, + (DB_Version) -> One update_db_version )= since _migration is migration(mig_version, _, create_tables, create_indexes), if create_tables(db, logger) is success(_) then if create_indexes(db, logger) is success(_) then - update_db_version(db, mig_version); + update_db_version(mig_version); success(unique) else failure @@ -235,7 +235,7 @@ define Maybe(One) // String current_version, //current version of app DB_Version db_ver, //version found in db settings List(Migration) migrations, - (SQLite3DataBase , DB_Version) -> One update_db_version + (DB_Version) -> One update_db_version ) = if migrations is { @@ -250,7 +250,7 @@ define Maybe(One) if migrate_to(db, logger) is failure then failure else - update_db_version(db, migration_version); + update_db_version(migration_version); do_migration_loop(db, logger, migration_version, t, update_db_version) more then @@ -266,7 +266,7 @@ define Maybe(One) if migrate_to(db, logger) is failure then failure else - update_db_version(db, migration_version); + update_db_version(migration_version); do_migration_loop(db, logger, migration_version, t, update_db_version) } }. @@ -277,7 +277,7 @@ public define Maybe(One) SQLite3DataBase db, (LogLevel, String) -> One logger, DB_Version current_db_version, - (SQLite3DataBase , DB_Version) -> One update_db_version, + (DB_Version) -> One update_db_version, List(Migration) all_migrations, )= if is_empty_database(db) then // new empty database -- libgit2 0.21.4