gate prepareMigrationFallback on shouldInsertData. Back out properties table delete.

Author: labkey-martyp

api/src/org/labkey/api/security/Encryption.java

@@ -570,7 +570,10 @@ static void registerHandler(EncryptionMigrationHandler handler)
      */
     public static void prepareMigrationFallback()
     {
-        if (!isEncryptionPassPhraseSpecified())
+        // Skip if no pass phrase is configured (nothing to fall back to) or we're not inserting data such
+        // as during database migration (checkMigration() is gated the same way, so the fallback would be unused).
+        // The latter avoids constructing an AES instance, which would lazily create a salt row in the property store.
+        if (!isEncryptionPassPhraseSpecified() || !ModuleLoader.getInstance().shouldInsertData())
             return;
 
         String oldPassPhrase = getOldEncryptionPassPhrase();

core/src/org/labkey/core/CoreMigrationSchemaHandler.java

@@ -104,11 +104,6 @@ public void beforeVerification()
     {
         super.beforeVerification();
 
-        // Clear prop.Properties and prop.PropertySets first: bootstrap (e.g., Encryption.checkMigration) can leave
-        // PropertySets rows whose ObjectId references the bootstrap containers, blocking the Containers delete below.
-        Table.delete(PropertySchema.getInstance().getTableInfoProperties());
-        Table.delete(PropertySchema.getInstance().getTableInfoPropertySets());
-
         // Delete root and shared containers that were needed for bootstrapping
         Table.delete(CoreSchema.getInstance().getTableInfoContainers());
         DbScope targetScope = DbScope.getLabKeyScope();