From 7b9687b1ab2717f5f5081e0e80c7d608941ac702 Mon Sep 17 00:00:00 2001 From: totoro Date: Sun, 23 Jul 2017 23:05:08 +0200 Subject: [PATCH] fix version comparison --- database/db_version.anubis | 6 +++--- database/migration_sqlite3.anubis | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/database/db_version.anubis b/database/db_version.anubis index e784f4c..f399a87 100644 --- a/database/db_version.anubis +++ b/database/db_version.anubis @@ -57,14 +57,14 @@ public define DB_Version_Compare_Result DB_Version v_y ) = if v_x.version.numeric +< v_y.version.numeric then - more - else if v_x.version.numeric = v_x.version.numeric then + less + else if v_x.version.numeric = v_y.version.numeric then if v_x.db_hash = v_y.db_hash then equal else equal_but_sign else - less + more . public define Bool diff --git a/database/migration_sqlite3.anubis b/database/migration_sqlite3.anubis index 1fd14cb..de29a8b 100644 --- a/database/migration_sqlite3.anubis +++ b/database/migration_sqlite3.anubis @@ -233,23 +233,25 @@ define Maybe(One) if compare_db_version(db_ver, migration_version) is { less then - logInfo(logger, "Migrating Database from version " + db_ver + " to version " + migration_version); + logInfo(logger, "[less] Migrating Database from version " + db_ver + " to version " + migration_version); if migrate_to(db, logger) is failure then failure else + update_db_version(migration_version); do_migration_loop(db, logger, migration_version, t, update_db_version) more then - logInfo(logger, "No Database migration found from version " + db_ver + " to version " + migration_version); + logInfo(logger, "[more] No Database migration found from version " + db_ver + " to version " + migration_version); do_migration_loop(db, logger, db_ver, t, update_db_version) equal then - logInfo(logger, "No Database migration found from version " + db_ver + " to version " + migration_version); + logInfo(logger, "[equal] No Database migration found from version " + db_ver + " to version " + migration_version); do_migration_loop(db, logger, db_ver, t, update_db_version) equal_but_sign then logInfo(logger, "Database migration found from version " + db_ver + " to version " + migration_version+ " by hash difference "); if do_table_indexes(db, logger, h, update_db_version) is success(_) then + update_db_version(migration_version); do_migration_loop(db, logger, migration_version, t, update_db_version) else failure @@ -288,7 +290,6 @@ public define Maybe(One) ( SQLite3DataBase db, Logger logger, - //String current_version, List(Migration) all_migrations, )= if last(all_migrations) is -- libgit2 0.21.4