test FluentPostgreSQL gm

Author: tanner0101

Sources/PostgreSQL/Database/PostgreSQLDatabaseConfig.swift

@@ -28,34 +28,26 @@ public struct PostgreSQLDatabaseConfig {
     public init(hostname: String, port: Int = 5432, username: String, database: String? = nil, password: String? = nil, transport: PostgreSQLConnection.TransportConfig = .cleartext) {
         self.init(serverAddress: .tcp(hostname: hostname, port: port), username: username, database: database, password: password, transport: transport)
     }
-    
-	public init(serverAddress: PostgreSQLConnection.ServerAddress, username: String, database: String? = nil, password: String? = nil, transport: PostgreSQLConnection.TransportConfig = .cleartext) {
-		self.username = username
-		self.database = database
+
+    public init(serverAddress: PostgreSQLConnection.ServerAddress, username: String, database: String? = nil, password: String? = nil, transport: PostgreSQLConnection.TransportConfig = .cleartext) {
+        self.username = username
+        self.database = database
 		self.password = password
         self.serverAddress = serverAddress
 		self.transportConfig = transport
 	}
 
-    public init(url urlString: String, transport: PostgreSQLConnection.TransportConfig = .cleartext) throws {
-        guard let url = URL(string: urlString),
-            let hostname = url.host,
-            let port = url.port,
-            let username = url.user,
-            let database = url.databaseName,
-            url.path.count > 0
-        else {
-            throw PostgreSQLError(
-                identifier: "Bad Connection String",
-                reason: "Host could not be parsed",
-                possibleCauses: ["Foundation URL is unable to parse the provided connection string"],
-                suggestedFixes: ["Check the connection string being passed"]
-            )
+    public init?(url urlString: String, transport: PostgreSQLConnection.TransportConfig = .cleartext) throws {
+        guard let url = URL(string: urlString) else {
+            return nil
         }
-        self.serverAddress = .tcp(hostname: hostname, port: port)
-        self.username = username
-        self.database = database
-        self.password = url.password
-        self.transportConfig = transport
+        self.init(
+            hostname: url.host ?? "localhost",
+            port: url.port ?? 5432,
+            username: url.user ?? "vapor",
+            database: url.databaseName,
+            password: url.password,
+            transport: transport
+        )
     }
 }

Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift

@@ -217,7 +217,7 @@ class PostgreSQLConnectionTests: XCTestCase {
 
     func testURLParsing() throws {
         let databaseURL = "postgres://username:password@localhost:5432/database"
-        let config = try PostgreSQLDatabaseConfig(url: databaseURL)
+        let config = try PostgreSQLDatabaseConfig(url: databaseURL)!
         XCTAssertEqual("\(config.serverAddress)", "ServerAddress(storage: PostgreSQL.PostgreSQLConnection.ServerAddress.Storage.tcp(hostname: \"localhost\", port: 5432))")
         XCTAssertEqual(config.username, "username")
         XCTAssertEqual(config.password, "password")

circle.yml

@@ -55,7 +55,7 @@ jobs:
     steps:
       - run:
           name: Clone Fluent PostgreSQL
-          command: git clone -b master https://github.com/vapor/fluent-postgresql.git
+          command: git clone -b gm https://github.com/vapor/fluent-postgresql.git
           working_directory: ~/
       - run:
           name: Switch Fluent PostgreSQL to this PostgreSQL revision
@@ -86,4 +86,4 @@ workflows:
     jobs:
       - linux
       # - macos
-      
+