fix unit test warnings

Resolve source entity and managed object attributes by name

.gitignore

@@ -7,3 +7,4 @@ CoreStore.xcworkspace/xcuserdata
 .DS_Store
 DerivedData
 *.orig
+build

.jazzy.yaml

@@ -0,0 +1,15 @@
+author: John Estropia
+author_url: https://github.com/JohnEstropia
+github_url: https://github.com/JohnEstropia/CoreStore
+module: CoreStore
+readme: README.md
+include: Sources/*
+output: docs
+theme: fullwidth
+clean: true
+skip_undocumented: true
+xcodebuild_arguments:
+- -sdk
+- iphonesimulator
+- -scheme
+- CoreStore iOS

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode10
 sudo: false
 git:
   submodules: false
@@ -10,17 +10,17 @@ env:
   - LC_CTYPE=en_US.UTF-8
   - LANG=en_US.UTF-8
   matrix:
-    - DESTINATION="OS=11.0,name=iPhone 8"          SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.3,name=iPhone 7"          SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.1,name=iPhone 7"          SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.0,name=iPhone 6 Plus"      SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="arch=x86_64"                    SCHEME="CoreStore OSX"     SDK=macosx10.13          RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=4.0,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator4.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=3.2,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator4.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator4.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=11.0,name=Apple TV 1080p"    SCHEME="CoreStore tvOS"    SDK=appletvsimulator11.0 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.2,name=Apple TV 1080p"    SCHEME="CoreStore tvOS"    SDK=appletvsimulator11.0 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.2,name=Apple TV 1080p"     SCHEME="CoreStore tvOS"    SDK=appletvsimulator11.0 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="arch=x86_64"                         SCHEME="CoreStore OSX"     SDK=macosx10.14          RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=12.0,name=iPhone XS"              SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=11.0.1,name=iPhone 8"             SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=10.3.1,name=iPhone 7"             SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=10.1,name=iPhone 7"               SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=4.0,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator5.0    RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=3.2,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator5.0    RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=2.2,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator5.0    RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=12.0,name=Apple TV 4K"            SCHEME="CoreStore tvOS"    SDK=appletvsimulator12.0 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=11.0,name=Apple TV 4K (at 1080p)" SCHEME="CoreStore tvOS"    SDK=appletvsimulator12.0 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=10.2,name=Apple TV 1080p"         SCHEME="CoreStore tvOS"    SDK=appletvsimulator12.0 RUN_TESTS="YES" POD_LINT="NO"
 before_install:
   - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
   - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
@@ -39,8 +39,8 @@ script:
       xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
       xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
     fi
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator11.0" -destination "OS=11.0,name=iPhone 8" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator11.0" -destination "OS=11.0,name=iPhone 8" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator12.0" -destination "OS=11.0.1,name=iPhone 8" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator12.0" -destination "OS=11.0.1,name=iPhone 8" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
   - if [ $POD_LINT == "YES" ]; then
       pod lib lint --quick;
     fi

CoreStore.podspec

@@ -1,17 +1,18 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "5.2.0"
-    s.swift_version = "4.1"
+    s.version = "5.4.0"
+    s.swift_version = "4.2"
     s.license = "MIT"
-    s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift"
     s.homepage = "https://github.com/JohnEstropia/CoreStore"
+    s.documentation_url = "https://JohnEstropia.github.io/CoreStore"
+    s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift"
     s.author = { "John Rommel Estropia" => "rommel.estropia@gmail.com" }
     s.source = { :git => "https://github.com/JohnEstropia/CoreStore.git", :tag => s.version.to_s }
 
-    s.ios.deployment_target = "9.0"
-    s.osx.deployment_target = "10.11"
-    s.watchos.deployment_target = "2.0"
-    s.tvos.deployment_target = "9.0"
+    s.ios.deployment_target = "10.0"
+    s.osx.deployment_target = "10.12"
+    s.watchos.deployment_target = "3.0"
+    s.tvos.deployment_target = "10.0"
 
     s.source_files = "Sources", "Sources/**/*.{swift,h,m}"
     s.public_header_files = "Sources/**/*.h"

CoreStore.xcodeproj/project.pbxproj

@@ -659,6 +659,10 @@
 		B5E84F371AFF85470064E85B /* NSManagedObjectContext+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */; };
 		B5E84F391AFF85470064E85B /* NSManagedObjectContext+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */; };
 		B5E84F411AFF8CCD0064E85B /* TypeErasedClauses.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F401AFF8CCD0064E85B /* TypeErasedClauses.swift */; };
+		B5E8A72021C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */; };
+		B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */; };
+		B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */; };
+		B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */; };
 		B5ECDBDF1CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBDE1CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift */; };
 		B5ECDBE11CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBDE1CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift */; };
 		B5ECDBE21CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBDE1CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift */; };
@@ -783,6 +787,7 @@
 		B5220E071D0C5F8D009BC71E /* ObjectObserverTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectObserverTests.swift; sourceTree = "<group>"; };
 		B5220E0B1D0D0D19009BC71E /* ImportTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportTests.swift; sourceTree = "<group>"; };
 		B5220E0F1D0DA6AB009BC71E /* ListObserverTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListObserverTests.swift; sourceTree = "<group>"; };
+		B524E78721CA20AC00BEB794 /* .jazzy.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .jazzy.yaml; sourceTree = SOURCE_ROOT; };
 		B525576B1CFAF18F00E51965 /* IntoTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntoTests.swift; sourceTree = "<group>"; };
 		B525576F1D02561A00E51965 /* SelectTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectTests.swift; sourceTree = "<group>"; };
 		B52557731D02791400E51965 /* WhereTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WhereTests.swift; sourceTree = "<group>"; };
@@ -950,6 +955,8 @@
 		B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Transaction.swift"; sourceTree = "<group>"; };
 		B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Querying.swift"; sourceTree = "<group>"; };
 		B5E84F401AFF8CCD0064E85B /* TypeErasedClauses.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeErasedClauses.swift; sourceTree = "<group>"; };
+		B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CoreStoreObject+Observing.swift"; sourceTree = "<group>"; };
+		B5E8A72621C3B85000EF006A /* Playground.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Playground.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		B5ECDBDE1CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CSBaseDataTransaction+Querying.swift"; sourceTree = "<group>"; };
 		B5ECDBE41CA6BEA300C7F112 /* CSClauseTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSClauseTypes.swift; sourceTree = "<group>"; };
 		B5ECDBEB1CA6BF2000C7F112 /* CSFrom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSFrom.swift; sourceTree = "<group>"; };
@@ -1040,6 +1047,7 @@
 		2F03A52619C5C6DA005002A5 = {
 			isa = PBXGroup;
 			children = (
+				B5E8A72621C3B85000EF006A /* Playground.playground */,
 				2F291E3119C6D4D3007AF63F /* Frameworks */,
 				2F03A53219C5C6DA005002A5 /* Sources */,
 				2F03A53C19C5C6DA005002A5 /* CoreStoreTests */,
@@ -1082,6 +1090,7 @@
 				B5BDC91A1C202269008147CD /* Cartfile */,
 				B5D2D5A91F7558CB00A4DE67 /* .cocoapods.yml */,
 				B5BDC9271C2024F2008147CD /* .travis.yml */,
+				B524E78721CA20AC00BEB794 /* .jazzy.yaml */,
 				B5AD60CD1C90141E00F2B2E8 /* Package.swift */,
 			);
 			name = "Supporting Files";
@@ -1493,6 +1502,7 @@
 				B56007131B3F6C2800A9A8F9 /* SectionBy.swift */,
 				B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */,
 				B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */,
+				B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */,
 				B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */,
 				B5E84F1C1AFF84860064E85B /* ObjectMonitor.swift */,
 				B5E84F1F1AFF84860064E85B /* ObjectObserver.swift */,
@@ -2008,6 +2018,7 @@
 				B5A991EC1E9DC2CE0091A2E3 /* VersionLock.swift in Sources */,
 				B5FE4DA71C84FB4400FA6A91 /* InMemoryStore.swift in Sources */,
 				B52F743D1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
+				B5E8A72021C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B56923FF1EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CAE1FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B5ECDBEC1CA6BF2000C7F112 /* CSFrom.swift in Sources */,
@@ -2204,6 +2215,7 @@
 				B5A991ED1E9DC2CE0091A2E3 /* VersionLock.swift in Sources */,
 				B5ECDBEE1CA6BF2000C7F112 /* CSFrom.swift in Sources */,
 				B52F743E1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
+				B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B56924001EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CAF1FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				82BA18D61C4BBD7100A0916E /* NSManagedObjectContext+Transaction.swift in Sources */,
@@ -2400,6 +2412,7 @@
 				B5A991EF1E9DC2CE0091A2E3 /* VersionLock.swift in Sources */,
 				B5220E201D130813009BC71E /* CSObjectMonitor.swift in Sources */,
 				B52F74401E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
+				B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B56924021EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CB11FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B5220E171D1306DF009BC71E /* UnsafeDataTransaction+Observing.swift in Sources */,
@@ -2596,6 +2609,7 @@
 				B5A991EE1E9DC2CE0091A2E3 /* VersionLock.swift in Sources */,
 				B5ECDBEF1CA6BF2000C7F112 /* CSFrom.swift in Sources */,
 				B52F743F1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
+				B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B56924011EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CB01FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */,
@@ -2685,8 +2699,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_SWIFT_FLAGS = "-D DEBUG";
@@ -2695,12 +2709,12 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
@@ -2749,21 +2763,21 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore;
 				PRODUCT_NAME = CoreStore;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};
@@ -2777,13 +2791,12 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -2797,13 +2810,12 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -2824,7 +2836,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -2840,7 +2852,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -2861,7 +2873,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Debug;
@@ -2883,7 +2895,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Release;
@@ -2902,7 +2914,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Debug;
@@ -2921,7 +2933,7 @@
 				SDKROOT = appletvos;
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Release;
@@ -2942,12 +2954,11 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -2968,12 +2979,11 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -2994,7 +3004,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -3015,7 +3025,7 @@
 				SDKROOT = macosx;
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -3037,7 +3047,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
 			};
 			name = Debug;
@@ -3061,7 +3071,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
 			};
 			name = Release;

CoreStore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

CoreStore.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj

@@ -410,7 +410,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -460,7 +460,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
@@ -474,7 +474,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -488,7 +487,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";

CoreStoreDemo/CoreStoreDemo/AppDelegate.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/02.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -20,7 +20,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]? = nil) -> Bool {
         
-        application.statusBarStyle = .lightContent
         return true
     }
 }

CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib

@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10112" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10083"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -12,10 +14,10 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright © 2015 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21"/>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright © 2018 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="439" width="440" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="textColor" red="0.90744441747665405" green="0.9265514612197876" blue="0.93116652965545654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="CoreStoreIcon" translatesAutoresizingMaskIntoConstraints="NO" id="q8C-V6-gXH">
@@ -24,11 +26,11 @@
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CoreStore" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
                     <rect key="frame" x="20" y="273" width="440" height="57.5"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="50"/>
-                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="textColor" red="0.90744441747665405" green="0.9265514612197876" blue="0.93116652965545654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
-            <color key="backgroundColor" red="0.20392156862745098" green="0.28627450980392155" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color key="backgroundColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
                 <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>

CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard

@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Ni8-QF-XHB">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Ni8-QF-XHB">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -78,14 +75,14 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8b8-lM-Krq">
-                                            <rect key="frame" x="15" y="13" width="28.5" height="19"/>
+                                            <rect key="frame" x="16" y="13" width="28.5" height="19"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="16"/>
                                             <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hR1-Zb-BOk">
-                                            <rect key="frame" x="308" y="13" width="52" height="19"/>
+                                            <rect key="frame" x="307" y="13" width="52" height="19"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="16"/>
                                             <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -136,7 +133,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OQf-Bd-Zze">
-                                                    <rect key="frame" x="295" y="8" width="72" height="27.5"/>
+                                                    <rect key="frame" x="288" y="11" width="72" height="22"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                                     <inset key="contentEdgeInsets" minX="7" minY="0.0" maxX="7" maxY="0.0"/>
                                                     <state key="normal" title="mutate!"/>
@@ -145,7 +142,7 @@
                                                     </connections>
                                                 </button>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VZk-6K-4ut">
-                                                    <rect key="frame" x="15" y="8" width="270" height="27.5"/>
+                                                    <rect key="frame" x="22" y="11" width="256" height="22"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="17"/>
                                                     <color key="textColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -275,18 +272,18 @@
                                         <rect key="frame" x="0.0" y="35" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AXm-KE-45G" id="9te-Wx-hkf">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Accounts" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Q3n-Df-v1t">
-                                                    <rect key="frame" x="15" y="6" width="82" height="24"/>
+                                                    <rect key="frame" x="16" y="6" width="82" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Setting up multiple persistent store configurations" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Hbn-cf-Y7m">
-                                                    <rect key="frame" x="15" y="30" width="263.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" width="263.5" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -302,18 +299,18 @@
                                         <rect key="frame" x="0.0" y="85" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fsb-zw-8Ii" id="Upm-AO-Fw3">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Colors" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vpt-cT-gMo">
-                                                    <rect key="frame" x="15" y="6" width="56" height="24"/>
+                                                    <rect key="frame" x="16" y="6" width="56" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Observing list changes and single object changes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ou9-TZ-8bf">
-                                                    <rect key="frame" x="15" y="30" width="260.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" width="260.5" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -329,18 +326,18 @@
                                         <rect key="frame" x="0.0" y="135" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ekW-PJ-mbo" id="CYq-mg-PVS">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Placemarks" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UbU-Kd-yrY">
-                                                    <rect key="frame" x="15" y="6" width="100.5" height="24"/>
+                                                    <rect key="frame" x="16" y="6" width="100.5" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Making changes with transactions" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="uP1-Jc-o9v">
-                                                    <rect key="frame" x="15" y="30" width="179" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" width="179" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -356,18 +353,18 @@
                                         <rect key="frame" x="0.0" y="185" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ph1-8z-C1m" id="nNz-rd-ksg">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Time Zones" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="C8Y-0y-lEG">
-                                                    <rect key="frame" x="15" y="6" width="101.5" height="24"/>
+                                                    <rect key="frame" x="16" y="6" width="101.5" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Fetching objects and raw values" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jZw-qE-0ws">
-                                                    <rect key="frame" x="15" y="30" width="168.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" width="168.5" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -383,18 +380,18 @@
                                         <rect key="frame" x="0.0" y="235" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wyK-rk-3tI" id="fLd-KK-QcW">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Logger" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ZfY-Aq-Ykq">
-                                                    <rect key="frame" x="15" y="6" width="61" height="24"/>
+                                                    <rect key="frame" x="16" y="6" width="61" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Implementing a custom logger" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QzD-9b-k1j">
-                                                    <rect key="frame" x="15" y="30" width="159" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" width="159" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -410,18 +407,18 @@
                                         <rect key="frame" x="0.0" y="285" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xTM-Cf-0if" id="DfO-BW-krd">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Evolution" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hSG-mG-YBw">
-                                                    <rect key="frame" x="15" y="6" width="78.5" height="24"/>
+                                                    <rect key="frame" x="16" y="6" width="78.5" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Migrating and de-migrating stores" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="X9P-TQ-LYh">
-                                                    <rect key="frame" x="15" y="30" width="179.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" width="179.5" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -460,7 +457,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="NhC-oM-bkd">
-                                <rect key="frame" x="16" y="89.5" width="343" height="50"/>
+                                <rect key="frame" x="16" y="69.5" width="343" height="70"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" id="TIX-qi-B34"/>
@@ -512,7 +509,7 @@
                                 </connections>
                             </slider>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p4O-tf-dgt">
