Clean up ahead of PR.

SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m

@@ -188,7 +188,7 @@ static NSString *const OWSDisappearingMessageFinderExpiresAtIndex = @"index_mess
     return [[YapDatabaseSecondaryIndex alloc]
         initWithSetup:setup
               handler:handler
-           versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:@"1"]];
+           versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:nil]];
 }
 
 #ifdef DEBUG

SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m

@@ -117,7 +117,7 @@ static NSString *const OWSFailedAttachmentDownloadsJobAttachmentStateIndex = @"i
     return [[YapDatabaseSecondaryIndex alloc]
         initWithSetup:setup
               handler:handler
-           versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:@"1"]];
+           versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:nil]];
 }
 
 #ifdef DEBUG

SignalServiceKit/src/Messages/OWSFailedMessagesJob.m

@@ -127,7 +127,7 @@ static NSString *const OWSFailedMessagesJobMessageStateIndex = @"index_outoing_m
     return [[YapDatabaseSecondaryIndex alloc]
         initWithSetup:setup
               handler:handler
-           versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:@"1"]];
+           versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:nil]];
 }
 
 #ifdef DEBUG

SignalServiceKit/src/Storage/OWSIncomingMessageFinder.m

@@ -92,7 +92,7 @@ NSString *const OWSIncomingMessageFinderColumnSourceDeviceId = @"OWSIncomingMess
     return [[YapDatabaseSecondaryIndex alloc]
         initWithSetup:setup
               handler:handler
-           versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:@"1"]];
+           versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:nil]];
 }
 
 + (NSString *)databaseExtensionName

SignalServiceKit/src/Storage/OWSStorage.h

@@ -67,7 +67,7 @@ typedef void (^OWSStorageMigrationBlock)(void);
 #pragma mark - Extension Registration
 
 + (void)incrementDatabaseExtensionVersionSuffix;
-+ (NSString *)appendSuffixToDatabaseExtensionVersionIfNecessary:(NSString *)versionTag;
++ (nullable NSString *)appendSuffixToDatabaseExtensionVersionIfNecessary:(nullable NSString *)versionTag;
 
 - (BOOL)registerExtension:(YapDatabaseExtension *)extension withName:(NSString *)extensionName;
 

SignalServiceKit/src/Storage/OWSStorage.m

@@ -490,12 +490,15 @@ NSString *const kNSUserDefaults_DatabaseExtensionVersionSuffix = @"kNSUserDefaul
     return [NSString stringWithFormat:@".%@", suffix];
 }
 
-+ (NSString *)appendSuffixToDatabaseExtensionVersionIfNecessary:(NSString *)versionTag
++ (nullable NSString *)appendSuffixToDatabaseExtensionVersionIfNecessary:(nullable NSString *)versionTag
 {
     OWSAssertIsOnMainThread();
 
     NSString *_Nullable suffix = [self databaseExtensionVersionSuffix];
     if (suffix) {
+        if (!versionTag) {
+            versionTag = @"0";
+        }
         NSString *result = [versionTag stringByAppendingString:suffix];
         DDLogWarn(@"%@ database extension version: %@ + %@ -> %@", self.logTag, versionTag, suffix, result);
         return result;

SignalServiceKit/src/Storage/TSDatabaseSecondaryIndexes.m

@@ -29,7 +29,7 @@
     YapDatabaseSecondaryIndex *secondaryIndex = [[YapDatabaseSecondaryIndex alloc]
         initWithSetup:setup
               handler:handler
-           versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:@"1"]];
+           versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:nil]];
 
     return secondaryIndex;
 }