starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-20 16:44:08 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'prototype/Swift_3_2' into prototype/Swift_4_0

Browse Source
This commit is contained in:
John Rommel Estropia
2017-08-08 07:56:32 +09:00
parent ccf7c62aad 74c64619c3
commit a52acf2ebd
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Sources/XcodeDataModelSchema.swift
View File

@@ -145,7 +145,7 @@ public final class XcodeDataModelSchema: DynamicSchema {
public required init(modelName: ModelVersion, modelVersionFileURL: URL) { public required init(modelName: ModelVersion, modelVersionFileURL: URL) {
CoreStore.assert( CoreStore.assert(
NSManagedObjectModel(contentsOf: modelVersionFileURL) != nil, FileManager.default.fileExists(atPath: modelVersionFileURL.path),
"Could not find the \"\(modelName).mom\" version file for the model at URL \"\(modelVersionFileURL)\"." "Could not find the \"\(modelName).mom\" version file for the model at URL \"\(modelVersionFileURL)\"."
) )
@@ -164,12 +164,13 @@ public final class XcodeDataModelSchema: DynamicSchema {
return cachedRawModel return cachedRawModel
} }
if let rawModel = NSManagedObjectModel(contentsOf: self.modelVersionFileURL) { CoreStore.assert(
FileManager.default.fileExists(atPath: self.modelVersionFileURL.path),
self.cachedRawModel = rawModel "Could not find the \"\(self.modelVersion).mom\" version file for the model at URL \"\(self.modelVersionFileURL)\"."
return rawModel )
} let rawModel = NSManagedObjectModel(contentsOf: self.modelVersionFileURL)
CoreStore.abort("Could not create an \(cs_typeName(NSManagedObjectModel.self)) from the model at URL \"\(self.modelVersionFileURL)\".") self.cachedRawModel = rawModel
return rawModel
} }