-                                <rect key="frame" x="16" y="69" width="343" height="20.5"/>
+                                <rect key="frame" x="16" y="49" width="343" height="20.5"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -623,7 +620,7 @@
                     <tabBarItem key="tabBarItem" title="Demo" image="second" id="3iQ-I2-4LW"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="00L-5k-Eno">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" red="0.90744441747665405" green="0.9265514612197876" blue="0.93116652965545654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="barTintColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -653,18 +650,18 @@
                                 <rect key="frame" x="0.0" y="22" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G3X-70-BCD" id="aT8-nz-i5l">
-                                    <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uQX-PI-UWF">
-                                            <rect key="frame" x="8" y="8" width="27" height="27"/>
+                                            <rect key="frame" x="16" y="11" width="22" height="22"/>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" secondItem="uQX-PI-UWF" secondAttribute="height" multiplier="1:1" id="9qA-iN-Neb"/>
                                             </constraints>
                                         </view>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HJC-5w-lIN">
-                                            <rect key="frame" x="45" y="8" width="34.5" height="27"/>
+                                            <rect key="frame" x="48" y="11" width="34.5" height="22"/>
                                             <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
                                             <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
@@ -713,18 +710,18 @@
                                 <rect key="frame" x="0.0" y="22" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zSO-3e-OVq" id="cHA-by-n4b">
-                                    <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5uq-Yi-XwH">
-                                            <rect key="frame" x="8" y="8" width="27" height="27"/>
+                                            <rect key="frame" x="16" y="11" width="22" height="22"/>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" secondItem="5uq-Yi-XwH" secondAttribute="height" multiplier="1:1" id="oOe-HC-VyN"/>
                                             </constraints>
                                         </view>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zyu-PC-WmO">
-                                            <rect key="frame" x="45" y="8" width="34.5" height="27"/>
+                                            <rect key="frame" x="48" y="11" width="34.5" height="22"/>
                                             <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
                                             <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
@@ -767,7 +764,7 @@
                     <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="6XA-6M-yvZ">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" red="0.68773996829986572" green="0.71417498588562012" blue="0.73246318101882935" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="barTintColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -794,11 +791,11 @@
                         <viewControllerLayoutGuide type="bottom" id="RZg-hi-T8O"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="k4s-iL-Krh">
-                        <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <mapView verifyAmbiguity="ignoreSizes" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="V2U-0R-Ts0">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="558"/>
+                            <mapView verifyAmbiguity="ignoreSizes" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="V2U-0R-Ts0">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                                 <connections>
                                     <outlet property="delegate" destination="jPl-fH-NlD" id="Sjn-YC-haS"/>
                                 </connections>
@@ -888,7 +885,7 @@
                     <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="wJo-mp-1pS">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" red="0.68773996829986572" green="0.71417498588562012" blue="0.73246318101882935" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="barTintColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1008,14 +1005,14 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="name" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RgX-yK-1L2">
-                                            <rect key="frame" x="15" y="11" width="48.5" height="24"/>
+                                            <rect key="frame" x="16" y="11" width="48.5" height="24"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                             <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="offset" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QZ4-A2-x4h">
-                                            <rect key="frame" x="15" y="35" width="31" height="13.5"/>
+                                            <rect key="frame" x="16" y="35" width="31" height="13.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                             <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1054,14 +1051,14 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="name" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Syt-QJ-KXg">
-                                            <rect key="frame" x="15" y="11" width="48.5" height="24"/>
+                                            <rect key="frame" x="16" y="11" width="48.5" height="24"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                             <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="offset" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yHS-dP-IKS">
-                                            <rect key="frame" x="15" y="35" width="31" height="13.5"/>
+                                            <rect key="frame" x="16" y="35" width="31" height="13.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                             <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/12.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -25,7 +25,7 @@ private struct Static {
         _ = try? dataStack.perform(
             synchronous: { (transaction) in
                 
-                transaction.deleteAll(From<TimeZone>())
+                try transaction.deleteAll(From<TimeZone>())
                 
                 for name in NSTimeZone.knownTimeZoneNames {
                     
@@ -164,17 +164,17 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
             title: "All Time Zones",
             fetch: { () -> [TimeZone] in
                 
-                return Static.timeZonesStack.fetchAll(
+                return try! Static.timeZonesStack.fetchAll(
                     From<TimeZone>()
                         .orderBy(.ascending(\.name))
-                )!
+                )
             }
         ),
         (
             title: "Time Zones in Asia",
             fetch: { () -> [TimeZone] in
                 
-                return Static.timeZonesStack.fetchAll(
+                return try! Static.timeZonesStack.fetchAll(
                     From<TimeZone>()
                         .where(
                             format: "%K BEGINSWITH[c] %@",
@@ -182,14 +182,14 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                             "Asia"
                         )
                         .orderBy(.ascending(\.secondsFromGMT))
-                )!
+                )
             }
         ),
         (
             title: "Time Zones in America and Europe",
             fetch: { () -> [TimeZone] in
                 
-                return Static.timeZonesStack.fetchAll(
+                return try! Static.timeZonesStack.fetchAll(
                     From<TimeZone>()
                         .where(
                             format: "%K BEGINSWITH[c] %@ OR %K BEGINSWITH[c] %@",
@@ -199,14 +199,14 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                             "Europe"
                         )
                         .orderBy(.ascending(\.secondsFromGMT))
-                )!
+                )
             }
         ),
         (
             title: "All Time Zones Except America",
             fetch: { () -> [TimeZone] in
                 
-                return Static.timeZonesStack.fetchAll(
+                return try! Static.timeZonesStack.fetchAll(
                     From<TimeZone>()
                         .where(
                             format: "%K BEGINSWITH[c] %@",
@@ -214,18 +214,18 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                             "America"
                         )
                         .orderBy(.ascending(\.secondsFromGMT))
-                    )!
+                    )
             }
         ),
         (
             title: "Time Zones with Summer Time",
             fetch: { () -> [TimeZone] in
                 
-                return Static.timeZonesStack.fetchAll(
+                return try! Static.timeZonesStack.fetchAll(
                     From<TimeZone>()
                         .where(\.hasDaylightSavingTime == true)
                         .orderBy(.ascending(\.name))
-                )!
+                )
             }
         )
     ]
@@ -235,28 +235,28 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
             title: "Number of Time Zones",
             query: { () -> Any in
                 
-                return Static.timeZonesStack.queryValue(
+                return try! Static.timeZonesStack.queryValue(
                     From<TimeZone>()
                         .select(NSNumber.self, .count(\.name))
-                )! as Any
+                )!
             }
         ),
         (
             title: "Abbreviation For Tokyo's Time Zone",
             query: { () -> Any in
                 
-                return Static.timeZonesStack.queryValue(
+                return try! Static.timeZonesStack.queryValue(
                     From<TimeZone>()
                         .select(String.self, .attribute(\.abbreviation))
                         .where(format: "%K ENDSWITH[c] %@", #keyPath(TimeZone.name), "Tokyo")
-                )! as Any
+                )!
             }
         ),
         (
             title: "All Abbreviations",
             query: { () -> Any in
                 
-                return Static.timeZonesStack.queryAttributes(
+                return try! Static.timeZonesStack.queryAttributes(
                     From<TimeZone>()
                         .select(
                             NSDictionary.self,
@@ -264,14 +264,14 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                             .attribute(\.abbreviation)
                         )
                         .orderBy(.ascending(\.name))
-                )!
+                )
             }
         ),
         (
             title: "Number of Countries per Time Zone",
             query: { () -> Any in
                 
-                return Static.timeZonesStack.queryAttributes(
+                return try! Static.timeZonesStack.queryAttributes(
                     From<TimeZone>()
                         .select(
                             NSDictionary.self,
@@ -283,14 +283,14 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                             .ascending(\.secondsFromGMT),
                             .ascending(\.name)
                         )
-                )!
+                )
             }
         ),
         (
             title: "Number of Countries with Summer Time",
             query: { () -> Any in
                 
-                return Static.timeZonesStack.queryAttributes(
+                return try! Static.timeZonesStack.queryAttributes(
                     From<TimeZone>()
                         .select(
                             NSDictionary.self,
@@ -302,7 +302,7 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                             .descending(\.hasDaylightSavingTime),
                             .ascending(\.name)
                         )
-                )!
+                )
             }
         )
     ]

CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/17.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit

CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/17.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit

CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/TimeZone.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/15.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -32,6 +42,36 @@
       "filename" : "Icon-60@3x-1.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
     {
       "size" : "76x76",
       "idiom" : "ipad",
@@ -44,6 +84,21 @@
       "filename" : "Icon-76@2x.png",
       "scale" : "2x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "car",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
     {
       "size" : "60x60",
       "idiom" : "car",

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/02.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -122,6 +122,11 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
                 target: self,
                 action: #selector(self.addBarButtonItemTouched(_:))
             ),
+            UIBarButtonItem(
+                barButtonSystemItem: .refresh,
+                target: self,
+                action: #selector(self.shuffleBarButtonItemTouched(_:))
+            ),
             filterBarButton
         ]
         self.filterBarButton = filterBarButton
@@ -155,7 +160,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
 
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
-        return ColorsDemo.palettes.numberOfObjectsInSection(section)
+        return ColorsDemo.palettes.numberOfObjects(in: section)
     }
     
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -203,7 +208,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
     
     override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         
-        return ColorsDemo.palettes.sectionInfoAtIndex(section).name
+        return ColorsDemo.palettes.sectionInfo(at: section).name
     }
     
     
@@ -283,7 +288,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         ColorsDemo.stack.perform(
             asynchronous: { (transaction) in
                 
-                transaction.deleteAll(From<Palette>())
+                try transaction.deleteAll(From<Palette>())
             },
             completion: { _ in }
         )
@@ -305,6 +310,21 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
             completion: { _ in }
         )
     }
+
+    @IBAction private dynamic func shuffleBarButtonItemTouched(_ sender: AnyObject?) {
+
+        ColorsDemo.stack.perform(
+            asynchronous: { (transaction) in
+
+                for palette in try transaction.fetchAll(From<Palette>()) {
+
+                    palette.hue .= Palette.randomHue()
+                    palette.colorName .= nil
+                }
+            },
+            completion: { _ in }
+        )
+    }
     
     private func setTable(enabled: Bool) {
         

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/06.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -50,7 +50,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     
     required init?(coder aDecoder: NSCoder) {
         
-        if let palette = ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue))) {
+        if let palette = try! ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue))) {
             
             self.monitor = ColorsDemo.stack.monitorObject(palette)
         }
@@ -64,7 +64,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
                 }
             )
             
-            let palette = ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue)))!
+            let palette = try! ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue)))!
             self.monitor = ColorsDemo.stack.monitorObject(palette)
         }
         

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/05.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation
@@ -25,6 +25,11 @@ final class Palette: CoreStoreObject {
         isTransient: true,
         customGetter: Palette.getColorName
     )
