Merge pull request mauricio#64 from dylex/missinghost

mauricio · mauricio · commit 92584330df62 · 2013-11-10T15:06:34.000-08:00
Improve URL parser to allow missing hostname/dbname
diff --git a/postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/util/ParserURL.scala b/postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/util/ParserURL.scala
@@ -21,15 +21,17 @@ object ParserURL {
 
   val DEFAULT_PORT = "5432"
 
-  private val pgurl1 = """(jdbc:postgresql)://([^:]*|\[.+\])(?::(\d+))?/([^?]+)(?:\?user=(.*)&password=(.*))?""".r
+  private val pgurl1 = """(jdbc:postgresql):(?://([^/:]*|\[.+\])(?::(\d+))?)?(?:/([^/?]*))?(?:\?user=(.*)&password=(.*))?""".r
   private val pgurl2 = """(postgres|postgresql)://(.*):(.*)@(.*):(\d+)/(.*)""".r
 
   def parse(connectionURL: String): Map[String, String] = {
     val properties: Map[String, String] = Map()
 
     connectionURL match {
       case pgurl1(protocol, server, port, dbname, username, password) => {
-        var result = properties + (PGHOST -> unwrapIpv6address(server)) + (PGDBNAME -> dbname)
+        var result = properties
+        if (server != null) result += (PGHOST -> unwrapIpv6address(server))
+        if (dbname != null && dbname.nonEmpty) result += (PGDBNAME -> dbname)
         if(port != null) result += (PGPORT -> port)
         if(username != null) result = (result + (PGUSERNAME -> username) + (PGPASSWORD -> password))
         result
@@ -51,4 +53,4 @@ object ParserURL {
     } else server
   }
 
-}
+}
diff --git a/postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/util/URLParser.scala b/postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/util/URLParser.scala
@@ -38,7 +38,7 @@ object URLParser {
       username = properties.get(Username).getOrElse(Default.username),
       password = properties.get(Password),
       database = properties.get(ParserURL.PGDBNAME),
-      host = properties(ParserURL.PGHOST),
+      host = properties.getOrElse(ParserURL.PGHOST, Default.host),
       port = port,
       charset = charset
     )
diff --git a/postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/util/URLParserSpec.scala b/postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/util/URLParserSpec.scala
@@ -124,6 +124,54 @@ class URLParserSpec extends Specification {
       configuration.port === 9987
     }
 
+    "create a connection with a missing hostname" in {
+      val connectionUri = "jdbc:postgresql:/my_database?user=john&password=doe"
+
+      val configuration = URLParser.parse(connectionUri)
+
+      configuration.username === "john"
+      configuration.password === Some("doe")
+      configuration.database === Some("my_database")
+      configuration.host === "localhost"
+      configuration.port === 5432
+    }
+
+    "create a connection with a missing database name" in {
+      val connectionUri = "jdbc:postgresql://[::1]:9987/?user=john&password=doe"
+
+      val configuration = URLParser.parse(connectionUri)
+
+      configuration.username === "john"
+      configuration.password === Some("doe")
+      configuration.database === None
+      configuration.host === "::1"
+      configuration.port === 9987
+    }
+
+    "create a connection with all default fields" in {
+      val connectionUri = "jdbc:postgresql:"
+
+      val configuration = URLParser.parse(connectionUri)
+
+      configuration.username === "postgres"
+      configuration.password === None
+      configuration.database === None
+      configuration.host === "localhost"
+      configuration.port === 5432
+    }
+
+    "create a connection with an empty (invalid) url" in {
+      val connectionUri = ""
+
+      val configuration = URLParser.parse(connectionUri)
+
+      configuration.username === "postgres"
+      configuration.password === None
+      configuration.database === None
+      configuration.host === "localhost"
+      configuration.port === 5432
+    }
+
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ object URLParser {`
`38`	`38`	`username = properties.get(Username).getOrElse(Default.username),`
`39`	`39`	`password = properties.get(Password),`
`40`	`40`	`database = properties.get(ParserURL.PGDBNAME),`
`41`		`- host = properties(ParserURL.PGHOST),`
	`41`	`+ host = properties.getOrElse(ParserURL.PGHOST, Default.host),`
`42`	`42`	`port = port,`
`43`	`43`	`charset = charset`
`44`	`44`	`)`