From cd405e038ebb1808da2a2b5044bb826c43d7d05d Mon Sep 17 00:00:00 2001 From: John Rommel Estropia Date: Thu, 31 Aug 2017 23:00:17 +0900 Subject: [PATCH] updated demo app --- .swift-version | 2 +- ...etchingAndQueryingDemoViewController.swift | 43 ++++++++++++------- .../ListObserverDemoViewController.swift | 2 +- .../CustomLoggerViewController.swift | 4 +- .../MigrationsDemoViewController.swift | 5 ++- 5 files changed, 36 insertions(+), 20 deletions(-) diff --git a/.swift-version b/.swift-version index 8c50098..5186d07 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.1 +4.0 diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift index 013c529..f1d7d4d 100644 --- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift @@ -165,8 +165,8 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo fetch: { () -> [TimeZone] in return Static.timeZonesStack.fetchAll( - From(), - OrderBy(.ascending(#keyPath(TimeZone.name))) + From() + .orderBy(.ascending(\.name)) )! } ), @@ -175,9 +175,13 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo fetch: { () -> [TimeZone] in return Static.timeZonesStack.fetchAll( - From(), - Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "Asia"), - OrderBy(.ascending(#keyPath(TimeZone.secondsFromGMT))) + From() + .where( + format: "%K BEGINSWITH[c] %@", + #keyPath(TimeZone.name), + "Asia" + ) + .orderBy(.ascending(\.secondsFromGMT)) )! } ), @@ -186,10 +190,15 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo fetch: { () -> [TimeZone] in return Static.timeZonesStack.fetchAll( - From(), - Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "America") - || Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "Europe"), - OrderBy(.ascending(#keyPath(TimeZone.secondsFromGMT))) + From() + .where( + format: "%K BEGINSWITH[c] %@ OR %K BEGINSWITH[c] %@", + #keyPath(TimeZone.name), + "America", + #keyPath(TimeZone.name), + "Europe" + ) + .orderBy(.ascending(\.secondsFromGMT)) )! } ), @@ -198,9 +207,13 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo fetch: { () -> [TimeZone] in return Static.timeZonesStack.fetchAll( - From(), - !Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "America"), - OrderBy(.ascending(#keyPath(TimeZone.secondsFromGMT))) + From() + .where( + format: "%K BEGINSWITH[c] %@", + #keyPath(TimeZone.name), + "America" + ) + .orderBy(.ascending(\.secondsFromGMT)) )! } ), @@ -209,9 +222,9 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo fetch: { () -> [TimeZone] in return Static.timeZonesStack.fetchAll( - From(), - Where("hasDaylightSavingTime", isEqualTo: true), - OrderBy(.ascending(#keyPath(TimeZone.name))) + From() + .where(\.hasDaylightSavingTime == true) + .orderBy(.ascending(\.name)) )! } ) diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift index de745c9..85632f2 100644 --- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift @@ -28,7 +28,7 @@ struct ColorsDemo { } } - func whereClause() -> Where { + func whereClause() -> Where { switch self { diff --git a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift b/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift index 5bf30fd..9a309ed 100644 --- a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift @@ -99,8 +99,8 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger { case 0?: let request = NSFetchRequest() - Where(true).applyToFetchRequest(request) - Where(false).applyToFetchRequest(request) + Where(true).applyToFetchRequest(request) + Where(false).applyToFetchRequest(request) case 1?: _ = try? dataStack.addStorageAndWait( diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift index c4329f2..baffca5 100644 --- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift @@ -369,7 +369,10 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD )! self._dataStack = dataStack - let listMonitor = dataStack.monitorList(From(model.entityType), OrderBy(.descending("dna"))) + let listMonitor = dataStack.monitorList( + From(model.entityType) + .orderBy(.descending(#keyPath(OrganismV1.dna))) + ) listMonitor.addObserver(self) self._listMonitor = listMonitor