+
+    static func randomHue() -> Int {
+
+        return Int(arc4random_uniform(360))
+    }
     
     private static func getColorName(_ partialObject: PartialObject<Palette>) -> String? {
         
@@ -71,7 +76,7 @@ extension Palette {
     
     func setInitialValues(in transaction: BaseDataTransaction) {
         
-        self.hue .= Int(arc4random_uniform(360))
+        self.hue .= Palette.randomHue()
         self.saturation .= Float(1.0)
         self.brightness .= Float(arc4random_uniform(70) + 30) / 100.0
     }

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/05.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit

CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/05.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -16,11 +16,6 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
     
     // MARK: NSObject
     
-    deinit {
-        
-        CoreStore.logger = DefaultLogger()
-    }
-    
     let dataStack = DataStack()
     
     // MARK: UIViewController
@@ -30,13 +25,14 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
         super.viewDidLoad()
         
         try! self.dataStack.addStorageAndWait(SQLiteStore(fileName: "emptyStore.sqlite"))
-        CoreStore.logger = self
     }
     
     override func viewDidAppear(_ animated: Bool) {
         
         super.viewDidAppear(animated)
-        
+
+        CoreStore.logger = self
+
         let alert = UIAlertController(
             title: "Logger Demo",
             message: "This demo shows how to plug-in any logging framework to CoreStore.\n\nThe view controller implements CoreStoreLogger and appends all logs to the text view.",
@@ -46,6 +42,13 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
         self.present(alert, animated: true, completion: nil)
     }
 
+    override func viewDidDisappear(_ animated: Bool) {
+
+        super.viewDidDisappear(animated)
+
+        CoreStore.logger = DefaultLogger()
+    }
+
     
     // MARK: CoreStoreLogger
     
@@ -113,7 +116,7 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
         case 2?:
             DispatchQueue.global(qos: .background).async {
                 
-                _ = self.dataStack.fetchOne(From<Place>())
+                _ = try! self.dataStack.fetchOne(From<Place>())
             }
             
         default:

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -79,7 +79,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
     func listMonitorDidChange(_ monitor: ListMonitor<NSManagedObject>) {
         
         if self.lastSelectedIndexPath == nil,
-            let numberOfObjectsInSection = self.listMonitor?.numberOfObjectsInSection(0),
+            let numberOfObjectsInSection = self.listMonitor?.numberOfObjects(in: 0),
             numberOfObjectsInSection > 0 {
             
             self.tableView?.reloadData()
@@ -100,7 +100,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
     
     @objc dynamic func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
-        return self.listMonitor?.numberOfObjectsInSection(0) ?? 0
+        return self.listMonitor?.numberOfObjects(in: 0) ?? 0
     }
     
     @objc dynamic func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -286,7 +286,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
                 
                 self.set(dataStack: dataStack, model: model, scrollToSelection: true)
                 
-                let count = dataStack.queryValue(
+                let count = try! dataStack.queryValue(
                     From<NSManagedObject>(model.entityType)
                         .select(Int.self, .count(#keyPath(OrganismV1.dna))))!
                 if count > 0 {
@@ -378,7 +378,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
             
             if self.lastSelectedIndexPath == nil  {
                 
-                if listMonitor.numberOfObjectsInSection(0) > 0 {
+                if listMonitor.numberOfObjects(in: 0) > 0 {
                     
                     self.setSelectedIndexPath(IndexPath(row: 0, section: 0), scrollToSelection: true)
                 }

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismProtocol.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/07/12.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV1.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import CoreData

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/FemaleAccount.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/06.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/MaleAccount.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/06.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/StackSetupDemoViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -36,7 +36,7 @@ private struct Static {
         _ = try? dataStack.perform(
             synchronous: { (transaction) in
                 
-                transaction.deleteAll(From<UserAccount>())
+                try transaction.deleteAll(From<UserAccount>())
                 
                 let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
                 account1.accountType = "Facebook"
@@ -74,7 +74,7 @@ private struct Static {
         _ = try? dataStack.perform(
             synchronous: { (transaction) in
                 
-                transaction.deleteAll(From<UserAccount>())
+                try transaction.deleteAll(From<UserAccount>())
                 
                 let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
                 account1.accountType = "Twitter"
@@ -99,8 +99,8 @@ private struct Static {
 class StackSetupDemoViewController: UITableViewController {
     
     let accounts = [
-        Static.facebookStack.fetchAll(From(UserAccount.self)) ?? [],
-        Static.twitterStack.fetchAll(From(UserAccount.self)) ?? []
+        try! Static.facebookStack.fetchAll(From<UserAccount>()),
+        try! Static.twitterStack.fetchAll(From<UserAccount>())
     ]
     
     

CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/UserAccount.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/Transactions Demo/Place.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -26,7 +26,7 @@ private struct Static {
             )
         )
         
-        var place = CoreStore.fetchOne(From<Place>())
+        var place = try! CoreStore.fetchOne(From<Place>())
         if place == nil {
             
             _ = try? CoreStore.perform(
@@ -36,7 +36,7 @@ private struct Static {
                     place.setInitialValues()
                 }
             )
-            place = CoreStore.fetchOne(From<Place>())
+            place = try! CoreStore.fetchOne(From<Place>())
         }
         
         return CoreStore.monitorObject(place!)

CoreStoreTests/BaseTests/BaseTestCase.swift

@@ -2,7 +2,7 @@
 //  BaseTestCase.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -36,8 +36,7 @@ class BaseTestCase: XCTestCase {
     // MARK: Internal
     
     @nonobjc
-    @discardableResult
-    func prepareStack<T>(configurations: [ModelConfiguration] = [nil], _ closure: (_ dataStack: DataStack) -> T) -> T {
+    func prepareStack(configurations: [ModelConfiguration] = [nil], _ closure: (_ dataStack: DataStack) throws -> Void) {
         
         let stack = DataStack(
             xcodeModelName: "Model",
@@ -57,16 +56,16 @@ class BaseTestCase: XCTestCase {
                     )
                 )
             }
+            try closure(stack)
         }
         catch let error as NSError {
             
             XCTFail(error.coreStoreDumpString)
         }
-        return closure(stack)
     }
     
     @nonobjc
-    func expectLogger<T>(_ expectations: [TestLogger.Expectation], closure: () -> T) -> T {
+    func expectLogger<T>(_ expectations: [TestLogger.Expectation], closure: () throws -> T) rethrows -> T {
         
         CoreStore.logger = TestLogger(self.prepareLoggerExpectations(expectations))
         defer {
@@ -74,7 +73,7 @@ class BaseTestCase: XCTestCase {
             self.checkExpectationsImmediately()
             CoreStore.logger = TestLogger([:])
         }
-        return closure()
+        return try closure()
     }
     
     @nonobjc

CoreStoreTests/BaseTests/BaseTestDataTestCase.swift

@@ -2,7 +2,7 @@
 //  BaseTestDataTestCase.swift
 //  CoreStore
 //
-//  Copyright © 2017 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

CoreStoreTests/BridgingTests.h

@@ -2,7 +2,7 @@
 //  BridgingTests.h
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

CoreStoreTests/BridgingTests.m

@@ -2,7 +2,7 @@
 //  BridgingTests.m
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -193,7 +193,17 @@
     XCTAssertEqualObjects([[sqliteStorage class] storeType], [CSSQLiteStore storeType]);
     XCTAssertEqualObjects([[sqliteStorage class] storeType], NSSQLiteStoreType);
     XCTAssertNil(sqliteStorage.configuration);
-    XCTAssertEqualObjects(sqliteStorage.storeOptions, @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" } });
+    NSDictionary *storeOptions;
+    if (@available(iOS 11.0, macOS 10.13, tvOS 11.0, *)) {
+        
+        storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" },
+                          NSBinaryStoreInsecureDecodingCompatibilityOption: @YES };
+    }
+    else {
+        
+        storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" }};
+    }
+    XCTAssertEqualObjects(sqliteStorage.storeOptions, storeOptions);
     XCTAssertNil(sqliteError);
 }
 

CoreStoreTests/ConvenienceTests.swift

@@ -2,7 +2,7 @@
 //  ConvenienceTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@ import CoreStore
 
 // MARK: - ConvenienceTests
 
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 class ConvenienceTests: BaseTestCase {
     
     @objc

CoreStoreTests/DynamicModelTests.swift

@@ -2,7 +2,7 @@
 //  DynamicModelTests.swift
 //  CoreStore
 //
-//  Copyright © 2017 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,7 @@ import XCTest
 @testable
 import CoreStore
 
-#if os(OSX)
+#if os(macOS)
     typealias Color = NSColor
 #else
     
@@ -143,6 +143,9 @@ class DynamicModelTests: BaseTestDataTestCase {
             
             let updateDone = self.expectation(description: "update-done")
             let fetchDone = self.expectation(description: "fetch-done")
+            let willSetPriorObserverDone = self.expectation(description: "willSet-observe-prior-done")
+            let willSetNotPriorObserverDone = self.expectation(description: "willSet-observe-notPrior-done")
+            let didSetObserverDone = self.expectation(description: "didSet-observe-done")
             stack.perform(
                 asynchronous: { (transaction) in
                     
@@ -160,9 +163,42 @@ class DynamicModelTests: BaseTestDataTestCase {
                     XCTAssertEqual(dog.species.value, "Swift")
                     XCTAssertEqual(dog.nickname.value, nil)
                     XCTAssertEqual(dog.age.value, 1)
+
+                    let didSetObserver = dog.species.observe(options: [.new, .old]) { (object, change) in
+
+                        XCTAssertEqual(object, dog)
+                        XCTAssertEqual(change.kind, .setting)
+                        XCTAssertEqual(change.newValue, "Dog")
+                        XCTAssertEqual(change.oldValue, "Swift")
+                        XCTAssertFalse(change.isPrior)
+                        XCTAssertEqual(object.species.value, "Dog")
+                        didSetObserverDone.fulfill()
+                    }
+                    let willSetObserver = dog.species.observe(options: [.new, .old, .prior]) { (object, change) in
+
+                        XCTAssertEqual(object, dog)
+                        XCTAssertEqual(change.kind, .setting)
+                        XCTAssertEqual(change.oldValue, "Swift")
+
+                        if change.isPrior {
+
+                            XCTAssertNil(change.newValue)
+                            XCTAssertEqual(object.species.value, "Swift")
+                            willSetPriorObserverDone.fulfill()
+                        }
+                        else {
+
+                            XCTAssertEqual(change.newValue, "Dog")
+                            XCTAssertEqual(object.species.value, "Dog")
+                            willSetNotPriorObserverDone.fulfill()
+                        }
+                    }
                     
                     dog.species .= "Dog"
                     XCTAssertEqual(dog.species.value, "Dog")
+
+                    didSetObserver.invalidate()
+                    willSetObserver.invalidate()
                     
                     dog.nickname .= "Spot"
                     XCTAssertEqual(dog.nickname.value, "Spot")
@@ -171,7 +207,7 @@ class DynamicModelTests: BaseTestDataTestCase {
                     XCTAssertTrue(person.pets.value.isEmpty)
                     
                     XCTAssertEqual(
-                        type(of: person.rawObject!).keyPathsForValuesAffectingValue(forKey: "displayName"),
+                        cs_dynamicType(of: person.rawObject!).keyPathsForValuesAffectingValue(forKey: "displayName"),
                         ["title", "name"]
                     )
                     
@@ -212,51 +248,54 @@ class DynamicModelTests: BaseTestDataTestCase {
                     let p1 = Where<Animal>({ $0.species == "Sparrow" })
                     XCTAssertEqual(p1.predicate, NSPredicate(format: "%K == %@", "species", "Sparrow"))
                     
-                    let bird = transaction.fetchOne(From<Animal>(), p1)
+                    let bird = try transaction.fetchOne(From<Animal>(), p1)
                     XCTAssertNotNil(bird)
                     XCTAssertEqual(bird!.species.value, "Sparrow")
                     
                     let p2 = Where<Dog>({ $0.nickname == "Spot" })
                     XCTAssertEqual(p2.predicate, NSPredicate(format: "%K == %@", "nickname", "Spot"))
                     
-                    let dog = transaction.fetchOne(From<Dog>().where(\.nickname == "Spot"))
+                    let dog = try transaction.fetchOne(From<Dog>().where(\.nickname == "Spot"))
                     XCTAssertNotNil(dog)
                     XCTAssertEqual(dog!.nickname.value, "Spot")
                     XCTAssertEqual(dog!.species.value, "Dog")
                     
-                    let person = transaction.fetchOne(From<Person>())
+                    let person = try transaction.fetchOne(From<Person>())
                     XCTAssertNotNil(person)
                     XCTAssertEqual(person!.pets.value.first, dog)
                     
                     let p3 = Where<Dog>({ $0.age == 10 })
                     XCTAssertEqual(p3.predicate, NSPredicate(format: "%K == %d", "age", 10))
+
+                    let totalAge = try transaction.queryValue(From<Dog>().select(Int.self, .sum(\Dog.age)))
+                    XCTAssertEqual(totalAge, 1)
                     
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                         From<Dog>()
                             .where(\Animal.species == "Dog" && \.age == 10)
                     )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                         From<Dog>()
                             .where(\.age == 10 && \Animal.species == "Dog")
                             .orderBy(.ascending({ $0.species }))
                     )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                         From<Dog>(),
                         Where<Dog>({ $0.age > 10 && $0.age <= 15 })
                     )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                         From<Dog>(),
                         Where<Dog>({ $0.species == "Dog" && $0.age == 10 })
                     )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                         From<Dog>(),
                         Where<Dog>({ $0.age == 10 && $0.species == "Dog" })
                     )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                         From<Dog>(),
                         Where<Dog>({ $0.age > 10 && $0.age <= 15 })
                     )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                         From<Dog>(),
                         (\Dog.age > 10 && \Dog.age <= 15)
                     )

CoreStoreTests/ErrorTests.swift

@@ -2,7 +2,7 @@
 //  ErrorTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

CoreStoreTests/FromTests.swift

@@ -2,7 +2,7 @@
 //  FromTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -75,8 +75,7 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity1>()
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -90,11 +89,11 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity1>("Config1")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let storesFound: Void? = try? self.expectLogger([.logError]) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
+                XCTAssertNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -116,8 +115,8 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity1>()
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -131,8 +130,8 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity1>("Config1")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -146,11 +145,11 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity1>("Config2")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let storesFound: Void? = try? self.expectLogger([.logError]) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
+                XCTAssertNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -164,11 +163,11 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity2>()
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let storesFound: Void? = try? self.expectLogger([.logError]) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
+                XCTAssertNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -182,11 +181,11 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity2>("Config1")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let storesFound: Void? = try? self.expectLogger([.logError]) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
+                XCTAssertNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -200,11 +199,11 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity2>("Config2")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let storesFound: Void? = try? self.expectLogger([.logError]) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
+                XCTAssertNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -226,8 +225,8 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity1>()
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -241,8 +240,8 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity1>("Config1")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -256,11 +255,11 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity1>("Config2")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let storesFound: Void? = try? self.expectLogger([.logError]) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
+                XCTAssertNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -274,8 +273,8 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity2>()
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -289,11 +288,11 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity2>("Config1")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let storesFound: Void? = try? self.expectLogger([.logError]) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
+                XCTAssertNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -307,11 +306,11 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity2>("Config2")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let storesFound: Void? = try? self.expectLogger([.logError]) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
+                XCTAssertNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -333,8 +332,8 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity1>()
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -348,8 +347,8 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity1>("Config1")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -363,11 +362,11 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity1>("Config2")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let storesFound: Void? = try? self.expectLogger([.logError]) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
+                XCTAssertNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -381,8 +380,8 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity2>()
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -396,11 +395,11 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity2>("Config1")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let storesFound: Void? = try? self.expectLogger([.logError]) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
+                XCTAssertNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 
@@ -414,8 +413,8 @@ final class FromTests: BaseTestCase {
                 let from = From<TestEntity2>("Config2")
                 
                 let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
                 XCTAssertNotNil(request.safeAffectedStores)
                 

CoreStoreTests/GroupByTests.swift

@@ -2,7 +2,7 @@
 //  GroupByTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -69,7 +69,7 @@ final class GroupByTests: BaseTestCase {
             let groupBy = GroupBy<NSManagedObject>(#keyPath(TestEntity1.testString))
             
             let request = CoreStoreFetchRequest()
-            _ = From<TestEntity1>().applyToFetchRequest(request, context: dataStack.mainContext)
+            try From<TestEntity1>().applyToFetchRequest(request, context: dataStack.mainContext)
             groupBy.applyToFetchRequest(request)
             
             XCTAssertNotNil(request.propertiesToGroupBy)

CoreStoreTests/ImportTests.swift

@@ -2,7 +2,7 @@
 //  ImportTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -95,7 +95,7 @@ class ImportTests: BaseTestDataTestCase {
                             ]
                         )
                         XCTAssertNil(object)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 0)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 0)
                     }
                 )
             }
@@ -103,7 +103,7 @@ class ImportTests: BaseTestDataTestCase {
                 
                 XCTFail()
             }
-            XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
+            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
         }
     }
     
@@ -137,9 +137,9 @@ class ImportTests: BaseTestDataTestCase {
                         catch _ as TestInsertError {
                             
                             errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                             
-                            let object = transaction.fetchOne(From<TestEntity1>())
+                            let object = try transaction.fetchOne(From<TestEntity1>())
                             XCTAssertNotNil(object)
                             XCTAssertNil(object?.testEntityID)
                             XCTAssertNil(object?.testBoolean)
@@ -182,7 +182,7 @@ class ImportTests: BaseTestDataTestCase {
                             ]
                         )
                         XCTAssertNotNil(object)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                         XCTAssertNil(object?.testEntityID)
                         XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
                         XCTAssertEqual(object?.testNumber, NSNumber(value: 1))
@@ -202,7 +202,7 @@ class ImportTests: BaseTestDataTestCase {
                                 #keyPath(TestEntity1.testDate): self.dateFormatter.date(from: "2000-01-02T00:00:00Z")!
                             ]
                         )
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                         XCTAssertNil(object?.testEntityID)
                         XCTAssertEqual(object?.testBoolean, NSNumber(value: false))
                         XCTAssertEqual(object?.testNumber, NSNumber(value: 2))
@@ -254,7 +254,7 @@ class ImportTests: BaseTestDataTestCase {
                             sourceArray: sourceArray
                         )
                         XCTAssertEqual(objects.count, 1)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                         
                         let object = objects[0]
                         let dictionary = sourceArray[1]
@@ -316,9 +316,9 @@ class ImportTests: BaseTestDataTestCase {
                         catch _ as TestInsertError {
                             
                             errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                             
-                            let object = transaction.fetchOne(From<TestEntity1>())
+                            let object = try transaction.fetchOne(From<TestEntity1>())
                             XCTAssertNotNil(object)
                             XCTAssertNil(object?.testEntityID)
                             XCTAssertNil(object?.testBoolean)
@@ -372,7 +372,7 @@ class ImportTests: BaseTestDataTestCase {
                             sourceArray: sourceArray
                         )
                         XCTAssertEqual(objects.count, sourceArray.count)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 2)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 2)
                         
                         for i in 0 ..< sourceArray.count {
                             
@@ -424,7 +424,7 @@ class ImportTests: BaseTestDataTestCase {
                                 ]
                             )
                             XCTAssertNil(object)
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 5)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 5)
                         }
                         do {
                             
@@ -442,20 +442,19 @@ class ImportTests: BaseTestDataTestCase {
                                 ]
                             )
                             XCTAssertNil(object)
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 5)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 5)
                             
-                            let existingObjects = transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
-                            XCTAssertNotNil(existingObjects)
-                            XCTAssertEqual(existingObjects?.count, 1)
+                            let existingObjects = try transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
+                            XCTAssertEqual(existingObjects.count, 1)
                             
-                            let existingObject = existingObjects?[0]
-                            XCTAssertEqual(existingObject?.testEntityID, NSNumber(value: 105))
-                            XCTAssertEqual(existingObject?.testBoolean, NSNumber(value: true))
-                            XCTAssertEqual(existingObject?.testNumber, NSNumber(value: 5))
-                            XCTAssertEqual(existingObject?.testDecimal, NSDecimalNumber(string: "5"))
-                            XCTAssertEqual(existingObject?.testString, "nil:TestEntity1:5")
-                            XCTAssertEqual(existingObject?.testData, ("nil:TestEntity1:5" as NSString).data(using: String.Encoding.utf8.rawValue)!)
-                            XCTAssertEqual(existingObject?.testDate, self.dateFormatter.date(from: "2000-01-05T00:00:00Z")!)
+                            let existingObject = existingObjects[0]
+                            XCTAssertEqual(existingObject.testEntityID, NSNumber(value: 105))
+                            XCTAssertEqual(existingObject.testBoolean, NSNumber(value: true))
+                            XCTAssertEqual(existingObject.testNumber, NSNumber(value: 5))
+                            XCTAssertEqual(existingObject.testDecimal, NSDecimalNumber(string: "5"))
+                            XCTAssertEqual(existingObject.testString, "nil:TestEntity1:5")
+                            XCTAssertEqual(existingObject.testData, ("nil:TestEntity1:5" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+                            XCTAssertEqual(existingObject.testDate, self.dateFormatter.date(from: "2000-01-05T00:00:00Z")!)
                         }
                     }
                 )
@@ -504,7 +503,7 @@ class ImportTests: BaseTestDataTestCase {
                         )
                         
                         XCTAssertEqual(objects.count, 1)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                         
                         let object = objects[0]
                         let dictionary = sourceArray[1]
@@ -618,9 +617,9 @@ class ImportTests: BaseTestDataTestCase {
                         catch _ as TestInsertError {
                             
                             errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                             
-                            let object = transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
+                            let object = try transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
                             XCTAssertNotNil(object)
                             XCTAssertEqual(object?.testEntityID, NSNumber(value: 106))
                             XCTAssertNil(object?.testBoolean)
@@ -657,21 +656,19 @@ class ImportTests: BaseTestDataTestCase {
                         catch _ as TestUpdateError {
                             
                             errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                             
-                            let existingObjects = transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
-                            XCTAssertNotNil(existingObjects)
-                            XCTAssertEqual(existingObjects?.count, 1)
+                            let existingObjects = try transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
+                            XCTAssertEqual(existingObjects.count, 1)
                             
-                            let existingObject = existingObjects?[0]
-                            XCTAssertNotNil(existingObject)
-                            XCTAssertEqual(existingObject?.testEntityID, NSNumber(value: 105))
-                            XCTAssertEqual(existingObject?.testBoolean, NSNumber(value: true))
-                            XCTAssertEqual(existingObject?.testNumber, NSNumber(value: 5))
-                            XCTAssertEqual(existingObject?.testDecimal, NSDecimalNumber(string: "5"))
-                            XCTAssertEqual(existingObject?.testString, "nil:TestEntity1:5")
-                            XCTAssertEqual(existingObject?.testData, ("nil:TestEntity1:5" as NSString).data(using: String.Encoding.utf8.rawValue)!)
-                            XCTAssertEqual(existingObject?.testDate, self.dateFormatter.date(from: "2000-01-05T00:00:00Z")!)
+                            let existingObject = existingObjects[0]
+                            XCTAssertEqual(existingObject.testEntityID, NSNumber(value: 105))
+                            XCTAssertEqual(existingObject.testBoolean, NSNumber(value: true))
+                            XCTAssertEqual(existingObject.testNumber, NSNumber(value: 5))
+                            XCTAssertEqual(existingObject.testDecimal, NSDecimalNumber(string: "5"))
+                            XCTAssertEqual(existingObject.testString, "nil:TestEntity1:5")
+                            XCTAssertEqual(existingObject.testData, ("nil:TestEntity1:5" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+                            XCTAssertEqual(existingObject.testDate, self.dateFormatter.date(from: "2000-01-05T00:00:00Z")!)
                         }
                         self.checkExpectationsImmediately()
                     }
@@ -710,7 +707,7 @@ class ImportTests: BaseTestDataTestCase {
                                 ]
                             )
                             XCTAssertNotNil(object)
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                             
                             XCTAssertEqual(object?.testEntityID, NSNumber(value: 106))
                             XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
@@ -735,7 +732,7 @@ class ImportTests: BaseTestDataTestCase {
                                     ]
                             )
                             XCTAssertNotNil(object)
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                             
                             XCTAssertEqual(object?.testEntityID, NSNumber(value: 106))
                             XCTAssertEqual(object?.testBoolean, NSNumber(value: false))
@@ -745,11 +742,10 @@ class ImportTests: BaseTestDataTestCase {
                             XCTAssertEqual(object?.testData, ("nil:TestEntity1:7" as NSString).data(using: String.Encoding.utf8.rawValue)!)
                             XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-07T00:00:00Z")!)
                             
-                            let existingObjects = transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
-                            XCTAssertNotNil(existingObjects)
-                            XCTAssertEqual(existingObjects?.count, 1)
+                            let existingObjects = try transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
+                            XCTAssertEqual(existingObjects.count, 1)
                             
-                            let existingObject = existingObjects?[0]
+                            let existingObject = existingObjects[0]
                             XCTAssertEqual(existingObject, object)
                         }
                     }
@@ -799,7 +795,7 @@ class ImportTests: BaseTestDataTestCase {
                             sourceArray: sourceArray
                         )
                         XCTAssertEqual(objects.count, 1)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                         
                         let object = objects[0]
                         let dictionary = sourceArray[1]
@@ -864,10 +860,10 @@ class ImportTests: BaseTestDataTestCase {
                         catch _ as TestIDError {
                             
                             errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 5)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 5)
                             
-                            XCTAssertNil(transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106)))
-                            XCTAssertNil(transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 107)))
+                            XCTAssertNil(try transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106)))
+                            XCTAssertNil(try transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 107)))
                         }
                         transaction.unsafeContext().reset()
                         self.checkExpectationsImmediately()
