Merge changes from mac-release — adopt DatabaseQueue.

Frameworks/SyncDatabase/SyncDatabase.swift

@@ -9,20 +9,27 @@
 import Foundation
 import RSDatabase
 
-public final class SyncDatabase {
-	
-	private let syncStatusTable: SyncStatusTable
-	
-	public init(databaseFilePath: String) {
-		
-		let queue = RSDatabaseQueue(filepath: databaseFilePath, excludeFromBackup: false)
-		self.syncStatusTable = SyncStatusTable(queue: queue)
-		
-		queue.createTables(usingStatementsSync: SyncDatabase.tableCreationStatements)
-		queue.vacuumIfNeeded()
+public struct SyncDatabase {
 
+	/// When SyncDatabase is suspended, database calls will crash the app.
+	public var isSuspended: Bool {
+		return queue.isSuspended
 	}
-	
+
+	private let syncStatusTable: SyncStatusTable
+	private let queue: DatabaseQueue
+
+	public init(databaseFilePath: String) {
+		let queue = DatabaseQueue(databasePath: databaseFilePath)
+		queue.runCreateStatements(SyncDatabase.tableCreationStatements)
+		queue.vacuumIfNeeded(daysBetweenVacuums: 11)
+		self.queue = queue
+
+		self.syncStatusTable = SyncStatusTable(queue: queue)
+	}
+
+	// MARK: - API
+
 	public func insertStatuses(_ statuses: [SyncStatus], completionHandler: (() -> ())? = nil) {
 		syncStatusTable.insertStatuses(statuses, completionHandler: completionHandler)
 	}
@@ -42,7 +49,19 @@ public final class SyncDatabase {
     public func deleteSelectedForProcessing(_ articleIDs: [String], completionHandler: (() -> ())? = nil) {
 		syncStatusTable.deleteSelectedForProcessing(articleIDs, completionHandler: completionHandler)
 	}
-	
+
+	// MARK: - Suspend and Resume (for iOS)
+
+	/// Close the database and stop running database calls.
+	/// Any pending calls will complete first.
+	public func suspend() {
+		queue.suspend()
+	}
+
+	/// Open the database and allow for running database calls again.
+	public func resume() {
+		queue.resume()
+	}
 }
 
 // MARK: - Private

Frameworks/SyncDatabase/SyncStatusTable.swift

@@ -10,21 +10,19 @@ import Foundation
 import Articles
 import RSDatabase
 
-final class SyncStatusTable: DatabaseTable {
-	
+struct SyncStatusTable: DatabaseTable {
+
 	let name = DatabaseTableName.syncStatus
-	private let queue: RSDatabaseQueue
-	
-	init(queue: RSDatabaseQueue) {
+	private let queue: DatabaseQueue
+
+	init(queue: DatabaseQueue) {
 		self.queue = queue
 	}
 
 	func selectForProcessing() -> [SyncStatus] {
-
 		var statuses: Set<SyncStatus>? = nil
 		
-		self.queue.updateSync { database in
-			
+		queue.runInDatabaseSync { database in
 			let updateSQL = "update syncStatus set selected = true"
 			database.executeUpdate(updateSQL, withArgumentsIn: nil)
 			
@@ -32,32 +30,26 @@ final class SyncStatusTable: DatabaseTable {
 			if let resultSet = database.executeQuery(selectSQL, withArgumentsIn: nil) {
 				statuses = resultSet.mapToSet(self.statusWithRow)
 			}
-			
 		}
 
 		return statuses != nil ? Array(statuses!) : [SyncStatus]()
-		
 	}
 	
 	func selectPendingCount() -> Int {
-		
 		var count: Int = 0
 		
-		self.queue.fetchSync { (database) in
+		queue.runInDatabaseSync { database in
 			let sql = "select count(*) from syncStatus"
 			if let resultSet = database.executeQuery(sql, withArgumentsIn: nil) {
-				resultSet.next()
-				count = Int(resultSet.int(forColumnIndex: 0))
+				count = numberWithCountResultSet(resultSet)
 			}
-			
 		}
 		
 		return count
-		
 	}
 	
 	func resetSelectedForProcessing(_ articleIDs: [String], completionHandler: (() -> ())? = nil) {
-		self.queue.update { database in
+		queue.runInTransaction { database in
 			let parameters = articleIDs.map { $0 as AnyObject }
 			let placeholders = NSString.rs_SQLValueList(withPlaceholders: UInt(articleIDs.count))!
 			let updateSQL = "update syncStatus set selected = false where articleID in \(placeholders)"
@@ -69,7 +61,7 @@ final class SyncStatusTable: DatabaseTable {
 	}
 	
     func deleteSelectedForProcessing(_ articleIDs: [String], completionHandler: (() -> ())? = nil) {
-		self.queue.update { database in
+		queue.runInTransaction { database in
 			let parameters = articleIDs.map { $0 as AnyObject }
 			let placeholders = NSString.rs_SQLValueList(withPlaceholders: UInt(articleIDs.count))!
 			let deleteSQL = "delete from syncStatus where articleID in \(placeholders)"
@@ -81,7 +73,7 @@ final class SyncStatusTable: DatabaseTable {
 	}
 	
 	func insertStatuses(_ statuses: [SyncStatus], completionHandler: (() -> ())? = nil) {
-		self.queue.update { database in
+		queue.runInTransaction { database in
 			let statusArray = statuses.map { $0.databaseDictionary() }
 			self.insertRows(statusArray, insertType: .orReplace, in: database)
             if let handler = completionHandler {
@@ -89,13 +81,11 @@ final class SyncStatusTable: DatabaseTable {
             }
 		}
 	}
-	
 }
 
 private extension SyncStatusTable {
 
 	func statusWithRow(_ row: FMResultSet) -> SyncStatus? {
-		
 		guard let articleID = row.string(forColumn: DatabaseKey.articleID),
 			let rawKey = row.string(forColumn: DatabaseKey.key),
 			let key = ArticleStatus.Key(rawValue: rawKey) else {
@@ -106,6 +96,5 @@ private extension SyncStatusTable {
 		let selected = row.bool(forColumn: DatabaseKey.selected)
 		
 		return SyncStatus(articleID: articleID, key: key, flag: flag, selected: selected)
-		
 	}
 }