starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-01-19 15:37:10 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'prototype/Swift_4_0' into prototype/queryBuilders

Browse Source
This commit is contained in:
John Rommel Estropia
2017-08-26 14:29:16 +09:00
parent a33e248828 da170c7e51
commit 005729be85
1 changed files with 7 additions and 8 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) {
CoreStore.assert(
FileManager.default.fileExists(atPath: modelVersionFileURL.path),
NSManagedObjectModel(contentsOf: modelVersionFileURL) != nil,
"Could not find the \"\(modelName).mom\" version file for the model at URL \"\(modelVersionFileURL)\"."
)
@@ -164,13 +164,12 @@ public final class XcodeDataModelSchema: DynamicSchema {
return cachedRawModel
}
CoreStore.assert(
FileManager.default.fileExists(atPath: self.modelVersionFileURL.path),
"Could not find the \"\(self.modelVersion).mom\" version file for the model at URL \"\(self.modelVersionFileURL)\"."
)
let rawModel = NSManagedObjectModel(contentsOf: self.modelVersionFileURL)
self.cachedRawModel = rawModel
return rawModel
if let rawModel = NSManagedObjectModel(contentsOf: self.modelVersionFileURL) {
self.cachedRawModel = rawModel
return rawModel
}
CoreStore.abort("Could not create an \(cs_typeName(NSManagedObjectModel.self)) from the model at URL \"\(self.modelVersionFileURL)\".")
}