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

swift 2.2 (Xcode 7.3 beta 4) updates

Browse Source
This commit is contained in:
John Estropia
2016-02-24 16:54:39 +09:00
parent 6e88b14237
commit 7bddcaa4a2
7 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CoreStore/Internal/NSManagedObjectModel+Setup.swift
View File

@@ -155,11 +155,12 @@ internal extension NSManagedObjectModel {
@nonobjc internal func entityTypesMapping() -> [String: NSManagedObject.Type] {
return self.entityNameMapping.reduce([:]) { (var mapping, pair) in
var mapping = [String: NSManagedObject.Type]()
self.entityNameMapping.forEach { (className, entityName) in
mapping[pair.1] = (NSClassFromString(pair.0)! as! NSManagedObject.Type)
return mapping
mapping[entityName] = (NSClassFromString(className)! as! NSManagedObject.Type)
}
return mapping
}
@nonobjc internal func mergedModels() -> [NSManagedObjectModel] {
@@ -249,15 +250,16 @@ internal extension NSManagedObjectModel {
return mapping as! [String: String]
}
let mapping = self.entities.reduce([String: String]()) {
(var mapping, entityDescription) -> [String: String] in
var mapping = [String: String]()
self.entities.forEach {
if let entityName = entityDescription.name {
guard let entityName = $0.name else {
let className = entityDescription.managedObjectClassName
mapping[className] = entityName
return
}
return mapping
let className = $0.managedObjectClassName
mapping[className] = entityName
}
setAssociatedCopiedObject(
mapping as NSDictionary,