url_config does not require password

Author: lpil

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.7.0 - 2024-04-05
+
+- The password is now optional in the `url_config` function, defaulting to no
+  password if none is given.
+
 ## v0.6.1 - 2024-01-16
 
 - Relaxed the stdlib version constraint.

src/gleam/pgo.gleam

@@ -5,10 +5,11 @@
 // TODO: transactions
 // TODO: JSON support
 import gleam/dynamic.{type DecodeErrors, type Decoder, type Dynamic}
-import gleam/string
-import gleam/result
+
 import gleam/list
 import gleam/option.{type Option, None, Some}
+import gleam/result
+import gleam/string
 import gleam/uri.{Uri}
 
 /// The configuration for a pool of connections.
@@ -86,16 +87,20 @@ pub fn url_config(database_url: String) -> Result(Config, Nil) {
   use uri <- result.then(uri.parse(database_url))
   use #(userinfo, host, path, db_port) <- result.then(case uri {
     Uri(
-      scheme: Some("postgres"),
-      userinfo: Some(userinfo),
-      host: Some(host),
-      port: Some(db_port),
-      path: path,
-      ..,
-    ) -> Ok(#(userinfo, host, path, db_port))
+        scheme: Some("postgres"),
+        userinfo: Some(userinfo),
+        host: Some(host),
+        port: Some(db_port),
+        path: path,
+        ..,
+      ) -> Ok(#(userinfo, host, path, db_port))
+    _ -> Error(Nil)
+  })
+  use #(user, password) <- result.then(case string.split(userinfo, ":") {
+    [user] -> Ok(#(user, None))
+    [user, password] -> Ok(#(user, Some(password)))
     _ -> Error(Nil)
   })
-  use #(user, password) <- result.then(string.split_once(userinfo, ":"))
   case string.split(path, "/") {
     ["", database] ->
       Ok(
@@ -105,7 +110,7 @@ pub fn url_config(database_url: String) -> Result(Config, Nil) {
           port: db_port,
           database: database,
           user: user,
-          password: Some(password),
+          password: password,
         ),
       )
     _ -> Error(Nil)

test/gleam/pgo_test.gleam

@@ -1,10 +1,10 @@
 import gleam/dynamic.{type Decoder}
-import gleam/pgo
 import gleam/option.{None, Some}
+import gleam/pgo
 import gleam/string
 import gleeunit/should
 
-pub fn url_config_test() {
+pub fn url_config_everything_test() {
   pgo.url_config("postgres://u:p@db.test:1234/my_db")
   |> should.equal(Ok(
     pgo.Config(
@@ -16,13 +16,28 @@ pub fn url_config_test() {
       password: Some("p"),
     ),
   ))
+}
 
+pub fn url_config_not_postgres_protocol_test() {
   pgo.url_config("foo://u:p@db.test:1234/my_db")
   |> should.equal(Error(Nil))
+}
 
+pub fn url_config_no_password_test() {
   pgo.url_config("postgres://u@db.test:1234/my_db")
-  |> should.equal(Error(Nil))
+  |> should.equal(Ok(
+    pgo.Config(
+      ..pgo.default_config(),
+      host: "db.test",
+      port: 1234,
+      database: "my_db",
+      user: "u",
+      password: None,
+    ),
+  ))
+}
 
+pub fn url_config_path_slash_test() {
   pgo.url_config("postgres://u:p@db.test:1234/my_db/foo")
   |> should.equal(Error(Nil))
 }