add psql string model, fixes #44

Author: tanner0101

Package.swift

@@ -12,10 +12,10 @@ let package = Package(
         .package(url: "https://github.com/vapor/core.git", .branch("fluent-gm")),
 
         // Swift ORM framework (queries, models, and relations) for building NoSQL and SQL database integrations.
-        .package(url: "https://github.com/vapor/fluent.git", .branch("gm")),
+        .package(url: "https://github.com/vapor/fluent.git", .branch("master")),
 
         // 🐘 Non-blocking, event-driven Swift client for PostgreSQL.
-        .package(url: "https://github.com/vapor/postgresql.git", .branch("gm")),
+        .package(url: "https://github.com/vapor/postgresql.git", .branch("master")),
     ],
     targets: [
         .target(name: "FluentPostgreSQL", dependencies: ["Async", "Fluent", "PostgreSQL"]),

Sources/FluentPostgreSQL/PostgreSQLModel.swift

@@ -4,10 +4,21 @@ public protocol PostgreSQLModel: Model where Self.Database == PostgreSQLDatabase
 }
 
 extension PostgreSQLModel {
-    /// See `Model.idKey`
+    /// See `Model`.
     public static var idKey: IDKey { return \.id }
 }
 
+public protocol PostgreSQLStringModel: Model where Self.Database == PostgreSQLDatabase, Self.ID == String {
+    /// This model's unique identifier.
+    var id: String? { get set }
+}
+
+extension PostgreSQLStringModel {
+    /// See `Model`.
+    public static var idKey: IDKey { return \.id }
+}
+
+
 public protocol PostgreSQLPivot: Pivot, PostgreSQLModel { }
 
 public protocol PostgreSQLMigration: Migration where Self.Database == PostgreSQLDatabase { }

Tests/FluentPostgreSQLTests/FluentPostgreSQLTests.swift

@@ -413,14 +413,6 @@ class FluentPostgreSQLTests: XCTestCase {
     }
 
     func testSort() throws {
-        struct Planet: PostgreSQLModel, PostgreSQLMigration, Equatable {
-            var id: Int?
-            var name: String
-            init(id: Int? = nil, name: String) {
-                self.id = id
-                self.name = name
-            }
-        }
         let conn = try benchmarker.pool.requestConnection().wait()
         defer { benchmarker.pool.releaseConnection(conn) }
         try Planet.prepare(on: conn).wait()
@@ -434,6 +426,20 @@ class FluentPostgreSQLTests: XCTestCase {
         let ordered = try Planet.query(on: conn).sort(\.name).all().wait()
         XCTAssertNotEqual(unordered, ordered)
     }
+    
+    func testCustomFilter() throws {
+        let conn = try benchmarker.pool.requestConnection().wait()
+        defer { benchmarker.pool.releaseConnection(conn) }
+        try Planet.prepare(on: conn).wait()
+        defer { _ = try? Planet.revert(on: conn).wait() }
+        
+        _ = try Planet(name: "Jupiter").save(on: conn).wait()
+        _ = try Planet(name: "Earth").save(on: conn).wait()
+        _ = try Planet(name: "Mars").save(on: conn).wait()
+
+        let earth = try Planet.query(on: conn).filter(\.name, .ilike, "earth").first().wait()
+        XCTAssertEqual(earth?.name, "Earth")
+    }
 
     static let allTests = [
         ("testSchema", testSchema),
@@ -461,9 +467,19 @@ class FluentPostgreSQLTests: XCTestCase {
         ("testContains", testContains),
         ("testEmptySubset", testEmptySubset),
         ("testSort", testSort),
+        ("testCustomFilter", testCustomFilter),
     ]
 }
 
+struct Planet: PostgreSQLModel, PostgreSQLMigration, Equatable {
+    var id: Int?
+    var name: String
+    init(id: Int? = nil, name: String) {
+        self.id = id
+        self.name = name
+    }
+}
+
 extension PostgreSQLColumnType {
     static var planetType: PostgreSQLColumnType {
         return .custom("PLANET_TYPE")