mirror of
https://github.com/JohnEstropia/CoreStore.git
synced 2026-03-26 03:11:30 +01:00
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:
@@ -97,7 +97,7 @@ public final class CSFrom: NSObject {
|
||||
self.init(From(entityClass, nil))
|
||||
|
||||
default:
|
||||
CoreStore.abort("The configuration argument only accepts NSString and NSNull values")
|
||||
Internals.abort("The configuration argument only accepts NSString and NSNull values")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ public final class CSFrom: NSObject {
|
||||
arguments.append(nil)
|
||||
|
||||
default:
|
||||
CoreStore.abort("The configurations argument only accepts NSString and NSNull values")
|
||||
Internals.abort("The configurations argument only accepts NSString and NSNull values")
|
||||
}
|
||||
}
|
||||
self.init(From(entityClass, arguments))
|
||||
|
||||
Reference in New Issue
Block a user