starred/CoreStore-JohnEstropia
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-04-24 09:38:30 +02: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-08 08:02:17 +09:00
parent 4a5bc6450b f7aaf4fb2a
commit 81a72f29ea
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Sources/CoreStore+CustomDebugStringConvertible.swift
View File

@@ -1093,15 +1093,6 @@ fileprivate extension String {
return String(repeating: " ", count: level * 4) return String(repeating: " ", count: level * 4)
} }
fileprivate func trimSwiftModuleName() -> String {
if self.hasPrefix("Swift.") {
return self.substring(from: "Swift.".endIndex)
}
return self
}
fileprivate mutating func indent(_ level: Int) { fileprivate mutating func indent(_ level: Int) {
self = self.replacingOccurrences(of: "\n", with: "\n\(String.indention(level))") self = self.replacingOccurrences(of: "\n", with: "\n\(String.indention(level))")

2
Sources/CoreStoreSchema.swift
View File

@@ -538,7 +538,7 @@ public final class CoreStoreSchema: DynamicSchema {
} }
else { else {
let newMethod = class_getClassMethod(managedObjectClass, newSelector) let newMethod = class_getClassMethod(managedObjectClass, newSelector)!
method_exchangeImplementations(origMethod, newMethod) method_exchangeImplementations(origMethod, newMethod)
} }
} }

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
} }