Merge branch 'develop' into datasources

# Conflicts:
#	CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
#	CoreStoreTests/DynamicModelTests.swift
#	Sources/BaseDataTransaction+Importing.swift
#	Sources/CoreStoreObject.swift
#	Sources/CustomSchemaMappingProvider.swift
#	Sources/DynamicObject.swift
#	Sources/Functions.swift
#	Sources/ImportableUniqueObject.swift
#	Sources/NSManagedObjectContext+Querying.swift
This commit is contained in:
John Estropia
2019-08-29 17:15:45 +09:00
97 changed files with 2224 additions and 1721 deletions

View File

@@ -125,7 +125,7 @@ extension ImportableUniqueObject where UniqueIDType.QueryableNativeType: CoreDat
get {
return self.cs_toRaw().getValue(
forKvcKey: Self.uniqueIDKeyPath,
forKvcKey: self.runtimeType().uniqueIDKeyPath,
didGetValue: { UniqueIDType.cs_fromQueryableNativeType($0 as! UniqueIDType.QueryableNativeType)! }
)
}
@@ -134,7 +134,7 @@ extension ImportableUniqueObject where UniqueIDType.QueryableNativeType: CoreDat
self.cs_toRaw()
.setValue(
newValue,
forKvcKey: Self.uniqueIDKeyPath,
forKvcKey: self.runtimeType().uniqueIDKeyPath,
willSetValue: { ($0.cs_toQueryableNativeType() as CoreDataNativeType) }
)
}