Anubis / Xlib

Commit 7b9687b1ab2717f5f5081e0e80c7d608941ac702

Authored by totoro
1 parent 9379fd4f

fix version comparison

Showing 2 changed files with 8 additions and 7 deletions   Show diff stats
Inline Side-by-side
database/db_version.anubis
  Show/Hide comments   View file @7b9687b
@@ -57,14 +57,14 @@ public define DB_Version_Compare_Result @@ -57,14 +57,14 @@ public define DB_Version_Compare_Result
57 DB_Version v_y 57 DB_Version v_y
58 ) = 58 ) =
59 if v_x.version.numeric +< v_y.version.numeric then 59 if v_x.version.numeric +< v_y.version.numeric then
60 - more  
61 - else if v_x.version.numeric = v_x.version.numeric then 60 + less
  61 + else if v_x.version.numeric = v_y.version.numeric then
62 if v_x.db_hash = v_y.db_hash then 62 if v_x.db_hash = v_y.db_hash then
63 equal 63 equal
64 else 64 else
65 equal_but_sign 65 equal_but_sign
66 else 66 else
67 - less 67 + more
68 . 68 .
69 69
70 public define Bool 70 public define Bool
database/migration_sqlite3.anubis
  Show/Hide comments   View file @7b9687b
@@ -233,23 +233,25 @@ define Maybe(One) @@ -233,23 +233,25 @@ define Maybe(One)
233 if compare_db_version(db_ver, migration_version) is 233 if compare_db_version(db_ver, migration_version) is
234 { 234 {
235 less then 235 less then
236 - logInfo(logger, "Migrating Database from version " + db_ver + " to version " + migration_version); 236 + logInfo(logger, "[less] Migrating Database from version " + db_ver + " to version " + migration_version);
237 if migrate_to(db, logger) is failure then 237 if migrate_to(db, logger) is failure then
238 failure 238 failure
239 else 239 else
  240 + update_db_version(migration_version);
240 do_migration_loop(db, logger, migration_version, t, update_db_version) 241 do_migration_loop(db, logger, migration_version, t, update_db_version)
241 242
242 more then 243 more then
243 - logInfo(logger, "No Database migration found from version " + db_ver + " to version " + migration_version); 244 + logInfo(logger, "[more] No Database migration found from version " + db_ver + " to version " + migration_version);
244 do_migration_loop(db, logger, db_ver, t, update_db_version) 245 do_migration_loop(db, logger, db_ver, t, update_db_version)
245 246
246 equal then 247 equal then
247 - logInfo(logger, "No Database migration found from version " + db_ver + " to version " + migration_version); 248 + logInfo(logger, "[equal] No Database migration found from version " + db_ver + " to version " + migration_version);
248 do_migration_loop(db, logger, db_ver, t, update_db_version) 249 do_migration_loop(db, logger, db_ver, t, update_db_version)
249 250
250 equal_but_sign then 251 equal_but_sign then
251 logInfo(logger, "Database migration found from version " + db_ver + " to version " + migration_version+ " by hash difference "); 252 logInfo(logger, "Database migration found from version " + db_ver + " to version " + migration_version+ " by hash difference ");
252 if do_table_indexes(db, logger, h, update_db_version) is success(_) then 253 if do_table_indexes(db, logger, h, update_db_version) is success(_) then
  254 + update_db_version(migration_version);
253 do_migration_loop(db, logger, migration_version, t, update_db_version) 255 do_migration_loop(db, logger, migration_version, t, update_db_version)
254 else 256 else
255 failure 257 failure
@@ -288,7 +290,6 @@ public define Maybe(One) @@ -288,7 +290,6 @@ public define Maybe(One)
288 ( 290 (
289 SQLite3DataBase db, 291 SQLite3DataBase db,
290 Logger logger, 292 Logger logger,
291 - //String current_version,  
292 List(Migration) all_migrations, 293 List(Migration) all_migrations,
293 )= 294 )=
294 if last(all_migrations) is 295 if last(all_migrations) is