Rename db file

Amplitude/AMPDatabaseHelper.h

@@ -10,8 +10,8 @@
 
 @property (nonatomic, strong, readonly) NSString *databasePath;
 
-+ (AMPDatabaseHelper*)getDatabaseHelper;
-+ (AMPDatabaseHelper*)getDatabaseHelper:(NSString*) instanceName;
++ (AMPDatabaseHelper*)getDatabaseHelper:(NSString*) instanceName apiKey:(NSString*) apiKey;
++ (AMPDatabaseHelper*)getDatabaseHelperWithInstanceName:(NSString*) instanceName; // for testing only
 - (BOOL)createTables;
 - (BOOL)dropTables;
 - (BOOL)upgrade:(int) oldVersion newVersion:(int) newVersion;

Amplitude/AMPDatabaseHelper.m

@@ -31,7 +31,6 @@ @interface AMPDatabaseHelper()
 
 @implementation AMPDatabaseHelper
 {
-    BOOL _databaseCreated;
     sqlite3 *_database;
     dispatch_queue_t _queue;
 }
@@ -70,12 +69,7 @@ @implementation AMPDatabaseHelper
 static NSString *const GET_VALUE = @"SELECT %@, %@ FROM %@ WHERE %@ = ?;";
 
 
-+ (AMPDatabaseHelper*)getDatabaseHelper
-{
-    return [AMPDatabaseHelper getDatabaseHelper:nil];
-}
-
-+ (AMPDatabaseHelper*)getDatabaseHelper:(NSString*) instanceName
++ (AMPDatabaseHelper*)getDatabaseHelper:(NSString*) instanceName apiKey:(NSString*) apiKey
 {
     static NSMutableDictionary *_instances = nil;
     static dispatch_once_t onceToken;
@@ -92,32 +86,39 @@ + (AMPDatabaseHelper*)getDatabaseHelper:(NSString*) instanceName
     @synchronized(_instances) {
         dbHelper = [_instances objectForKey:instanceName];
         if (dbHelper == nil) {
-            dbHelper = [[AMPDatabaseHelper alloc] initWithInstanceName:instanceName];
+            dbHelper = [[AMPDatabaseHelper alloc] initWithInstanceName:instanceName andApiKey:apiKey];
             [_instances setObject:dbHelper forKey:instanceName];
             SAFE_ARC_RELEASE(dbHelper);
         }
     }
     return dbHelper;
 }
 
-- (id)init
+// for testing only
++ (AMPDatabaseHelper*)getDatabaseHelperWithInstanceName:(NSString*) instanceName
 {
-    return [self initWithInstanceName:nil];
+    AMPDatabaseHelper *dbHelper = [[AMPDatabaseHelper alloc] initWithInstanceName:instanceName andApiKey:nil];
+    return SAFE_ARC_AUTORELEASE(dbHelper);
 }
 
-- (id)initWithInstanceName:(NSString*) instanceName
+// instanceName should not be null, getDatabaseHelper will guard
+// apiKey should only be null for testing - Amplitude client will guard
+- (id)initWithInstanceName:(NSString*) instanceName andApiKey:(NSString*) apiKey
 {
-    if ([AMPUtils isEmptyString:instanceName]) {
-        instanceName = kAMPDefaultInstance;
-    }
-    instanceName = [instanceName lowercaseString];
-
     if ((self = [super init])) {
         NSString *databaseDirectory = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) objectAtIndex: 0];
         NSString *databasePath = [databaseDirectory stringByAppendingPathComponent:@"com.amplitude.database"];
         if (![instanceName isEqualToString:kAMPDefaultInstance]) {
             databasePath = [NSString stringWithFormat:@"%@_%@", databasePath, instanceName];
         }
+
+        // migrate to new db filename
+        if (![AMPUtils isEmptyString:apiKey]) {
+            NSString *newDatabasePath = [NSString stringWithFormat:@"%@_%@", databasePath, apiKey];
+            [AMPUtils moveFileIfNotExists:databasePath to:newDatabasePath];
+            databasePath = newDatabasePath;
+        }
+
         _databasePath = SAFE_ARC_RETAIN(databasePath);
         _queue = dispatch_queue_create([QUEUE_NAME UTF8String], NULL);
         dispatch_queue_set_specific(_queue, kDispatchQueueKey, (__bridge void *)self, NULL);

Amplitude/AMPUtils.h

@@ -12,5 +12,6 @@
 + (id) makeJSONSerializable:(id) obj;
 + (BOOL) isEmptyString:(NSString*) str;
 + (NSDictionary*) validateGroups:(NSDictionary*) obj;
++ (BOOL)moveFileIfNotExists:(NSString*)from to:(NSString*)to;
 
 @end

Amplitude/AMPUtils.m

@@ -141,4 +141,21 @@ + (NSDictionary *) validateGroups:(NSDictionary *) obj
     return [NSDictionary dictionaryWithDictionary:dict];
 }
 
++ (BOOL)moveFileIfNotExists:(NSString*)from to:(NSString*)to
+{
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSError *error;
+    if (![fileManager fileExistsAtPath:to] &&
+        [fileManager fileExistsAtPath:from]) {
+        if ([fileManager copyItemAtPath:from toPath:to error:&error]) {
+            AMPLITUDE_LOG(@"INFO: copied %@ to %@", from, to);
+            [fileManager removeItemAtPath:from error:NULL];
+        } else {
+            AMPLITUDE_LOG(@"WARN: Copy from %@ to %@ failed: %@", from, to, error);
+            return NO;
+        }
+    }
+    return YES;
+}
+
 @end