@@ -910,7 +906,7 @@ class ImportTests: BaseTestDataTestCase {
                             
                             errorExpectation.fulfill()
                             
-                            let object = transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
+                            let object = try transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
                             XCTAssertNotNil(object)
                             XCTAssertEqual(object?.testEntityID, NSNumber(value: 106))
                             XCTAssertNil(object?.testBoolean)
@@ -951,9 +947,9 @@ class ImportTests: BaseTestDataTestCase {
                         catch _ as TestUpdateError {
                             
                             errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 5)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 5)
                             
-                            let object = transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
+                            let object = try transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
                             XCTAssertNotNil(object)
                             XCTAssertEqual(object?.testEntityID, NSNumber(value: 105))
                             XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
@@ -963,11 +959,10 @@ class ImportTests: BaseTestDataTestCase {
                             XCTAssertEqual(object?.testData, ("nil:TestEntity1:5" as NSString).data(using: String.Encoding.utf8.rawValue)!)
                             XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-05T00:00:00Z")!)
                             
-                            let existingObjects = transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
-                            XCTAssertNotNil(existingObjects)
-                            XCTAssertEqual(existingObjects?.count, 1)
+                            let existingObjects = try transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
+                            XCTAssertEqual(existingObjects.count, 1)
                             
-                            let existingObject = existingObjects?[0]
+                            let existingObject = existingObjects[0]
                             XCTAssertEqual(existingObject, object)
                         }
                         transaction.context.reset()
@@ -1018,7 +1013,7 @@ class ImportTests: BaseTestDataTestCase {
                             sourceArray: sourceArray
                         )
                         XCTAssertEqual(objects.count, sourceArray.count)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                         for i in 0 ..< sourceArray.count {
                             
                             let object = objects[i]
@@ -1032,11 +1027,10 @@ class ImportTests: BaseTestDataTestCase {
                             XCTAssertEqual(object.testData, dictionary[(#keyPath(TestEntity1.testData))] as? Data)
                             XCTAssertEqual(object.testDate, dictionary[(#keyPath(TestEntity1.testDate))] as? Date)
                         }
-                        let existingObjects = transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
-                        XCTAssertNotNil(existingObjects)
-                        XCTAssertEqual(existingObjects?.count, 1)
+                        let existingObjects = try transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
+                        XCTAssertEqual(existingObjects.count, 1)
                         
-                        let existingObject = existingObjects?[0]
+                        let existingObject = existingObjects[0]
                         XCTAssertEqual(existingObject, objects[0])
                     }
                 )

CoreStoreTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.2.0</string>
+	<string>5.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

CoreStoreTests/IntoTests.swift

@@ -2,7 +2,7 @@
 //  IntoTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

CoreStoreTests/ListObserverTests.swift

@@ -2,7 +2,7 @@
 //  ListObserverTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -31,7 +31,7 @@ import CoreStore
 
 // MARK: - ListObserverTests
 
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 class ListObserverTests: BaseTestDataTestCase {
     
     @objc
@@ -76,7 +76,7 @@ class ListObserverTests: BaseTestDataTestCase {
                     XCTAssertEqual(
                         ((note.userInfo as NSDictionary?) ?? [:]),
                         [
-                            "sectionInfo": monitor.sectionInfoAtIndex(0),
+                            "sectionInfo": monitor.sectionInfo(at: 0),
                             "sectionIndex": 0
                         ] as NSDictionary
                     )
@@ -178,9 +178,9 @@ class ListObserverTests: BaseTestDataTestCase {
             XCTAssertTrue(monitor.hasSections())
             XCTAssertEqual(monitor.numberOfSections(), 2)
             XCTAssertTrue(monitor.hasObjects())
-            XCTAssertTrue(monitor.hasObjectsInSection(0))
-            XCTAssertEqual(monitor.numberOfObjectsInSection(0), 2)
-            XCTAssertEqual(monitor.numberOfObjectsInSection(1), 3)
+            XCTAssertTrue(monitor.hasObjects(in: 0))
+            XCTAssertEqual(monitor.numberOfObjects(in: 0), 2)
+            XCTAssertEqual(monitor.numberOfObjects(in: 1), 3)
             
             var events = 0
             
@@ -268,7 +268,7 @@ class ListObserverTests: BaseTestDataTestCase {
             stack.perform(
                 asynchronous: { (transaction) -> Bool in
                     
-                    if let object = transaction.fetchOne(
+                    if let object = try transaction.fetchOne(
                         From<TestEntity1>(),
                         Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) {
                         
@@ -282,7 +282,7 @@ class ListObserverTests: BaseTestDataTestCase {
                         
                         XCTFail()
                     }
-                    if let object = transaction.fetchOne(
+                    if let object = try transaction.fetchOne(
                         From<TestEntity1>(),
                         Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
                         
@@ -394,7 +394,7 @@ class ListObserverTests: BaseTestDataTestCase {
             stack.perform(
                 asynchronous: { (transaction) -> Bool in
                     
-                    if let object = transaction.fetchOne(
+                    if let object = try transaction.fetchOne(
                         From<TestEntity1>(),
                         Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
                         
@@ -526,7 +526,7 @@ class ListObserverTests: BaseTestDataTestCase {
             stack.perform(
                 asynchronous: { (transaction) -> Bool in
                     
-                    let count = transaction.deleteAll(
+                    let count = try transaction.deleteAll(
                         From<TestEntity1>(),
                         Where<TestEntity1>(#keyPath(TestEntity1.testBoolean), isEqualTo: false)
                     )
@@ -551,7 +551,7 @@ class ListObserverTests: BaseTestDataTestCase {
 
 // MARK: TestListObserver
 
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 class TestListObserver: ListSectionObserver {
     
     // MARK: ListObserver

CoreStoreTests/MigrationChainTests.swift

@@ -2,7 +2,7 @@
 //  MigrationChainTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

CoreStoreTests/ObjectObserverTests.swift

@@ -2,7 +2,7 @@
 //  ObjectObserverTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -31,7 +31,7 @@ import CoreStore
 
 // MARK: - ObjectObserverTests
 
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 class ObjectObserverTests: BaseTestDataTestCase {
     
     @objc
@@ -41,7 +41,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
             
             self.prepareTestDataForStack(stack)
             
-            guard let object = stack.fetchOne(
+            guard let object = try stack.fetchOne(
                 From<TestEntity1>(),
                 Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
                     
@@ -138,7 +138,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
             
             self.prepareTestDataForStack(stack)
             
-            guard let object = stack.fetchOne(
+            guard let object = try stack.fetchOne(
                 From<TestEntity1>(),
                 Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
                     
@@ -203,7 +203,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
 
 // MARK: TestObjectObserver
 
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 class TestObjectObserver: ObjectObserver {
     
     typealias ObjectEntityType = TestEntity1

CoreStoreTests/OrderByTests.swift

@@ -2,7 +2,7 @@
 //  OrderByTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

CoreStoreTests/QueryTests.swift

@@ -2,7 +2,7 @@
 //  QueryTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -47,7 +47,7 @@ class QueryTests: BaseTestDataTestCase {
             ]
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Bool>(#keyPath(TestEntity1.testBoolean)),
                     queryClauses
@@ -57,7 +57,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int8>(#keyPath(TestEntity1.testNumber)),
                     queryClauses
@@ -67,7 +67,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int16>(#keyPath(TestEntity1.testNumber)),
                     queryClauses
@@ -77,7 +77,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int32>(#keyPath(TestEntity1.testNumber)),
                     queryClauses
@@ -87,7 +87,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int64>(#keyPath(TestEntity1.testNumber)),
                     queryClauses
@@ -97,7 +97,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int>(#keyPath(TestEntity1.testNumber)),
                     queryClauses
@@ -107,7 +107,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Double>(#keyPath(TestEntity1.testNumber)),
                     queryClauses
@@ -117,7 +117,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Float>(#keyPath(TestEntity1.testNumber)),
                     queryClauses
@@ -127,7 +127,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSNumber>(#keyPath(TestEntity1.testNumber)),
                     queryClauses
@@ -137,7 +137,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDecimalNumber>(#keyPath(TestEntity1.testDecimal)),
                     queryClauses
@@ -147,7 +147,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, String>(#keyPath(TestEntity1.testString)),
                     queryClauses
@@ -157,7 +157,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSString>(#keyPath(TestEntity1.testString)),
                     queryClauses
@@ -167,7 +167,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Data>(#keyPath(TestEntity1.testData)),
                     queryClauses
@@ -177,7 +177,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSData>(#keyPath(TestEntity1.testData)),
                     queryClauses
@@ -187,7 +187,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Date>(#keyPath(TestEntity1.testDate)),
                     queryClauses
@@ -197,7 +197,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDate>(#keyPath(TestEntity1.testDate)),
                     queryClauses
@@ -207,7 +207,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSManagedObjectID>(#keyPath(TestEntity1.testDate)),
                     queryClauses
@@ -232,7 +232,7 @@ class QueryTests: BaseTestDataTestCase {
             ]
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Bool>(.average(#keyPath(TestEntity1.testBoolean))),
                     queryClauses
@@ -242,7 +242,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int8>(.average(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -252,7 +252,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int16>(.average(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -262,7 +262,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int32>(.average(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -272,7 +272,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int64>(.average(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -282,7 +282,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int>(.average(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -292,7 +292,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Double>(.average(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -302,7 +302,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Float>(.average(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -312,7 +312,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSNumber>(.average(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -322,7 +322,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDecimalNumber>(.average(#keyPath(TestEntity1.testDecimal))),
                     queryClauses
@@ -332,7 +332,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, String>(.average(#keyPath(TestEntity1.testString))),
                     queryClauses
@@ -341,7 +341,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSString>(.average(#keyPath(TestEntity1.testString))),
                     queryClauses
@@ -350,7 +350,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Data>(.average(#keyPath(TestEntity1.testData))),
                     queryClauses
@@ -359,7 +359,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSData>(.average(#keyPath(TestEntity1.testData))),
                     queryClauses
@@ -368,7 +368,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Date>(.average(#keyPath(TestEntity1.testDate))),
                     queryClauses
@@ -377,7 +377,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDate>(.average(#keyPath(TestEntity1.testDate))),
                     queryClauses
@@ -386,7 +386,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSManagedObjectID>(#keyPath(TestEntity1.testEntityID)),
                     queryClauses
@@ -410,7 +410,7 @@ class QueryTests: BaseTestDataTestCase {
             ]
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Bool>(.count(#keyPath(TestEntity1.testBoolean))),
                     queryClauses
@@ -420,7 +420,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int8>(.count(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -430,7 +430,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int16>(.count(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -440,7 +440,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int32>(.count(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -450,7 +450,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int64>(.count(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -460,7 +460,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int>(.count(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -470,7 +470,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Double>(.count(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -480,7 +480,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Float>(.count(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -490,7 +490,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSNumber>(.count(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -500,7 +500,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDecimalNumber>(.count(#keyPath(TestEntity1.testDecimal))),
                     queryClauses
@@ -509,7 +509,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, String>(.count(#keyPath(TestEntity1.testString))),
                     queryClauses
@@ -518,7 +518,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSString>(.count(#keyPath(TestEntity1.testString))),
                     queryClauses
@@ -527,7 +527,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Data>(.count(#keyPath(TestEntity1.testData))),
                     queryClauses
@@ -536,7 +536,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSData>(.count(#keyPath(TestEntity1.testData))),
                     queryClauses
@@ -545,7 +545,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Date>(.count(#keyPath(TestEntity1.testDate))),
                     queryClauses
@@ -554,7 +554,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDate>(.count(#keyPath(TestEntity1.testDate))),
                     queryClauses
@@ -563,7 +563,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSManagedObjectID>(.count(#keyPath(TestEntity1.testEntityID))),
                     queryClauses
@@ -587,7 +587,7 @@ class QueryTests: BaseTestDataTestCase {
             ]
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Bool>(.maximum(#keyPath(TestEntity1.testBoolean))),
                     queryClauses
@@ -597,7 +597,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int8>(.maximum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -607,7 +607,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int16>(.maximum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -617,7 +617,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int32>(.maximum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -627,7 +627,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int64>(.maximum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -637,7 +637,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int>(.maximum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -647,7 +647,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Double>(.maximum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -657,7 +657,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Float>(.maximum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -667,7 +667,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSNumber>(.maximum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -677,7 +677,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDecimalNumber>(.maximum(#keyPath(TestEntity1.testDecimal))),
                     queryClauses
@@ -687,7 +687,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, String>(.maximum(#keyPath(TestEntity1.testString))),
                     queryClauses
@@ -697,7 +697,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSString>(.maximum(#keyPath(TestEntity1.testString))),
                     queryClauses
@@ -707,7 +707,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Data>(.maximum(#keyPath(TestEntity1.testData))),
                     queryClauses
@@ -717,7 +717,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSData>(.maximum(#keyPath(TestEntity1.testData))),
                     queryClauses
@@ -727,7 +727,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Date>(.maximum(#keyPath(TestEntity1.testDate))),
                     queryClauses
@@ -737,7 +737,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDate>(.maximum(#keyPath(TestEntity1.testDate))),
                     queryClauses
@@ -747,7 +747,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSManagedObjectID>(.maximum(#keyPath(TestEntity1.testEntityID))),
                     queryClauses
@@ -771,7 +771,7 @@ class QueryTests: BaseTestDataTestCase {
             ]
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Bool>(.minimum(#keyPath(TestEntity1.testBoolean))),
                     queryClauses
@@ -781,7 +781,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int8>(.minimum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -791,7 +791,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int16>(.minimum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -801,7 +801,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int32>(.minimum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -811,7 +811,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int64>(.minimum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -821,7 +821,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int>(.minimum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -831,7 +831,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Double>(.minimum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -841,7 +841,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Float>(.minimum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -851,7 +851,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSNumber>(.minimum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -861,7 +861,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDecimalNumber>(.minimum(#keyPath(TestEntity1.testDecimal))),
                     queryClauses
@@ -871,7 +871,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, String>(.minimum(#keyPath(TestEntity1.testString))),
                     queryClauses
@@ -881,7 +881,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSString>(.minimum(#keyPath(TestEntity1.testString))),
                     queryClauses
@@ -891,7 +891,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Data>(.minimum(#keyPath(TestEntity1.testData))),
                     queryClauses
@@ -901,7 +901,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSData>(.minimum(#keyPath(TestEntity1.testData))),
                     queryClauses
@@ -911,7 +911,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Date>(.minimum(#keyPath(TestEntity1.testDate))),
                     queryClauses
@@ -921,7 +921,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDate>(.minimum(#keyPath(TestEntity1.testDate))),
                     queryClauses
@@ -931,7 +931,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSManagedObjectID>(.minimum(#keyPath(TestEntity1.testEntityID))),
                     queryClauses
@@ -955,7 +955,7 @@ class QueryTests: BaseTestDataTestCase {
             ]
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Bool>(.sum(#keyPath(TestEntity1.testBoolean))),
                     queryClauses
@@ -965,7 +965,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int8>(.sum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -975,7 +975,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int16>(.sum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -985,7 +985,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int32>(.sum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -995,7 +995,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int64>(.sum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -1005,7 +1005,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int>(.sum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -1015,7 +1015,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Double>(.sum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -1025,7 +1025,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Float>(.sum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -1035,7 +1035,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSNumber>(.sum(#keyPath(TestEntity1.testNumber))),
                     queryClauses
@@ -1045,7 +1045,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDecimalNumber>(.sum(#keyPath(TestEntity1.testDecimal))),
                     queryClauses
@@ -1055,7 +1055,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, String>(.sum(#keyPath(TestEntity1.testString))),
                     queryClauses
@@ -1064,7 +1064,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSString>(.sum(#keyPath(TestEntity1.testString))),
                     queryClauses
@@ -1073,7 +1073,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Data>(.sum(#keyPath(TestEntity1.testData))),
                     queryClauses
@@ -1082,7 +1082,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSData>(.sum(#keyPath(TestEntity1.testData))),
                     queryClauses
@@ -1091,7 +1091,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Date>(.sum(#keyPath(TestEntity1.testDate))),
                     queryClauses
@@ -1100,7 +1100,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDate>(.sum(#keyPath(TestEntity1.testDate))),
                     queryClauses
@@ -1109,7 +1109,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSManagedObjectID>(.sum(#keyPath(TestEntity1.testEntityID))),
                     queryClauses
@@ -1133,7 +1133,7 @@ class QueryTests: BaseTestDataTestCase {
             ]
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Bool>(.objectID()),
                     queryClauses
@@ -1142,7 +1142,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int8>(.objectID()),
                     queryClauses
@@ -1151,7 +1151,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int16>(.objectID()),
                     queryClauses
@@ -1160,7 +1160,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int32>(.objectID()),
                     queryClauses
@@ -1169,7 +1169,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int64>(.objectID()),
                     queryClauses
@@ -1178,7 +1178,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Int>(.objectID()),
                     queryClauses
@@ -1187,7 +1187,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Double>(.objectID()),
                     queryClauses
@@ -1196,7 +1196,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Float>(.objectID()),
                     queryClauses
@@ -1205,7 +1205,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSNumber>(.objectID()),
                     queryClauses
@@ -1214,7 +1214,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDecimalNumber>(.objectID()),
                     queryClauses
@@ -1223,7 +1223,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, String>(.objectID()),
                     queryClauses
@@ -1232,7 +1232,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSString>(.objectID()),
                     queryClauses
@@ -1241,7 +1241,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Data>(.objectID()),
                     queryClauses
@@ -1250,7 +1250,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSData>(.objectID()),
                     queryClauses
@@ -1259,7 +1259,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, Date>(.objectID()),
                     queryClauses
@@ -1268,7 +1268,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSDate>(.objectID()),
                     queryClauses
@@ -1277,7 +1277,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                     from,
                     Select<TestEntity1, NSManagedObjectID>(.objectID()),
                     queryClauses
@@ -1302,7 +1302,7 @@ class QueryTests: BaseTestDataTestCase {
             ]
             do {
                 
-                let values = stack.queryAttributes(
+                let values = try stack.queryAttributes(
                     from,
                     Select<TestEntity1, NSDictionary>(
                         #keyPath(TestEntity1.testBoolean),
@@ -1353,7 +1353,7 @@ class QueryTests: BaseTestDataTestCase {
             let queryClauses: [QueryClause] = []
             do {
                 
-                let values = stack.queryAttributes(
+                let values = try stack.queryAttributes(
                     from,
                     Select<TestEntity1, NSDictionary>(
                         .sum(#keyPath(TestEntity1.testBoolean)),
@@ -1380,7 +1380,7 @@ class QueryTests: BaseTestDataTestCase {
             }
             do {
                 
-                let values = stack.queryAttributes(
+                let values = try stack.queryAttributes(
                     from,
                     Select(
                         .sum(#keyPath(TestEntity1.testBoolean), as: "testSum"),

CoreStoreTests/SectionByTests.swift

@@ -2,7 +2,7 @@
 //  SectionByTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -31,7 +31,7 @@ import CoreStore
 
 //MARK: - SectionByTests
 
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 final class SectionByTests: XCTestCase {
     
     @objc

CoreStoreTests/SelectTests.swift

@@ -2,7 +2,7 @@
 //  SelectTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

CoreStoreTests/SetupTests.swift

@@ -2,7 +2,7 @@
 //  SetupTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

CoreStoreTests/StorageInterfaceTests.swift

@@ -2,7 +2,7 @@
 //  StorageInterfaceTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -83,7 +83,21 @@ final class StorageInterfaceTests: XCTestCase {
         let store = SQLiteStore()
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertNil(store.configuration)
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
         
         XCTAssertEqual(store.fileURL, SQLiteStore.defaultFileURL)
         XCTAssertTrue(store.migrationMappingProviders.isEmpty)
@@ -93,8 +107,8 @@ final class StorageInterfaceTests: XCTestCase {
     @objc
     dynamic func test_ThatFileURLSQLiteStores_ConfigureCorrectly() {
         
-        let fileURL = NSURL(fileURLWithPath: NSTemporaryDirectory())
-            .appendingPathComponent(NSUUID().uuidString, isDirectory: false)!
+        let fileURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent(UUID().uuidString, isDirectory: false)
             .appendingPathExtension("db")
         let mappingProvider = XcodeSchemaMappingProvider(
             from: "V1", to: "V2",
@@ -109,7 +123,21 @@ final class StorageInterfaceTests: XCTestCase {
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
         
         XCTAssertEqual(store.fileURL, fileURL)
         XCTAssertEqual(store.migrationMappingProviders as! [XcodeSchemaMappingProvider], [mappingProvider])
@@ -132,7 +160,21 @@ final class StorageInterfaceTests: XCTestCase {
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
         
         XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.defaultRootDirectory)
         XCTAssertEqual(store.fileURL.lastPathComponent, fileName)
@@ -167,7 +209,21 @@ final class StorageInterfaceTests: XCTestCase {
         let store = SQLiteStore.legacy()
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertNil(store.configuration)
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
         
         XCTAssertEqual(store.fileURL, SQLiteStore.legacyDefaultFileURL)
         XCTAssertTrue(store.migrationMappingProviders.isEmpty)
@@ -190,7 +246,21 @@ final class StorageInterfaceTests: XCTestCase {
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
         
         XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.legacyDefaultRootDirectory)
         XCTAssertEqual(store.fileURL.lastPathComponent, fileName)

CoreStoreTests/TestEntities/TestEntity1.swift

@@ -2,7 +2,7 @@
 //  TestEntity1.swift
 //  CoreStore
 //
-//  Copyright © 2014 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

CoreStoreTests/TestEntities/TestEntity2.swift

@@ -2,7 +2,7 @@
 //  TestEntity1.swift
 //  CoreStore
 //
-//  Copyright © 2014 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

CoreStoreTests/TransactionTests.swift

@@ -2,7 +2,7 @@
 //  TransactionTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -69,9 +69,9 @@ final class TransactionTests: BaseTestCase {
                 self.checkExpectationsImmediately()
                 XCTAssertTrue(hasChanges)
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                 
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                 XCTAssertNotNil(object)
                 XCTAssertEqual(object?.fetchSource()?.unsafeContext(), stack.mainContext)
                 XCTAssertEqual(object?.querySource()?.unsafeContext(), stack.mainContext)
@@ -84,14 +84,14 @@ final class TransactionTests: BaseTestCase {
             do {
                 
                 let updateExpectation = self.expectation(description: "update")
-                let hasChanges: Bool = try! stack.perform(
+                let hasChanges: Bool = try stack.perform(
                     synchronous: { (transaction) in
                         
                         defer {
                             
                             updateExpectation.fulfill()
                         }
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                             // TODO: convert fetch methods to throwing methods
                             XCTFail() 
                             try transaction.cancel()
@@ -107,9 +107,9 @@ final class TransactionTests: BaseTestCase {
                 self.checkExpectationsImmediately()
                 XCTAssertTrue(hasChanges)
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                 
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                 XCTAssertNotNil(object)
                 XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                 XCTAssertEqual(object?.testString, "string1_edit")
@@ -128,7 +128,7 @@ final class TransactionTests: BaseTestCase {
                                 
                                 deleteExpectation.fulfill()
                             }
-                            let object = transaction.fetchOne(From<TestEntity1>())
+                            let object = try transaction.fetchOne(From<TestEntity1>())
                             transaction.delete(object)
                             return transaction.hasChanges
                         }
@@ -141,9 +141,9 @@ final class TransactionTests: BaseTestCase {
                 }
                 self.checkExpectationsImmediately()
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
                 
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                 XCTAssertNil(object)
             }
         }
@@ -184,10 +184,10 @@ final class TransactionTests: BaseTestCase {
                 }
                 self.checkExpectationsImmediately()
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
                 
-                let object = stack.fetchOne(From<TestEntity1>("Config1"))
+                let object = try stack.fetchOne(From<TestEntity1>("Config1"))
                 XCTAssertNotNil(object)
                 XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                 XCTAssertEqual(object?.testString, "string1")
@@ -206,7 +206,7 @@ final class TransactionTests: BaseTestCase {
                                 
                                 updateExpectation.fulfill()
                             }
-                            guard let object = transaction.fetchOne(From<TestEntity1>("Config1")) else {
+                            guard let object = try transaction.fetchOne(From<TestEntity1>("Config1")) else {
                                 
                                 XCTFail()
                                 try transaction.cancel()
@@ -226,10 +226,10 @@ final class TransactionTests: BaseTestCase {
                 }
                 self.checkExpectationsImmediately()
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
                 
-                let object = stack.fetchOne(From<TestEntity1>("Config1"))
+                let object = try stack.fetchOne(From<TestEntity1>("Config1"))
                 XCTAssertNotNil(object)
                 XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                 XCTAssertEqual(object?.testString, "string1_edit")
@@ -248,7 +248,7 @@ final class TransactionTests: BaseTestCase {
                                 
                                 deleteExpectation.fulfill()
                             }
-                            let object = transaction.fetchOne(From<TestEntity1>("Config1"))
+                            let object = try transaction.fetchOne(From<TestEntity1>("Config1"))
                             transaction.delete(object)
                             
                             return transaction.hasChanges
@@ -262,8 +262,8 @@ final class TransactionTests: BaseTestCase {
                 }
                 self.checkExpectationsImmediately()
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 0)
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
             }
         }
     }
@@ -294,9 +294,9 @@ final class TransactionTests: BaseTestCase {
                 )
                 self.checkExpectationsImmediately()
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
                 
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                 XCTAssertNil(object)
             }
             let testDate = Date()
@@ -329,7 +329,7 @@ final class TransactionTests: BaseTestCase {
                             
                             updateDiscardExpectation.fulfill()
                         }
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                             
                             XCTFail()
                             try transaction.cancel()
@@ -343,9 +343,9 @@ final class TransactionTests: BaseTestCase {
                 )
                 self.checkExpectationsImmediately()
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                 
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                 XCTAssertNotNil(object)
                 XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                 XCTAssertEqual(object?.testString, "string1")
@@ -362,7 +362,7 @@ final class TransactionTests: BaseTestCase {
                             
                             deleteDiscardExpectation.fulfill()
                         }
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                             
                             XCTFail()
                             try transaction.cancel()
@@ -374,9 +374,9 @@ final class TransactionTests: BaseTestCase {
                 )
                 self.checkExpectationsImmediately()
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                 
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                 XCTAssertNotNil(object)
                 XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                 XCTAssertEqual(object?.testString, "string1")
@@ -387,7 +387,7 @@ final class TransactionTests: BaseTestCase {
     }
     
     
-    @available(OSX 10.12, *)
+    @available(macOS 10.12, *)
     @objc
     dynamic func test_ThatSynchronousTransactions_CanCommitWithoutWaitingForMerges() {
         
@@ -520,19 +520,26 @@ final class TransactionTests: BaseTestCase {
                     success: { (hasChanges) in
                         
                         XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>())
-                        XCTAssertNotNil(object)
-                        XCTAssertEqual(object?.fetchSource()?.unsafeContext(), stack.mainContext)
-                        XCTAssertEqual(object?.querySource()?.unsafeContext(), stack.mainContext)
-                        
-                        XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
-                        XCTAssertEqual(object?.testString, "string1")
-                        XCTAssertEqual(object?.testNumber, 100)
-                        XCTAssertEqual(object?.testDate, testDate)
-                        createExpectation.fulfill()
+
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
+
+                            let object = try stack.fetchOne(From<TestEntity1>())
+                            XCTAssertNotNil(object)
+                            XCTAssertEqual(object?.fetchSource()?.unsafeContext(), stack.mainContext)
+                            XCTAssertEqual(object?.querySource()?.unsafeContext(), stack.mainContext)
+
+                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
+                            XCTAssertEqual(object?.testString, "string1")
+                            XCTAssertEqual(object?.testNumber, 100)
+                            XCTAssertEqual(object?.testDate, testDate)
+                            createExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                     },
                     failure: { _ in
                         
@@ -546,7 +553,7 @@ final class TransactionTests: BaseTestCase {
                 stack.perform(
                     asynchronous: { (transaction) -> Bool in
                         
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                             
                             XCTFail()
                             try transaction.cancel()
@@ -560,16 +567,23 @@ final class TransactionTests: BaseTestCase {
                     success: { (hasChanges) in
                         
                         XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>())
-                        XCTAssertNotNil(object)
-                        XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
-                        XCTAssertEqual(object?.testString, "string1_edit")
-                        XCTAssertEqual(object?.testNumber, 200)
-                        XCTAssertEqual(object?.testDate, Date.distantFuture)
-                        updateExpectation.fulfill()
+
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
+
+                            let object = try stack.fetchOne(From<TestEntity1>())
+                            XCTAssertNotNil(object)
+                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
+                            XCTAssertEqual(object?.testString, "string1_edit")
+                            XCTAssertEqual(object?.testNumber, 200)
+                            XCTAssertEqual(object?.testDate, Date.distantFuture)
+                            updateExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                     },
                     failure: { _ in
                         
@@ -583,7 +597,7 @@ final class TransactionTests: BaseTestCase {
                 stack.perform(
                     asynchronous: { (transaction) -> Bool in
                         
-                        let object = transaction.fetchOne(From<TestEntity1>())
+                        let object = try transaction.fetchOne(From<TestEntity1>())
                         transaction.delete(object)
                         
                         return transaction.hasChanges
@@ -591,12 +605,19 @@ final class TransactionTests: BaseTestCase {
                     success: { (hasChanges) in
                         
                         XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>())
-                        XCTAssertNil(object)
-                        deleteExpectation.fulfill()
+
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
+
+                            let object = try stack.fetchOne(From<TestEntity1>())
+                            XCTAssertNil(object)
+                            deleteExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                     },
                     failure: { _ in
                         
@@ -631,17 +652,24 @@ final class TransactionTests: BaseTestCase {
                     success: { (hasChanges) in
                         
                         XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>("Config1"))
-                        XCTAssertNotNil(object)
-                        XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
-                        XCTAssertEqual(object?.testString, "string1")
-                        XCTAssertEqual(object?.testNumber, 100)
-                        XCTAssertEqual(object?.testDate, testDate)
-                        createExpectation.fulfill()
+
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
+
+                            let object = try stack.fetchOne(From<TestEntity1>("Config1"))
+                            XCTAssertNotNil(object)
+                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
+                            XCTAssertEqual(object?.testString, "string1")
+                            XCTAssertEqual(object?.testNumber, 100)
+                            XCTAssertEqual(object?.testDate, testDate)
+                            createExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                     },
                     failure: { _ in
                         
@@ -655,7 +683,7 @@ final class TransactionTests: BaseTestCase {
                 stack.perform(
                     asynchronous: { (transaction) -> Bool in
                         
-                        guard let object = transaction.fetchOne(From<TestEntity1>("Config1")) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>("Config1")) else {
                             
                             XCTFail()
                             try transaction.cancel()
@@ -669,17 +697,24 @@ final class TransactionTests: BaseTestCase {
                     success: { (hasChanges) in
                         
                         XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>("Config1"))
-                        XCTAssertNotNil(object)
-                        XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
-                        XCTAssertEqual(object?.testString, "string1_edit")
-                        XCTAssertEqual(object?.testNumber, 200)
-                        XCTAssertEqual(object?.testDate, Date.distantFuture)
-                        updateExpectation.fulfill()
+
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
+
+                            let object = try stack.fetchOne(From<TestEntity1>("Config1"))
+                            XCTAssertNotNil(object)
+                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
+                            XCTAssertEqual(object?.testString, "string1_edit")
+                            XCTAssertEqual(object?.testNumber, 200)
+                            XCTAssertEqual(object?.testDate, Date.distantFuture)
+                            updateExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                     },
                     failure: { _ in
                         
@@ -693,7 +728,7 @@ final class TransactionTests: BaseTestCase {
                 stack.perform(
                     asynchronous: { (transaction) -> Bool in
                         
-                        let object = transaction.fetchOne(From<TestEntity1>("Config1"))
+                        let object = try transaction.fetchOne(From<TestEntity1>("Config1"))
                         transaction.delete(object)
                         
                         return transaction.hasChanges
@@ -701,11 +736,21 @@ final class TransactionTests: BaseTestCase {
                     success: { (hasChanges) in
                         
                         XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 0)
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
-                        
-                        deleteExpectation.fulfill()
+
+                        do {
+
+                            let configCount = try stack.fetchCount(From<TestEntity1>("Config1"))
+                            XCTAssertEqual(configCount, 0)
+
+                            let defaultCount = try stack.fetchCount(From<TestEntity1>(nil))
+                            XCTAssertEqual(defaultCount, 0)
+
+                            deleteExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                     },
                     failure: { _ in
                         
@@ -754,8 +799,8 @@ final class TransactionTests: BaseTestCase {
                 stack.perform(
                     asynchronous: { (transaction) -> Bool in
                         
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 0)
-                        XCTAssertNil(transaction.fetchOne(From<TestEntity1>()))
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 0)
+                        XCTAssertNil(try transaction.fetchOne(From<TestEntity1>()))
                         
                         let object = transaction.create(Into<TestEntity1>())
                         object.testEntityID = NSNumber(value: 1)
@@ -782,7 +827,7 @@ final class TransactionTests: BaseTestCase {
                 stack.perform(
                     asynchronous: { (transaction) -> Void in
                         
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                             
                             XCTFail()
                             return
@@ -811,9 +856,9 @@ final class TransactionTests: BaseTestCase {
                 stack.perform(
                     asynchronous: { (transaction) -> Void in
                         
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                         
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                             
                             XCTFail()
                             try transaction.cancel()
@@ -835,15 +880,22 @@ final class TransactionTests: BaseTestCase {
                     failure: { (error) in
                         
                         XCTAssertEqual(error, CoreStoreError.userCancelled)
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>())
-                        XCTAssertNotNil(object)
-                        XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
-                        XCTAssertEqual(object?.testString, "string1")
-                        XCTAssertEqual(object?.testNumber, 100)
-                        XCTAssertEqual(object?.testDate, testDate)
-                        deleteDiscardExpectation.fulfill()
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
+
+                            let object = try stack.fetchOne(From<TestEntity1>())
+                            XCTAssertNotNil(object)
+                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
+                            XCTAssertEqual(object?.testString, "string1")
+                            XCTAssertEqual(object?.testNumber, 100)
+                            XCTAssertEqual(object?.testDate, testDate)
+                            deleteDiscardExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                     }
                 )
             }
@@ -878,9 +930,9 @@ final class TransactionTests: BaseTestCase {
                     XCTAssertTrue(transaction.hasChanges)
                     try transaction.commitAndWait()
                     
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                     
-                    let object = stack.fetchOne(From<TestEntity1>())
+                    let object = try stack.fetchOne(From<TestEntity1>())
                     XCTAssertNotNil(object)
                     XCTAssertEqual(object?.fetchSource()?.unsafeContext(), stack.mainContext)
                     XCTAssertEqual(object?.querySource()?.unsafeContext(), stack.mainContext)
@@ -897,7 +949,7 @@ final class TransactionTests: BaseTestCase {
             }
             do {
                 
-                guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                     
                     XCTFail()
                     return
@@ -911,9 +963,9 @@ final class TransactionTests: BaseTestCase {
                     XCTAssertTrue(transaction.hasChanges)
                     try transaction.commitAndWait()
                     
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                     
-                    let object = stack.fetchOne(From<TestEntity1>())
+                    let object = try stack.fetchOne(From<TestEntity1>())
                     XCTAssertNotNil(object)
                     XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                     XCTAssertEqual(object?.testString, "string1_edit")
@@ -927,7 +979,7 @@ final class TransactionTests: BaseTestCase {
             }
             do {
                 
-                let object = transaction.fetchOne(From<TestEntity1>())
+                let object = try transaction.fetchOne(From<TestEntity1>())
                 transaction.delete(object)
                 
                 do {
@@ -935,8 +987,8 @@ final class TransactionTests: BaseTestCase {
                     XCTAssertTrue(transaction.hasChanges)
                     try transaction.commitAndWait()
                     
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
-                    XCTAssertNil(stack.fetchOne(From<TestEntity1>()))
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
+                    XCTAssertNil(try stack.fetchOne(From<TestEntity1>()))
                 }
                 catch {
                     
@@ -967,10 +1019,10 @@ final class TransactionTests: BaseTestCase {
                     XCTAssertTrue(transaction.hasChanges)
                     try transaction.commitAndWait()
                     
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
                     
-                    let object = stack.fetchOne(From<TestEntity1>("Config1"))
+                    let object = try stack.fetchOne(From<TestEntity1>("Config1"))
                     XCTAssertNotNil(object)
                     XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                     XCTAssertEqual(object?.testString, "string1")
@@ -984,7 +1036,7 @@ final class TransactionTests: BaseTestCase {
             }
             do {
                 
-                guard let object = transaction.fetchOne(From<TestEntity1>("Config1")) else {
+                guard let object = try transaction.fetchOne(From<TestEntity1>("Config1")) else {
                     
                     XCTFail()
                     return
@@ -998,10 +1050,10 @@ final class TransactionTests: BaseTestCase {
                     XCTAssertTrue(transaction.hasChanges)
                     try transaction.commitAndWait()
                     
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
                     
-                    let object = stack.fetchOne(From<TestEntity1>("Config1"))
+                    let object = try stack.fetchOne(From<TestEntity1>("Config1"))
                     XCTAssertNotNil(object)
                     XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                     XCTAssertEqual(object?.testString, "string1_edit")
@@ -1015,7 +1067,7 @@ final class TransactionTests: BaseTestCase {
             }
             do {
                 
-                let object = transaction.fetchOne(From<TestEntity1>("Config1"))
+                let object = try transaction.fetchOne(From<TestEntity1>("Config1"))
                 transaction.delete(object)
                 
                 do {
@@ -1023,8 +1075,8 @@ final class TransactionTests: BaseTestCase {
                     XCTAssertTrue(transaction.hasChanges)
                     try transaction.commitAndWait()
                     
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 0)
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 0)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
                 }
                 catch {
                     
@@ -1050,11 +1102,11 @@ final class TransactionTests: BaseTestCase {
                 
                 transaction.rollback()
                 
-                XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 0)
-                XCTAssertNil(transaction.fetchOne(From<TestEntity1>()))
+                XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 0)
+                XCTAssertNil(try transaction.fetchOne(From<TestEntity1>()))
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
-                XCTAssertNil(stack.fetchOne(From<TestEntity1>()))
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
+                XCTAssertNil(try stack.fetchOne(From<TestEntity1>()))
             }
             
             let testDate = Date()
@@ -1079,7 +1131,7 @@ final class TransactionTests: BaseTestCase {
             
             do {
                 
-                guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                     
                     XCTFail()
                     return
@@ -1090,8 +1142,8 @@ final class TransactionTests: BaseTestCase {
                 
                 transaction.rollback()
                 
-                XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
-                if let object = transaction.fetchOne(From<TestEntity1>()) {
+                XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
+                if let object = try transaction.fetchOne(From<TestEntity1>()) {
                     
                     XCTAssertEqual(object.testEntityID, NSNumber(value: 1))
                     XCTAssertEqual(object.testString, "string1")
@@ -1103,8 +1155,8 @@ final class TransactionTests: BaseTestCase {
                     XCTFail()
                 }
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
-                if let object = stack.fetchOne(From<TestEntity1>()) {
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
+                if let object = try stack.fetchOne(From<TestEntity1>()) {
                     
                     XCTAssertEqual(object.testEntityID, NSNumber(value: 1))
                     XCTAssertEqual(object.testString, "string1")
@@ -1119,7 +1171,7 @@ final class TransactionTests: BaseTestCase {
             
             do {
                 
-                guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                     
                     XCTFail()
                     return
@@ -1128,8 +1180,8 @@ final class TransactionTests: BaseTestCase {
                 
                 transaction.rollback()
                 
-                XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
-                if let object = transaction.fetchOne(From<TestEntity1>()) {
+                XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
+                if let object = try transaction.fetchOne(From<TestEntity1>()) {
                     
                     XCTAssertEqual(object.testEntityID, NSNumber(value: 1))
                     XCTAssertEqual(object.testString, "string1")
@@ -1141,8 +1193,8 @@ final class TransactionTests: BaseTestCase {
                     XCTFail()
                 }
                 
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
-                if let object = stack.fetchOne(From<TestEntity1>()) {
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
+                if let object = try stack.fetchOne(From<TestEntity1>()) {
                     
                     XCTAssertEqual(object.testEntityID, NSNumber(value: 1))
                     XCTAssertEqual(object.testString, "string1")

CoreStoreTests/TweakTests.swift

@@ -2,7 +2,7 @@
 //  TweakTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

CoreStoreTests/WhereTests.swift

@@ -2,7 +2,7 @@
 //  WhereTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2014 John Rommel Estropia
+Copyright © 2018 John Rommel Estropia
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Package.swift

@@ -2,7 +2,7 @@
 //  Package.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,7 @@ import PackageDescription
 let targets: [Target]
 #if os(iOS)
 targets = [Target(name: "CoreStore iOS")]
-#elseif os(OSX)
+#elseif os(macOS)
 targets = [Target(name: "CoreStore OSX")]
 #elseif os(watchOS)
 targets = [Target(name: "CoreStore watchOS")]

Playground.playground/Contents.swift

@@ -0,0 +1,53 @@
+import UIKit
+import CoreStore
+
+/// Model Declaration =====
+class Animal: CoreStoreObject {
+    let species = Value.Required<String>("species", initial: "Swift")
+    let master = Relationship.ToOne<Person>("master")
+    let color = Transformable.Optional<UIColor>("color", initial: .orange)
+}
+
+class Person: CoreStoreObject {
+    let name = Value.Optional<String>("name")
+    let pets = Relationship.ToManyUnordered<Animal>("pets", inverse: { $0.master })
+}
+/// =======================
+
+/// Stack setup ===========
+let dataStack = DataStack(
+    CoreStoreSchema(
+        modelVersion: "V1",
+        entities: [
+            Entity<Animal>("Animal"),
+            Entity<Person>("Person")
+        ]
+    )
+)
+try dataStack.addStorageAndWait(SQLiteStore(fileName: "data.sqlite"))
+/// =======================
+
+/// Transactions ==========
+dataStack.perform(synchronous: { transaction in
+
+    let animal = transaction.create(Into<Animal>())
+    animal.species .= "Sparrow"
+    animal.color .= .yellow
+
+    let person = transaction.create(Into<Person>())
+    person.name .= "John"
+    person.pets.value.insert(animal)
+})
+/// =======================
+
+/// Accessing Objects =====
+let bird = dataStack.fetchOne(From<Animal>().where(\.species == "Sparrow"))!
+bird.species.value
+bird.color.value
+print(bird)
+
+let owner = bird.master.value!
+owner.name.value
+owner.pets.count
+print(owner)
+/// =======================

Playground.playground/contents.xcplayground

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='5.0' target-platform='ios' executeOnSourceChanges='false'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>

Playground.playground/playground.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+</Workspace>

README.md

@@ -18,7 +18,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
 <br />
 </p>
 
-* **Swift 4.1:** iOS 9+ / macOS 10.10+ / watchOS 2.0+ / tvOS 9.0+
+* **Swift 4.2:** iOS 9+ / macOS 10.10+ / watchOS 2.0+ / tvOS 9.0+
 * Other Swift versions: [Swift 3.2(version 4.2.3)](https://github.com/JohnEstropia/CoreStore/tree/4.2.3)
 
 Upgrading from CoreStore 4.2 (Swift 3.2) to 5.x (Swift 4.x)? Check out the [new features](#features) and make sure to read the [Change logs](https://github.com/JohnEstropia/CoreStore/releases).
@@ -64,7 +64,7 @@ CoreStore was (and is) heavily shaped by real-world needs of developing data-dep
         - [Starting migrations](#starting-migrations)
         - [Progressive migrations](#progressive-migrations)
         - [Forecasting migrations](#forecasting-migrations)
-        - [Custom migratoins](#custom-migrations)
+        - [Custom migrations](#custom-migrations)
     - [Saving and processing transactions](#saving-and-processing-transactions)
         - [Transaction types](#transaction-types)
             - [Asynchronous transactions](#asynchronous-transactions)

Sources/AsynchronousDataTransaction.swift

@@ -2,7 +2,7 @@
 //  AsynchronousDataTransaction.swift
 //  CoreStore
 //
-//  Copyright © 2015 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/AttributeProtocol.swift

@@ -2,7 +2,7 @@
 //  AttributeProtocol.swift
 //  CoreStore
 //
-//  Copyright © 2017 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -41,7 +41,7 @@ internal protocol AttributeProtocol: class {
     var renamingIdentifier: () -> String? { get }
     var defaultValue: () -> Any? { get }
     var affectedByKeyPaths: () -> Set<String> { get }
-    var parentObject: CoreStoreObject? { get set }
+    var rawObject: CoreStoreManagedObject? { get set }
     var getter: CoreStoreManagedObject.CustomGetter? { get }
     var setter: CoreStoreManagedObject.CustomSetter? { get }
 }

Sources/BaseDataTransaction+Importing.swift

@@ -2,7 +2,7 @@
 //  BaseDataTransaction+Importing.swift
 //  CoreStore
 //
-//  Copyright © 2015 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -80,7 +80,7 @@ public extension BaseDataTransaction {
             
             try autoreleasepool {
               
-                let entityType = type(of: object)
+                let entityType = cs_dynamicType(of: object)
                 guard entityType.shouldInsert(from: source, in: self) else {
                     
                     return
@@ -151,7 +151,7 @@ public extension BaseDataTransaction {
                     return nil
                 }
                 
-                if let object = self.fetchOne(From(entityType), Where<D>(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
+                if let object = try self.fetchOne(From(entityType), Where<D>(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
                     
                     guard entityType.shouldUpdate(from: source, in: self) else {
                         
@@ -215,7 +215,8 @@ public extension BaseDataTransaction {
                 importSourceByID = try autoreleasepool { try preProcess(importSourceByID) }
 
                 var existingObjectsByID = Dictionary<D.UniqueIDType, D>()
-                self.fetchAll(From(entityType), Where<D>(entityType.uniqueIDKeyPath, isMemberOf: sortedIDs))?
+                try self
+                    .fetchAll(From(entityType), Where<D>(entityType.uniqueIDKeyPath, isMemberOf: sortedIDs))
                     .forEach { existingObjectsByID[$0.uniqueIDValue] = $0 }
               
                 var processedObjectIDs = Set<D.UniqueIDType>()

Sources/BaseDataTransaction+Querying.swift

@@ -2,7 +2,7 @@
 //  BaseDataTransaction+Querying.swift
 //  CoreStore
 //
-//  Copyright © 2015 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -39,13 +39,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      - returns: the number of `DynamicObject`s deleted
      */
     @discardableResult
-    public func deleteAll<D>(_ from: From<D>, _ deleteClauses: DeleteClause...) -> Int? {
+    public func deleteAll<D>(_ from: From<D>, _ deleteClauses: DeleteClause...) throws -> Int {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to delete from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.deleteAll(from, deleteClauses)
+        return try self.context.deleteAll(from, deleteClauses)
     }
     
     /**
@@ -56,13 +56,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      - returns: the number of `DynamicObject`s deleted
      */
     @discardableResult
-    public func deleteAll<D>(_ from: From<D>, _ deleteClauses: [DeleteClause]) -> Int? {
+    public func deleteAll<D>(_ from: From<D>, _ deleteClauses: [DeleteClause]) throws -> Int {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to delete from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.deleteAll(from, deleteClauses)
+        return try self.context.deleteAll(from, deleteClauses)
     }
     
     /**
@@ -74,14 +74,14 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      - returns: the number of `DynamicObject`s deleted
      */
     @discardableResult
-    public func deleteAll<B: FetchChainableBuilderType>(_ clauseChain: B) -> Int? {
+    public func deleteAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to delete from a \(cs_typeName(self)) outside its designated queue."
         )
         
-        return self.context.deleteAll(clauseChain.from, clauseChain.fetchClauses)
+        return try self.context.deleteAll(clauseChain.from, clauseChain.fetchClauses)
     }
     
     
@@ -136,15 +136,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s
+     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchOne<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> D? {
+    public func fetchOne<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> D? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchOne(from, fetchClauses)
+        return try self.context.fetchOne(from, fetchClauses)
     }
     
     /**
@@ -152,15 +153,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s
+     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchOne<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> D? {
+    public func fetchOne<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> D? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchOne(from, fetchClauses)
+        return try self.context.fetchOne(from, fetchClauses)
     }
     
     /**
@@ -173,15 +175,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      )
      ```
      - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
-     - returns: the first `DynamicObject` instance that satisfies the specified `FetchChainableBuilderType`
+     - returns: the first `DynamicObject` instance that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchOne<B: FetchChainableBuilderType>(_ clauseChain: B) -> B.ObjectType? {
+    public func fetchOne<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> B.ObjectType? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchOne(clauseChain)
+        return try self.context.fetchOne(clauseChain)
     }
     
     /**
@@ -189,15 +192,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s
+     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchAll<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> [D]? {
+    public func fetchAll<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [D] {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchAll(from, fetchClauses)
+        return try self.context.fetchAll(from, fetchClauses)
     }
     
     /**
@@ -205,15 +209,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s
+     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchAll<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> [D]? {
+    public func fetchAll<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [D] {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchAll(from, fetchClauses)
+        return try self.context.fetchAll(from, fetchClauses)
     }
     
     /**
@@ -226,15 +231,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      )
      ```
      - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
-     - returns: all `DynamicObject` instances that satisfy the specified `FetchChainableBuilderType`
+     - returns: all `DynamicObject` instances that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchAll<B: FetchChainableBuilderType>(_ clauseChain: B) -> [B.ObjectType]? {
+    public func fetchAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [B.ObjectType] {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchAll(clauseChain)
+        return try self.context.fetchAll(clauseChain)
     }
     
     /**
@@ -242,15 +248,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: the number `DynamicObject`s that satisfy the specified `FetchClause`s
+     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchCount<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> Int? {
+    public func fetchCount<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> Int {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchCount(from, fetchClauses)
+        return try self.context.fetchCount(from, fetchClauses)
     }
     
     /**
@@ -258,15 +265,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: the number `DynamicObject`s that satisfy the specified `FetchClause`s
+     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchCount<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> Int? {
+    public func fetchCount<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> Int {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchCount(from, fetchClauses)
+        return try self.context.fetchCount(from, fetchClauses)
     }
     
     /**
@@ -279,15 +287,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      )
      ```
      - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
-     - returns: the number `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`
+     - returns: the number of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchCount<B: FetchChainableBuilderType>(_ clauseChain: B) -> Int? {
+    public func fetchCount<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchCount(clauseChain)
+        return try self.context.fetchCount(clauseChain)
     }
     
     /**
@@ -295,15 +304,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s
+     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
+    public func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchObjectID(from, fetchClauses)
+        return try self.context.fetchObjectID(from, fetchClauses)
     }
     
     /**
@@ -311,15 +321,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s
+     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
+    public func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchObjectID(from, fetchClauses)
+        return try self.context.fetchObjectID(from, fetchClauses)
     }
     
     /**
@@ -332,15 +343,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      )
      ```
      - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
-     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchChainableBuilderType`
+     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchObjectID<B: FetchChainableBuilderType>(_ clauseChain: B) -> NSManagedObjectID? {
+    public func fetchObjectID<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> NSManagedObjectID? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchObjectID(clauseChain)
+        return try self.context.fetchObjectID(clauseChain)
     }
     
     /**
@@ -348,15 +360,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s
+     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
+    public func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchObjectIDs(from, fetchClauses)
+        return try self.context.fetchObjectIDs(from, fetchClauses)
     }
     
     /**
@@ -364,15 +377,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s
+     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
+    public func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchObjectIDs(from, fetchClauses)
+        return try self.context.fetchObjectIDs(from, fetchClauses)
     }
     
     /**
@@ -385,15 +399,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      )
      ```
      - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
-     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`
+     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func fetchObjectIDs<B: FetchChainableBuilderType>(_ clauseChain: B) -> [NSManagedObjectID]? {
+    public func fetchObjectIDs<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [NSManagedObjectID] {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.fetchObjectIDs(clauseChain)
+        return try self.context.fetchObjectIDs(clauseChain)
     }
     
     
@@ -407,15 +422,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      - parameter from: a `From` clause indicating the entity type
      - parameter selectClause: a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
      - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-     - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
+     - returns: the result of the the query, or `nil` if no match was found. The type of the return value is specified by the generic type of the `Select<U>` parameter.
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: QueryClause...) -> U? {
+    public func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: QueryClause...) throws -> U? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.queryValue(from, selectClause, queryClauses)
+        return try self.context.queryValue(from, selectClause, queryClauses)
     }
     
     /**
@@ -426,15 +442,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      - parameter from: a `From` clause indicating the entity type
      - parameter selectClause: a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
      - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-     - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
+     - returns: the result of the the query, or `nil` if no match was found. The type of the return value is specified by the generic type of the `Select<U>` parameter.
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: [QueryClause]) -> U? {
+    public func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: [QueryClause]) throws -> U? {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.queryValue(from, selectClause, queryClauses)
+        return try self.context.queryValue(from, selectClause, queryClauses)
     }
     
     /**
@@ -449,15 +466,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      )
      ```
      - parameter clauseChain: a `QueryChainableBuilderType` indicating the property/aggregate to fetch and the series of queries for the request.
-     - returns: the result of the the query as specified by the `QueryChainableBuilderType`
+     - returns: the result of the the query as specified by the `QueryChainableBuilderType`, or `nil` if no match was found.
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func queryValue<B: QueryChainableBuilderType>(_ clauseChain: B) -> B.ResultType? where B.ResultType: QueryableAttributeType {
+    public func queryValue<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> B.ResultType? where B.ResultType: QueryableAttributeType {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.queryValue(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
+        return try self.context.queryValue(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
     }
     
     /**
@@ -469,14 +487,15 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      - parameter selectClause: a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
      - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
      - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: QueryClause...) -> [[String: Any]]? {
+    public func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.queryAttributes(from, selectClause, queryClauses)
+        return try self.context.queryAttributes(from, selectClause, queryClauses)
     }
     
     /**
@@ -488,14 +507,15 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      - parameter selectClause: a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
      - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
      - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: [QueryClause]) -> [[String: Any]]? {
+    public func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.queryAttributes(from, selectClause, queryClauses)
+        return try self.context.queryAttributes(from, selectClause, queryClauses)
     }
     
     /**
@@ -520,14 +540,15 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      ```
      - parameter clauseChain: a `QueryChainableBuilderType` indicating the properties to fetch and the series of queries for the request.
      - returns: the result of the the query as specified by the `QueryChainableBuilderType`
+     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
      */
-    public func queryAttributes<B: QueryChainableBuilderType>(_ clauseChain: B) -> [[String: Any]]? where B.ResultType == NSDictionary {
+    public func queryAttributes<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> [[String: Any]] where B.ResultType == NSDictionary {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.context.queryAttributes(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
+        return try self.context.queryAttributes(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
     }
     
     

Sources/BaseDataTransaction.swift

@@ -2,7 +2,7 @@
 //  BaseDataTransaction.swift
 //  CoreStore
 //
-//  Copyright © 2014 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -223,7 +223,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func insertedObjects<D: DynamicObject>(_ entity: D.Type) -> Set<D> {
         
         CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to access inserted objects from a \(cs_typeName(self)) outside its designated queue."
         )
         CoreStore.assert(
@@ -241,7 +241,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func insertedObjectIDs() -> Set<NSManagedObjectID> {
         
         CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to access inserted object IDs from a \(cs_typeName(self)) outside its designated queue."
         )
         CoreStore.assert(
@@ -260,7 +260,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func insertedObjectIDs<D: DynamicObject>(_ entity: D.Type) -> Set<NSManagedObjectID> {
         
         CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to access inserted object IDs from a \(cs_typeName(self)) outside its designated queue."
         )
         CoreStore.assert(
@@ -279,7 +279,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func updatedObjects<D: DynamicObject>(_ entity: D.Type) -> Set<D> {
         
         CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to access updated objects from a \(cs_typeName(self)) outside its designated queue."
         )
         CoreStore.assert(
@@ -297,7 +297,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func updatedObjectIDs() -> Set<NSManagedObjectID> {
         
         CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to access updated object IDs from a \(cs_typeName(self)) outside its designated queue."
         )
         CoreStore.assert(
@@ -316,7 +316,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func updatedObjectIDs<D: DynamicObject>(_ entity: D.Type) -> Set<NSManagedObjectID> {
         
         CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to access updated object IDs from a \(cs_typeName(self)) outside its designated queue."
         )
         CoreStore.assert(
@@ -335,7 +335,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func deletedObjects<D: DynamicObject>(_ entity: D.Type) -> Set<D> {
         
         CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to access deleted objects from a \(cs_typeName(self)) outside its designated queue."
         )
         CoreStore.assert(
@@ -354,7 +354,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func deletedObjectIDs() -> Set<NSManagedObjectID> {
         
         CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to access deleted object IDs from a \(cs_typeName(self)) outside its designated queue."
         )
         CoreStore.assert(
@@ -373,7 +373,7 @@ public /*abstract*/ class BaseDataTransaction {
     public func deletedObjectIDs<D: DynamicObject>(_ entity: D.Type) -> Set<NSManagedObjectID> {
         
         CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
             "Attempted to access deleted object IDs from a \(cs_typeName(self)) outside its designated queue."
         )
         CoreStore.assert(

Sources/CSAsynchronousDataTransaction.swift

@@ -2,7 +2,7 @@
 //  CSAsynchronousDataTransaction.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSBaseDataTransaction+Querying.swift

@@ -2,7 +2,7 @@
 //  CSBaseDataTransaction+Querying.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -93,7 +93,8 @@ public extension CSBaseDataTransaction {
             self.swiftTransaction.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.swiftTransaction.context.fetchOne(from, fetchClauses)
+        return (try? self.swiftTransaction.context.fetchOne(from, fetchClauses))?
+            .flatMap({ $0 })
     }
     
     /**
@@ -110,7 +111,8 @@ public extension CSBaseDataTransaction {
             self.swiftTransaction.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.swiftTransaction.context.fetchAll(from, fetchClauses)
+        return (try? self.swiftTransaction.context.fetchAll(from, fetchClauses))
+            .flatMap({ $0 })
     }
     
     /**
@@ -127,9 +129,8 @@ public extension CSBaseDataTransaction {
             self.swiftTransaction.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.swiftTransaction.context
-            .fetchCount(from, fetchClauses)
-            .flatMap { NSNumber(value: $0) }
+        return (try? self.swiftTransaction.context.fetchCount(from, fetchClauses))
+            .flatMap({ NSNumber(value: $0) })
     }
     
     /**
@@ -146,7 +147,8 @@ public extension CSBaseDataTransaction {
             self.swiftTransaction.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.swiftTransaction.context.fetchObjectID(from, fetchClauses)
+        return (try? self.swiftTransaction.context.fetchObjectID(from, fetchClauses))
+            .flatMap({ $0 })
     }
     
     /**
@@ -166,7 +168,8 @@ public extension CSBaseDataTransaction {
             self.swiftTransaction.isRunningInAllowedQueue(),
             "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.swiftTransaction.context.queryValue(from, selectClause, queryClauses)
+        return (try? self.swiftTransaction.context.queryValue(from, selectClause, queryClauses))
+            .flatMap({ $0 })
     }
     
     /**
@@ -186,6 +189,7 @@ public extension CSBaseDataTransaction {
             self.swiftTransaction.isRunningInAllowedQueue(),
             "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
         )
-        return self.swiftTransaction.context.queryAttributes(from, selectClause, queryClauses)
+        return (try? self.swiftTransaction.context.queryAttributes(from, selectClause, queryClauses))
+            .flatMap({ $0 })
     }
 }

Sources/CSBaseDataTransaction.swift

@@ -2,7 +2,7 @@
 //  CSBaseDataTransaction.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSClauseTypes.swift

@@ -2,7 +2,7 @@
 //  CSClauseTypes.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSCoreStore+Migrating.swift

@@ -2,7 +2,7 @@
 //  CSCoreStore+Migrating.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSCoreStore+Observing.swift

@@ -2,7 +2,7 @@
 //  CSCoreStore+Observing.swift
 //  CoreStore
 //
-//  Copyright © 2015 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@ import CoreData
 
 // MARK: - CSCoreStore
 
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 public extension CSCoreStore {
     
     /**

Sources/CSCoreStore+Querying.swift

@@ -2,7 +2,7 @@
 //  CSCoreStore+Querying.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSCoreStore+Setup.swift

@@ -2,7 +2,7 @@
 //  CSCoreStore+Setup.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSCoreStore+Transaction.swift

@@ -2,7 +2,7 @@
 //  CSCoreStore+Transaction.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSCoreStore.swift

@@ -2,7 +2,7 @@
 //  CSCoreStore.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSDataStack+Migrating.swift

@@ -2,7 +2,7 @@
 //  CSDataStack+Migrating.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSDataStack+Observing.swift

@@ -2,7 +2,7 @@
 //  CSDataStack+Observing.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@ import CoreData
 
 // MARK: - CSDataStack
 
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 public extension CSDataStack {
     
     /**

Sources/CSDataStack+Querying.swift

@@ -2,7 +2,7 @@
 //  CSDataStack+Querying.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -93,7 +93,8 @@ public extension CSDataStack {
             Thread.isMainThread,
             "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
         )
-        return self.bridgeToSwift.mainContext.fetchOne(from, fetchClauses)
+        return (try? self.bridgeToSwift.mainContext.fetchOne(from, fetchClauses))?
+            .flatMap({ $0 })
     }
     
     /**
@@ -110,7 +111,8 @@ public extension CSDataStack {
             Thread.isMainThread,
             "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
         )
-        return self.bridgeToSwift.mainContext.fetchAll(from, fetchClauses)
+        return (try? self.bridgeToSwift.mainContext.fetchAll(from, fetchClauses))
+            .flatMap({ $0 })
     }
     
     /**
@@ -127,9 +129,8 @@ public extension CSDataStack {
             Thread.isMainThread,
             "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
         )
-        return self.bridgeToSwift.mainContext
-            .fetchCount(from, fetchClauses)
-            .flatMap { NSNumber(value: $0) }
+        return (try? self.bridgeToSwift.mainContext.fetchCount(from, fetchClauses))
+            .flatMap({ NSNumber(value: $0) })
     }
     
     /**
@@ -146,7 +147,8 @@ public extension CSDataStack {
             Thread.isMainThread,
             "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
         )
-        return self.bridgeToSwift.mainContext.fetchObjectID(from, fetchClauses)
+        return (try? self.bridgeToSwift.mainContext.fetchObjectID(from, fetchClauses))?
+            .flatMap({ $0 })
     }
     
     /**
@@ -163,7 +165,8 @@ public extension CSDataStack {
             Thread.isMainThread,
             "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
         )
-        return self.bridgeToSwift.mainContext.fetchObjectIDs(from, fetchClauses)
+        return (try? self.bridgeToSwift.mainContext.fetchObjectIDs(from, fetchClauses))
+            .flatMap({ $0 })
     }
     
     /**
@@ -183,7 +186,8 @@ public extension CSDataStack {
             Thread.isMainThread,
             "Attempted to query from a \(cs_typeName(self)) outside the main thread."
         )
-        return self.bridgeToSwift.mainContext.queryValue(from, selectClause, queryClauses)
+        return (try? self.bridgeToSwift.mainContext.queryValue(from, selectClause, queryClauses))
+            .flatMap({ $0 })
     }
     
     /**
@@ -203,6 +207,7 @@ public extension CSDataStack {
             Thread.isMainThread,
             "Attempted to query from a \(cs_typeName(self)) outside the main thread."
         )
-        return self.bridgeToSwift.mainContext.queryAttributes(from, selectClause, queryClauses)
+        return (try? self.bridgeToSwift.mainContext.queryAttributes(from, selectClause, queryClauses))
+            .flatMap({ $0 })
     }
 }

Sources/CSDataStack+Transaction.swift

@@ -2,7 +2,7 @@
 //  CSDataStack+Transaction.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSDataStack.swift

@@ -2,7 +2,7 @@
 //  CSDataStack.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -50,7 +50,7 @@ public final class CSDataStack: NSObject, CoreStoreObjectiveCType {
      Initializes a `CSDataStack` from the model with the specified `modelName` in the specified `bundle`.
      
      - parameter xcodeModelName: the name of the (.xcdatamodeld) model file. If not specified, the application name (CFBundleName) will be used if it exists, or "CoreData" if it the bundle name was not set.
-     - parameter bundle: an optional bundle to load models from. If not specified, the main bundle will be used.
+     - parameter bundle: an optional bundle to load .xcdatamodeld models from. If not specified, the main bundle will be used.
      - parameter versionChain: the version strings that indicate the sequence of model versions to be used as the order for progressive migrations. If not specified, will default to a non-migrating data stack.
      */
     @objc

Sources/CSDynamicSchema.swift

@@ -2,7 +2,7 @@
 //  CSDynamicSchema.swift
 //  CoreStore
 //
-//  Copyright © 2017 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSError.swift

@@ -2,7 +2,7 @@
 //  CSError.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -217,6 +217,17 @@ extension CoreStoreError: CoreStoreSwiftType, _ObjectiveCBridgeableError {
                 return
             }
             self = .progressiveMigrationRequired(localStoreURL: localStoreURL)
+
+        case .asynchronousMigrationRequired:
+            guard
+                let localStoreURL = info["localStoreURL"] as? URL,
+                case let nsError as NSError = info["NSError"]
+                else {
+
+                    self = .unknown
+                    return
+            }
+            self = .asynchronousMigrationRequired(localStoreURL: localStoreURL, NSError: nsError)
             
         case .internalError:
             guard case let nsError as NSError = info["NSError"] else {
@@ -236,6 +247,14 @@ extension CoreStoreError: CoreStoreSwiftType, _ObjectiveCBridgeableError {
             
         case .userCancelled:
             self = .userCancelled
+
+        case .persistentStoreNotFound:
+            guard let entity = info["entity"] as? DynamicObject.Type else {
+
+                self = .unknown
+                return
+            }
+            self = .persistentStoreNotFound(entity: entity)
         }
     }
 }

Sources/CSFrom.swift

@@ -2,7 +2,7 @@
 //  CSFrom.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSGroupBy.swift

@@ -2,7 +2,7 @@
 //  CSGroupBy.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSInMemoryStore.swift

@@ -2,7 +2,7 @@
 //  CSInMemoryStore.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSInto.swift

@@ -2,7 +2,7 @@
 //  CSInto.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSListMonitor.swift

@@ -2,7 +2,7 @@
 //  CSListMonitor.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -34,7 +34,7 @@ import CoreData
  
  - SeeAlso: `ListMonitor`
  */
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 @objc
 public final class CSListMonitor: NSObject {
     
@@ -132,7 +132,7 @@ public final class CSListMonitor: NSObject {
     @objc
     public func hasObjectsInSection(_ section: Int) -> Bool {
         
-        return self.bridgeToSwift.hasObjectsInSection(section)
+        return self.bridgeToSwift.hasObjects(in: section)
     }
     
     /**
@@ -155,7 +155,7 @@ public final class CSListMonitor: NSObject {
     @objc
     public func objectsInSection(_ section: Int) -> [NSManagedObject] {
         
-        return self.bridgeToSwift.objectsInSection(section)
+        return self.bridgeToSwift.objects(in: section)
     }
     
     /**
@@ -167,7 +167,7 @@ public final class CSListMonitor: NSObject {
     @objc
     public func objectsInSafeSection(safeSectionIndex section: Int) -> [NSManagedObject]? {
         
-        return self.bridgeToSwift.objectsInSection(safeSectionIndex: section)
+        return self.bridgeToSwift.objects(safelyIn: section)
     }
 
     /**
@@ -201,7 +201,7 @@ public final class CSListMonitor: NSObject {
     @objc
     public func numberOfObjectsInSection(_ section: Int) -> Int {
         
-        return self.bridgeToSwift.numberOfObjectsInSection(section)
+        return self.bridgeToSwift.numberOfObjects(in: section)
     }
     
     /**
@@ -214,7 +214,7 @@ public final class CSListMonitor: NSObject {
     public func numberOfObjectsInSafeSection(safeSectionIndex section: Int) -> NSNumber? {
         
         return self.bridgeToSwift
-            .numberOfObjectsInSection(safeSectionIndex: section)
+            .numberOfObjects(safelyIn: section)
             .flatMap { NSNumber(value: $0) }
     }
     
@@ -227,7 +227,7 @@ public final class CSListMonitor: NSObject {
     @objc
     public func sectionInfoAtIndex(_ section: Int) -> NSFetchedResultsSectionInfo {
         
-        return self.bridgeToSwift.sectionInfoAtIndex(section)
+        return self.bridgeToSwift.sectionInfo(at: section)
     }
     
     /**
@@ -239,7 +239,7 @@ public final class CSListMonitor: NSObject {
     @objc
     public func sectionInfoAtSafeSectionIndex(safeSectionIndex section: Int) -> NSFetchedResultsSectionInfo? {
         
-        return self.bridgeToSwift.sectionInfoAtIndex(safeSectionIndex: section)
+        return self.bridgeToSwift.sectionInfo(safelyAt: section)
     }
     
     /**
@@ -263,7 +263,7 @@ public final class CSListMonitor: NSObject {
     @objc
     public func targetSectionForSectionIndexTitle(title: String, index: Int) -> Int {
         
-        return self.bridgeToSwift.targetSectionForSectionIndex(title: title, index: index)
+        return self.bridgeToSwift.targetSection(forSectionIndexTitle: title, at: index)
     }
     
     /**
@@ -287,7 +287,7 @@ public final class CSListMonitor: NSObject {
     public func indexOf(_ object: NSManagedObject) -> NSNumber? {
         
         return self.bridgeToSwift
-            .indexOf(object)
+            .index(of: object)
             .flatMap { NSNumber(value: $0) }
     }
     
@@ -300,7 +300,7 @@ public final class CSListMonitor: NSObject {
     @objc
     public func indexPathOf(_ object: NSManagedObject) -> IndexPath? {
         
-        return self.bridgeToSwift.indexPathOf(object)
+        return self.bridgeToSwift.indexPath(of: object)
     }
     
     
@@ -545,7 +545,7 @@ public final class CSListMonitor: NSObject {
 
 // MARK: - ListMonitor
 
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 extension ListMonitor where ListMonitor.ObjectType: NSManagedObject {
     
     // MARK: CoreStoreSwiftType

Sources/CSListObserver.swift

@@ -2,7 +2,7 @@
 //  CSListObserver.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,7 @@ import CoreData
  
  - SeeAlso: `ListObserver`
  */
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 @objc
 public protocol CSListObserver: class {
     
@@ -91,7 +91,7 @@ public protocol CSListObserver: class {
  
  - SeeAlso: `ListObjectObserver`
  */
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 @objc
 public protocol CSListObjectObserver: CSListObserver {
     
@@ -152,7 +152,7 @@ public protocol CSListObjectObserver: CSListObserver {
  
  - SeeAlso: `ListSectionObserver`
  */
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 @objc
 public protocol CSListSectionObserver: CSListObjectObserver {
     

Sources/CSMigrationResult.swift

@@ -2,7 +2,7 @@
 //  CSMigrationResult.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSMigrationType.swift

@@ -2,7 +2,7 @@
 //  CSMigrationType.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

Sources/CSObjectMonitor.swift

@@ -2,7 +2,7 @@
 //  CSObjectMonitor.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -34,7 +34,7 @@ import CoreData
  
  - SeeAlso: `ObjectMonitor`
  */
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 @objc
 public final class CSObjectMonitor: NSObject {
     
@@ -102,8 +102,10 @@ public final class CSObjectMonitor: NSObject {
     // MARK: NSObject
     
     public override var hash: Int {
-        
-        return self.bridgeToSwift.hashValue
+
+        var hasher = Hasher()
+        self.bridgeToSwift.hash(into: &hasher)
+        return hasher.finalize()
     }
     
     public override func isEqual(_ object: Any?) -> Bool {
@@ -137,7 +139,7 @@ public final class CSObjectMonitor: NSObject {
 
 // MARK: - ObjectMonitor
 
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 extension ObjectMonitor where ObjectMonitor.ObjectType: NSManagedObject {
     
     // MARK: CoreStoreSwiftType

Sources/CSObjectObserver.swift

@@ -2,7 +2,7 @@
 //  CSObjectObserver.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  Copyright © 2018 John Rommel Estropia
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ import CoreData
  
  - SeeAlso: `ObjectObserver`
  */
-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 @objc
 public protocol CSObjectObserver: class {