Add support for VACUUM INTO (#51)

- Add support for VACUUM INTO
- Update to Swift 5.9

Author: atdrendel

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Select Xcode 14
-        run: sudo xcode-select -s /Applications/Xcode_14.3.1.app
+      - name: Select Xcode 15
+        run: sudo xcode-select -s /Applications/Xcode_15.0.app
       - name: Test
         run: swift test

.swift-version

@@ -1,2 +1,2 @@
-5.8.0
+5.9.0
 

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(

Sources/SQLite/SQLiteDatabase.swift

@@ -579,18 +579,21 @@ public extension SQLiteDatabase {
     }
 
     func incrementalVacuum(_ pages: Int? = nil) throws {
-        let sql: SQL
-        if let pages {
-            sql = "PRAGMA incremental_vacuum(\(pages));"
+        let sql: SQL = if let pages {
+            "PRAGMA incremental_vacuum(\(pages));"
         } else {
-            sql = "PRAGMA incremental_vacuum;"
+            "PRAGMA incremental_vacuum;"
         }
         try execute(raw: sql)
     }
 
-    func vacuum() throws {
+    func vacuum(into path: String? = nil) throws {
         do {
-            try database.writer.vacuum()
+            if let path {
+                try database.writer.vacuum(into: path)
+            } else {
+                try database.writer.vacuum()
+            }
         } catch {
             os_log(
                 "vacuum: error=%s",
@@ -722,15 +725,15 @@ private enum Database {
 
     var reader: AnyDatabaseReader {
         switch self {
-        case let .pool(pool): return AnyDatabaseReader(pool)
-        case let .queue(queue): return AnyDatabaseReader(queue)
+        case let .pool(pool): AnyDatabaseReader(pool)
+        case let .queue(queue): AnyDatabaseReader(queue)
         }
     }
 
     var writer: AnyDatabaseWriter {
         switch self {
-        case let .pool(pool): return AnyDatabaseWriter(pool)
-        case let .queue(queue): return AnyDatabaseWriter(queue)
+        case let .pool(pool): AnyDatabaseWriter(pool)
+        case let .queue(queue): AnyDatabaseWriter(queue)
         }
     }
 

Sources/SQLite/SQLiteError.swift

@@ -146,9 +146,9 @@ public extension SQLiteError {
     var isInterrupt: Bool {
         switch self {
         case SQLiteError.SQLITE_ABORT, SQLiteError.SQLITE_INTERRUPT:
-            return true
+            true
         default:
-            return false
+            false
         }
     }
 }

Sources/SQLite/SQLiteValue.swift

@@ -130,9 +130,9 @@ public extension [UInt8]? {
     var sqliteValue: SQLiteValue {
         switch self {
         case .none:
-            return .null
+            .null
         case let .some(bytes):
-            return .data(Data(bytes))
+            .data(Data(bytes))
         }
     }
 }
@@ -141,9 +141,9 @@ public extension Optional where Wrapped: BinaryInteger {
     var sqliteValue: SQLiteValue {
         switch self {
         case .none:
-            return .null
+            .null
         case let .some(int):
-            return int.sqliteValue
+            int.sqliteValue
         }
     }
 }
@@ -152,9 +152,9 @@ public extension Bool? {
     var sqliteValue: SQLiteValue {
         switch self {
         case .none:
-            return .null
+            .null
         case let .some(bool):
-            return bool.sqliteValue
+            bool.sqliteValue
         }
     }
 }
@@ -163,9 +163,9 @@ public extension Data? {
     var sqliteValue: SQLiteValue {
         switch self {
         case .none:
-            return .null
+            .null
         case let .some(data):
-            return .data(data)
+            .data(data)
         }
     }
 }
@@ -174,9 +174,9 @@ public extension Date? {
     var sqliteValue: SQLiteValue {
         switch self {
         case .none:
-            return .null
+            .null
         case let .some(date):
-            return date.sqliteValue
+            date.sqliteValue
         }
     }
 }
@@ -185,9 +185,9 @@ public extension Optional where Wrapped: StringProtocol {
     var sqliteValue: SQLiteValue {
         switch self {
         case .none:
-            return .null
+            .null
         case let .some(string):
-            return string.sqliteValue
+            string.sqliteValue
         }
     }
 }

Tests/SQLiteTests/SQLiteDatabaseTests.swift

@@ -207,6 +207,42 @@ final class SQLiteDatabaseTests: XCTestCase {
         XCTAssertEqual(2, try getPageCount())
     }
 
+    func testVacuumIntoFile() throws {
+        try Sandbox.execute { directory in
+            let path1 = directory.appendingPathComponent("one.db").path
+            let db1 = try SQLiteDatabase(path: path1)
+            defer { try? db1.close() }
+
+            let path2 = directory.appendingPathComponent("two.db").path
+
+            XCTAssertEqual(.none, db1.autoVacuumMode)
+
+            try db1.execute(raw: _createTableWithBlob)
+
+            try db1.inTransaction { db in
+                try (0 ..< 1000).forEach { index in
+                    let args: SQLiteArguments = [
+                        "id": .integer(Int64(index)), "data": .data(_textData),
+                    ]
+                    try db.write(_insertIDAndData, arguments: args)
+                }
+            }
+
+            try db1.vacuum(into: path2)
+
+            XCTAssertTrue(FileManager().fileExists(atPath: path2))
+
+            let db2 = try SQLiteDatabase(path: path2)
+            defer { try? db2.close() }
+
+            XCTAssertEqual(try db1.tables(), try db2.tables())
+            XCTAssertEqual(
+                try db1.read("SELECT * FROM test;"),
+                try db2.read("SELECT * FROM test;")
+            )
+        }
+    }
+
     func testCreateTable() throws {
         XCTAssertNoThrow(try database.execute(raw: _createTableWithBlob))
         let tableNames = try database.tables()

Tests/SQLiteTests/Types/PetOwner.swift

@@ -69,11 +69,10 @@ extension Person: SQLiteTransformable {
     }
 
     var asArguments: SQLiteArguments {
-        let titleValue: SQLiteValue
-        if let title {
-            titleValue = .text(title)
+        let titleValue: SQLiteValue = if let title {
+            .text(title)
         } else {
-            titleValue = .null
+            .null
         }
 
         return [