used UUID.datatypeValue and moved tests

Author: benrlewis7450G

Sources/SQLite/Typed/Coding.swift

@@ -208,7 +208,7 @@ private class SQLiteEncoder: Encoder {
             } else if let date = value as? Date {
                 encoder.setters.append(Expression(key.stringValue) <- date.datatypeValue)
             } else if let uuid = value as? UUID {
-                encoder.setters.append(Expression(key.stringValue) <- uuid.uuidString)
+                encoder.setters.append(Expression(key.stringValue) <- uuid.datatypeValue)
             } else {
                 let encoded = try JSONEncoder().encode(value)
                 let string = String(data: encoded, encoding: .utf8)

Tests/SQLiteTests/FoundationTests.swift

@@ -26,29 +26,4 @@ class FoundationTests: XCTestCase {
         XCTAssertEqual(UUID(uuidString: "4ABE10C9-FF12-4CD4-90C1-4B429001BAD3"), uuid)
     }
 
-    func testUUIDInsert() {
-        struct Test: Codable {
-            var uuid: UUID
-            var string: String
-        }
-        let testUUID = UUID()
-        let testValue = Test(uuid: testUUID, string: "value")
-        let db = try! Connection(.temporary)
-        try! db.run(table.create { t in
-            t.column(uuid)
-            t.column(string)
-        }
-        )
-
-        let iQuery = try! table.insert(testValue)
-        try! db.run(iQuery)
-
-        let fQuery = table.filter(uuid == testUUID)
-        if let result = try! db.pluck(fQuery) {
-            let testValueReturned = Test(uuid: result[uuid], string: result[string])
-            XCTAssertEqual(testUUID, testValueReturned.uuid)
-        } else {
-            XCTFail("Search for uuid failed")
-        }
-    }
 }

Tests/SQLiteTests/QueryTests.swift

@@ -310,6 +310,32 @@ class QueryTests: XCTestCase {
     }
     #endif
 
+    func test_insert_and_search_for_UUID() {
+        struct Test: Codable {
+            var uuid: UUID
+            var string: String
+        }
+        let testUUID = UUID()
+        let testValue = Test(uuid: testUUID, string: "value")
+        let db = try! Connection(.temporary)
+        try! db.run(table.create { t in
+            t.column(uuid)
+            t.column(string)
+        }
+        )
+
+        let iQuery = try! table.insert(testValue)
+        try! db.run(iQuery)
+
+        let fQuery = table.filter(uuid == testUUID)
+        if let result = try! db.pluck(fQuery) {
+            let testValueReturned = Test(uuid: result[uuid], string: result[string])
+            XCTAssertEqual(testUUID, testValueReturned.uuid)
+        } else {
+            XCTFail("Search for uuid failed")
+        }
+    }
+
     func test_upsert_withOnConflict_compilesInsertOrOnConflictExpression() {
         assertSQL(
             """