codablekit updates

Author: tanner0101

Package.swift

@@ -18,7 +18,7 @@ let package = Package(
         .package(url: "https://github.com/vapor/postgresql.git", from: "1.0.0-rc.2"),
     ],
     targets: [
-        .target(name: "FluentPostgreSQL", dependencies: ["Async", "CodableKit", "Fluent", "FluentSQL", "PostgreSQL"]),
+        .target(name: "FluentPostgreSQL", dependencies: ["Async", "Fluent", "FluentSQL", "PostgreSQL"]),
         .testTarget(name: "FluentPostgreSQLTests", dependencies: ["FluentBenchmark", "FluentPostgreSQL"]),
     ]
 )

Sources/FluentPostgreSQL/PostgreSQLDatabase+QuerySupporting.swift

@@ -1,7 +1,6 @@
 import Async
-import CodableKit
+import Core
 import FluentSQL
-import Foundation
 
 /// Adds ability to do basic Fluent queries using a `PostgreSQLDatabase`.
 extension PostgreSQLDatabase: QuerySupporting, CustomSQLSupporting {

Sources/FluentPostgreSQL/PostgreSQLModel.swift

@@ -4,12 +4,6 @@ public protocol PostgreSQLModel: Model where Self.Database == PostgreSQLDatabase
 }
 
 extension PostgreSQLModel {
-    /// See `Model.Database`
-    public typealias Database = PostgreSQLDatabase
-
-    /// See `Model.ID`
-    public typealias ID = Int
-
     /// See `Model.idKey`
     public static var idKey: IDKey { return \.id }
 }

Sources/FluentPostgreSQL/PostgreSQLType.swift

@@ -1,5 +1,4 @@
-import CodableKit
-import Foundation
+import Core
 
 /// A type that is compatible with PostgreSQL schema and data.
 public protocol PostgreSQLType:
@@ -16,7 +15,7 @@ public protocol PostgreSQLJSONType: PostgreSQLType, PostgreSQLJSONCustomConverti
 /// A type that is supports being represented as T[] in a PostgreSQL database.
 public protocol PostgreSQLArrayType: PostgreSQLType, PostgreSQLArrayCustomConvertible { }
 
-public protocol PostgreSQLEnumType: PostgreSQLType, Codable, TupleKeyStringDecodable, RawRepresentable where Self.RawValue: PostgreSQLDataConvertible { }
+public protocol PostgreSQLEnumType: PostgreSQLType, Codable, RawRepresentable where Self.RawValue: PostgreSQLDataConvertible { }
 
 /// MARK: Default Implementations
 

Sources/FluentPostgreSQL/PostgreSQLUUIDModel.swift

@@ -6,12 +6,6 @@ public protocol PostgreSQLUUIDModel: Model where Self.Database == PostgreSQLData
 }
 
 extension PostgreSQLUUIDModel {
-    /// See `Model.Database`
-    public typealias Database = PostgreSQLDatabase
-
-    /// See `Model.ID`
-    public typealias ID = UUID
-
     /// See `Model.idKey`
     public static var idKey: IDKey { return \.id }
 }

Tests/FluentPostgreSQLTests/FluentPostgreSQLTests.swift

@@ -3,6 +3,7 @@ import Core
 import XCTest
 import FluentBenchmark
 import FluentPostgreSQL
+import Fluent
 import Foundation
 
 class FluentPostgreSQLTests: XCTestCase {
@@ -157,15 +158,14 @@ class FluentPostgreSQLTests: XCTestCase {
         }
         _ = try Allergy(id: 2).create(on: conn).wait()
         _ = try Allergy(id: 4).create(on: conn).wait()
-        let stuff = try Allergy.query(on: conn).filter(\Allergy.id, in: [1, 2, 3]).all().wait()
+        let stuff = try Allergy.query(on: conn).filter(\.id ~~ [1, 2, 3]).all().wait()
         XCTAssertEqual(stuff.count, 1)
         XCTAssertEqual(stuff.first?.id, 2)
     }
 
     func testGH21() throws {
         /// - types
         enum PetType: Int, PostgreSQLEnumType {
-            static let keyString: TupleMap = (.cat, .dog)
             case cat = 1
             case dog = 2
         }