feedback

stephencelis · Jul 2, 2022 · abff512 · abff512
1 parent c4bdad8
commit abff512
Showing 1 changed file with 6 additions and 17 deletions.
diff --git a/Sources/SQLite/Typed/Coding.swift b/Sources/SQLite/Typed/Coding.swift
@@ -216,39 +216,39 @@ private class SQLiteEncoder: Encoder {
 
         func encodeIfPresent(_ value: Int?, forKey key: SQLiteEncoder.SQLiteKeyedEncodingContainer<Key>.Key) throws {
             if let value = value {
-                encoder.setters.append(Expression(key.stringValue) <- value)
+                try encode(value, forKey: key)
             } else if forcingNilValueSetters {
                 encoder.setters.append(Expression<Int?>(key.stringValue) <- nil)
             }
         }
 
         func encodeIfPresent(_ value: Bool?, forKey key: Key) throws {
             if let value = value {
-                encoder.setters.append(Expression(key.stringValue) <- value)
+                try encode(value, forKey: key)
             } else if forcingNilValueSetters {
                 encoder.setters.append(Expression<Bool?>(key.stringValue) <- nil)
             }
         }
 
         func encodeIfPresent(_ value: Float?, forKey key: Key) throws {
             if let value = value {
-                encoder.setters.append(Expression(key.stringValue) <- Double(value))
+                try encode(value, forKey: key)
             } else if forcingNilValueSetters {
                 encoder.setters.append(Expression<Double?>(key.stringValue) <- nil)
             }
         }
 
         func encodeIfPresent(_ value: Double?, forKey key: Key) throws {
             if let value = value {
-                encoder.setters.append(Expression(key.stringValue) <- value)
+                try encode(value, forKey: key)
             } else if forcingNilValueSetters {
                 encoder.setters.append(Expression<Double?>(key.stringValue) <- nil)
             }
         }
 
         func encodeIfPresent(_ value: String?, forKey key: MyKey) throws {
             if let value = value {
-                encoder.setters.append(Expression(key.stringValue) <- value)
+                try encode(value, forKey: key)
             } else if forcingNilValueSetters {
                 encoder.setters.append(Expression<String?>(key.stringValue) <- nil)
             }
@@ -277,18 +277,7 @@ private class SQLiteEncoder: Encoder {
                 encoder.setters.append(Expression<String?>(key.stringValue) <- nil)
                 return
             }
-            switch value {
-            case let data as Data:
-                encoder.setters.append(Expression(key.stringValue) <- data)
-            case let date as Date:
-                encoder.setters.append(Expression(key.stringValue) <- date.datatypeValue)
-            case let uuid as UUID:
-                encoder.setters.append(Expression(key.stringValue) <- uuid.datatypeValue)
-            default:
-                let encoded = try JSONEncoder().encode(value)
-                let string = String(data: encoded, encoding: .utf8)
-                encoder.setters.append(Expression(key.stringValue) <- string)
-            }
+            try encode(value, forKey: key)
         }
 
         func encode(_ value: Int8, forKey key: Key) throws {