kylefang/MagicalRecord
1
0
Fork 0
mirror of https://github.com/zhigang1992/MagicalRecord.git synced 2026-01-12 17:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor store recreation code

Browse Source
This commit is contained in:
Saul Mora
2013-02-04 20:39:59 -07:00
parent a9a8d4fd3d
commit 7a91540d04
1 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
MagicalRecord/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
View File

@@ -68,6 +68,37 @@ NSString * const kMagicalRecordPSCDidCompleteiCloudSetupNotification = @"kMagica
return [self MR_addSqliteStoreAtURL:url withOptions:options];
}
- (NSPersistentStore *) MR_reinitializeStoreAtURL:(NSURL *)url withOptions:(NSDictionary *__autoreleasing)options;
{
if (![MagicalRecord shouldDeleteStoreOnModelMismatch]) return nil;
NSError *error = nil;
NSPersistentStore *store = nil;
BOOL isMigrationError = [error code] == NSPersistentStoreIncompatibleVersionHashError || [error code] == NSMigrationMissingSourceModelError;
if ([[error domain] isEqualToString:NSCocoaErrorDomain] && isMigrationError)
{
// Could not open the database, so... kill it!
[[NSFileManager defaultManager] removeItemAtURL:url error:nil];
MRLog(@"Removed incompatible model version: %@", [url lastPathComponent]);
// Try one more time to create the store
store = [self addPersistentStoreWithType:NSSQLiteStoreType
configuration:nil
URL:url
options:options
error:&error];
if (store)
{
// If we successfully added a store, remove the error that was initially created
error = nil;
}
}
[MagicalRecord handleErrors:error];
return store;
}
- (NSPersistentStore *) MR_addSqliteStoreAtURL:(NSURL *)url withOptions:(NSDictionary *__autoreleasing)options;
{
[[self class] MR_createPathToStoreFileIfNeccessary:url];
@@ -78,30 +109,13 @@ NSString * const kMagicalRecordPSCDidCompleteiCloudSetupNotification = @"kMagica
options:options
error:&error];
if (!store && [MagicalRecord shouldDeleteStoreOnModelMismatch])
if (store == nil)
{
BOOL isMigrationError = [error code] == NSPersistentStoreIncompatibleVersionHashError || [error code] == NSMigrationMissingSourceModelError;
if ([[error domain] isEqualToString:NSCocoaErrorDomain] && isMigrationError)
{
// Could not open the database, so... kill it!
[[NSFileManager defaultManager] removeItemAtURL:url error:nil];
MRLog(@"Removed incompatible model version: %@", [url lastPathComponent]);
// Try one more time to create the store
store = [self addPersistentStoreWithType:NSSQLiteStoreType
configuration:nil
URL:url
options:options
error:&error];
if (store)
{
// If we successfully added a store, remove the error that was initially created
error = nil;
}
}
MRLog(@"Unable to setup store at URL: %@", url);
[MagicalRecord handleErrors:error];
store = [self MR_reinitializeStoreAtURL:url withOptions:options];
}
return store;
}