# # # patch "migrate_schema.cc" # from [7076acb1d4039529737cd752b58e47a19d2c2964] # to [84098e7b4f805e8f3e8232cd6829e625c6af024c] # ============================================================ --- migrate_schema.cc 7076acb1d4039529737cd752b58e47a19d2c2964 +++ migrate_schema.cc 84098e7b4f805e8f3e8232cd6829e625c6af024c @@ -1214,16 +1214,6 @@ migrate_sql_schema(sqlite3 * db, key_sto m = find_migration(db); cat = classify_schema(db, m); - // if we should regenerate more than just one specific cache, - // we regenerate them all - if (m->regen_type != regen_none) - { - if (regen_type == regen_none) - regen_type = m->regen_type; - else - regen_type = regen_all; - } - diagnose_unrecognized_schema(cat, filename); // We really want 'db migrate' on an up-to-date schema to be a no-op @@ -1267,6 +1257,16 @@ migrate_sql_schema(sqlite3 * db, key_sto regime = std::min(regime, m->regime); + // if we should regenerate more than just one specific cache, + // we regenerate them all + if (m->regen_type != regen_none) + { + if (regen_type == regen_none) + regen_type = m->regen_type; + else + regen_type = regen_all; + } + m++; I(m < migration_events + n_migration_events); P(F("migrated to schema %s") % m->id);