[TIMOB-6756] Ensure proper paths for database migration

tidev · Dec 19, 2011 · d3b4341 · d3b4341
1 parent a4ca4b8
commit d3b4341
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/iphone/Classes/TiDatabaseProxy.m b/iphone/Classes/TiDatabaseProxy.m
@@ -72,13 +72,13 @@ -(NSString*)dbDir
 
     // Migrate any old data if available
     NSString* oldRoot = [NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) objectAtIndex:0];
-    NSString* oldPath = [oldRoot stringByAppendingString:@"database"];
+    NSString* oldPath = [oldRoot stringByAppendingPathComponent:@"database"];
     BOOL oldCopyExists = [fm fileExistsAtPath:oldPath isDirectory:&isDirectory];
     if (oldCopyExists && isDirectory) {
         NSDirectoryEnumerator* contents = [fm enumeratorAtPath:oldPath];
-
+        //This gives relative paths. So create full path before moving
         for (NSString* oldFile in contents) {
-            [fm moveItemAtPath:oldFile toPath:[dbPath stringByAppendingPathComponent:[oldFile lastPathComponent]] error:nil];
+            [fm moveItemAtPath:[oldPath stringByAppendingPathComponent:oldFile] toPath:[dbPath stringByAppendingPathComponent:oldFile] error:nil];
         }
 
         // Remove the old copy after migrating everything