Merge pull request PerfectlySoft#51 from Bo98/int-conversion

Relax strictness on decoding to Int from different integer widths

Author: kjessup

Sources/PerfectMySQL/MySQLCRUD.swift

@@ -60,10 +60,14 @@ class MySQLCRUDRowReader<K : CodingKey>: KeyedDecodingContainerProtocol {
 			return Int(i)
 		case let i as Int32:
 			return Int(i)
+		case let i as Int16:
+			return Int(i)
+		case let i as Int8:
+			return Int(i)
 		case let i as Int:
 			return i
 		default:
-			throw MySQLCRUDError("Could not convert \(String(describing: a)) into an Int.")
+			throw MySQLCRUDError("Could not convert \(String(describing: a)) into an Int for key: \(key.stringValue)")
 		}
 	}
 	func decode(_ type: Int8.Type, forKey key: Key) throws -> Int8 {
@@ -83,10 +87,16 @@ class MySQLCRUDRowReader<K : CodingKey>: KeyedDecodingContainerProtocol {
 		switch a {
 		case let i as UInt64:
 			return UInt(i)
+		case let i as UInt32:
+			return UInt(i)
+		case let i as UInt16:
+			return UInt(i)
+		case let i as UInt8:
+			return UInt(i)
 		case let i as UInt:
 			return i
 		default:
-			throw MySQLCRUDError("Could not convert \(String(describing: a)) into an UInt.")
+			throw MySQLCRUDError("Could not convert \(String(describing: a)) into an UInt for key: \(key.stringValue)")
 		}
 	}
 	func decode(_ type: UInt8.Type, forKey key: Key) throws -> UInt8 {

Tests/PerfectMySQLTests/PerfectMySQLTests.swift

@@ -1676,6 +1676,25 @@ class PerfectMySQLTests: XCTestCase {
 			XCTFail("\(error)")
 		}
 	}
+
+	func testIntConversion() {
+		do {
+			let db = try getTestDB()
+			struct IntTest: Codable {
+				let id: Int
+			}
+			try db.sql("CREATE TABLE IntTest(id tinyint PRIMARY KEY)")
+			let table = db.table(IntTest.self)
+			let inserted = IntTest(id: 1)
+			try table.insert(inserted)
+			guard let selected = try db.table(IntTest.self).where(\IntTest.id == 1).first() else {
+				return XCTFail("Unable to find IntTest.")
+			}
+			XCTAssertEqual(selected.id, inserted.id)
+		} catch {
+			XCTFail("\(error)")
+		}
+	}
 
 	func testBespokeSQL() {
 		do {