Nest Operation inside Connection

Author: jberkel

SQLite/Core/Connection.swift

@@ -54,6 +54,32 @@ public final class Connection {
         case uri(String)
     }
 
+    /// An SQL operation passed to update callbacks.
+    public enum Operation {
+
+        /// An INSERT operation.
+        case insert
+
+        /// An UPDATE operation.
+        case update
+
+        /// A DELETE operation.
+        case delete
+
+        fileprivate init(rawValue:Int32) {
+            switch rawValue {
+            case SQLITE_INSERT:
+                self = .insert
+            case SQLITE_UPDATE:
+                self = .update
+            case SQLITE_DELETE:
+                self = .delete
+            default:
+                fatalError("unhandled operation code: \(rawValue)")
+            }
+        }
+    }
+
     public var handle: OpaquePointer { return _handle! }
 
     fileprivate var _handle: OpaquePointer? = nil
@@ -638,33 +664,6 @@ extension Connection.Location : CustomStringConvertible {
 
 }
 
-/// An SQL operation passed to update callbacks.
-public enum Operation {
-
-    /// An INSERT operation.
-    case insert
-
-    /// An UPDATE operation.
-    case update
-
-    /// A DELETE operation.
-    case delete
-
-    fileprivate init(rawValue: Int32) {
-        switch rawValue {
-        case SQLITE_INSERT:
-            self = .insert
-        case SQLITE_UPDATE:
-            self = .update
-        case SQLITE_DELETE:
-            self = .delete
-        default:
-            fatalError("unhandled operation code: \(rawValue)")
-        }
-    }
-
-}
-
 public enum Result : Error {
 
     fileprivate static let successCodes: Set = [SQLITE_OK, SQLITE_ROW, SQLITE_DONE]

SQLiteTests/ConnectionTests.swift

@@ -192,7 +192,7 @@ class ConnectionTests : SQLiteTestCase {
     func test_updateHook_setsUpdateHook_withInsert() {
         async { done in
             db.updateHook { operation, db, table, rowid in
-                XCTAssertEqual(Operation.insert, operation)
+                XCTAssertEqual(Connection.Operation.insert, operation)
                 XCTAssertEqual("main", db)
                 XCTAssertEqual("users", table)
                 XCTAssertEqual(1, rowid)
@@ -206,7 +206,7 @@ class ConnectionTests : SQLiteTestCase {
         _ = try! InsertUser("alice")
         async { done in
             db.updateHook { operation, db, table, rowid in
-                XCTAssertEqual(Operation.update, operation)
+                XCTAssertEqual(Connection.Operation.update, operation)
                 XCTAssertEqual("main", db)
                 XCTAssertEqual("users", table)
                 XCTAssertEqual(1, rowid)
@@ -220,7 +220,7 @@ class ConnectionTests : SQLiteTestCase {
         _ = try! InsertUser("alice")
         async { done in
             db.updateHook { operation, db, table, rowid in
-                XCTAssertEqual(Operation.delete, operation)
+                XCTAssertEqual(Connection.Operation.delete, operation)
                 XCTAssertEqual("main", db)
                 XCTAssertEqual("users", table)
                 XCTAssertEqual(1, rowid)