Merge pull request #24 from kaeedo/main

Upgrade Pog to v4

Author: Billuc

gleam.toml

@@ -17,16 +17,19 @@ internal_modules = [
 ]
 
 [dependencies]
-gleam_stdlib = ">= 0.60.0 and < 2.0.0"
+gleam_stdlib = ">= 0.60.0 and < 1.0.0"
 argv = ">= 1.0.2 and < 2.0.0"
-pog = ">= 3.1.0 and < 4.0.0"
+pog = ">= 4.0.0 and < 5.0.0"
 envoy = ">= 1.0.2 and < 2.0.0"
-shellout = ">= 1.6.0 and < 2.0.0"
-globlin = ">= 2.0.2 and < 3.0.0"
+shellout = ">= 1.7.0 and < 2.0.0"
+globlin = ">= 2.0.3 and < 3.0.0"
 globlin_fs = ">= 2.0.0 and < 3.0.0"
-simplifile = ">= 2.2.0 and < 3.0.0"
-gtempo = ">= 7.2.0"
-gleam_crypto = ">= 1.5.0 and < 2.0.0"
+simplifile = ">= 2.2.1 and < 3.0.0"
+gtempo = ">= 7.2.2 and < 8.0.0"
+gleam_crypto = ">= 1.5.1 and < 2.0.0"
+gleam_time = ">= 1.2.0 and < 2.0.0"
+gleam_erlang = ">= 1.2.0 and < 2.0.0"
+gleam_otp = ">= 1.0.0 and < 2.0.0"
 
 [dev-dependencies]
-gleeunit = ">= 1.0.0 and < 2.0.0"
+gleeunit = ">= 1.6.0 and < 2.0.0"

manifest.toml

@@ -5,8 +5,11 @@ packages = [
   { name = "argv", version = "1.0.2", build_tools = ["gleam"], requirements = [], otp_app = "argv", source = "hex", outer_checksum = "BA1FF0929525DEBA1CE67256E5ADF77A7CDDFE729E3E3F57A5BDCAA031DED09D" },
   { name = "backoff", version = "1.1.6", build_tools = ["rebar3"], requirements = [], otp_app = "backoff", source = "hex", outer_checksum = "CF0CFFF8995FB20562F822E5CC47D8CCF664C5ECDC26A684CBE85C225F9D7C39" },
   { name = "envoy", version = "1.0.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "envoy", source = "hex", outer_checksum = "95FD059345AA982E89A0B6E2A3BF1CF43E17A7048DCD85B5B65D3B9E4E39D359" },
+  { name = "exception", version = "2.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "exception", source = "hex", outer_checksum = "329D269D5C2A314F7364BD2711372B6F2C58FA6F39981572E5CA68624D291F8C" },
   { name = "filepath", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "B06A9AF0BF10E51401D64B98E4B627F1D2E48C154967DA7AF4D0914780A6D40A" },
   { name = "gleam_crypto", version = "1.5.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_crypto", source = "hex", outer_checksum = "50774BAFFF1144E7872814C566C5D653D83A3EBF23ACC3156B757A1B6819086E" },
+  { name = "gleam_erlang", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_erlang", source = "hex", outer_checksum = "F91CE62A2D011FA13341F3723DB7DB118541AAA5FE7311BD2716D018F01EF9E3" },
+  { name = "gleam_otp", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_stdlib"], otp_app = "gleam_otp", source = "hex", outer_checksum = "7020E652D18F9ABAC9C877270B14160519FA0856EE80126231C505D719AD68DA" },
   { name = "gleam_regexp", version = "1.1.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_regexp", source = "hex", outer_checksum = "9C215C6CA84A5B35BB934A9B61A9A306EC743153BE2B0425A0D032E477B062A9" },
   { name = "gleam_stdlib", version = "0.62.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "DC8872BC0B8550F6E22F0F698CFE7F1E4BDA7312FDEB40D6C3F44C5B706C8310" },
   { name = "gleam_time", version = "1.4.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_time", source = "hex", outer_checksum = "DCDDC040CE97DA3D2A925CDBBA08D8A78681139745754A83998641C8A3F6587E" },
@@ -17,20 +20,23 @@ packages = [
   { name = "opentelemetry_api", version = "1.4.0", build_tools = ["rebar3", "mix"], requirements = [], otp_app = "opentelemetry_api", source = "hex", outer_checksum = "3DFBBFAA2C2ED3121C5C483162836C4F9027DEF469C41578AF5EF32589FCFC58" },
   { name = "pg_types", version = "0.5.0", build_tools = ["rebar3"], requirements = [], otp_app = "pg_types", source = "hex", outer_checksum = "A3023B464AA960BC1628635081E30CCA4F676F2D4C23CCD6179C1C11C9B4A642" },
   { name = "pgo", version = "0.15.0", build_tools = ["rebar3"], requirements = ["backoff", "opentelemetry_api", "pg_types"], otp_app = "pgo", source = "hex", outer_checksum = "4B883D751B8D4247F4D8A6FBAE58EDB6FA9DBC183371299BF84975EE36406388" },
-  { name = "pog", version = "3.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "pgo"], otp_app = "pog", source = "hex", outer_checksum = "35CBBE8F844DE9E5676CF306CDE2BD98AA6A25920D2EBE771FD5A293EB454161" },
+  { name = "pog", version = "4.1.0", build_tools = ["gleam"], requirements = ["exception", "gleam_erlang", "gleam_otp", "gleam_stdlib", "gleam_time", "pgo"], otp_app = "pog", source = "hex", outer_checksum = "E4AFBA39A5FAA2E77291836C9683ADE882E65A06AB28CA7D61AE7A3AD61EBBD5" },
   { name = "shellout", version = "1.7.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "shellout", source = "hex", outer_checksum = "1BDC03438FEB97A6AF3E396F4ABEB32BECF20DF2452EC9A8C0ACEB7BDDF70B14" },
   { name = "simplifile", version = "2.3.0", build_tools = ["gleam"], requirements = ["filepath", "gleam_stdlib"], otp_app = "simplifile", source = "hex", outer_checksum = "0A868DAC6063D9E983477981839810DC2E553285AB4588B87E3E9C96A7FB4CB4" },
 ]
 
 [requirements]
 argv = { version = ">= 1.0.2 and < 2.0.0" }
 envoy = { version = ">= 1.0.2 and < 2.0.0" }
-gleam_crypto = { version = ">= 1.5.0 and < 2.0.0" }
-gleam_stdlib = { version = ">= 0.60.0 and < 2.0.0" }
-gleeunit = { version = ">= 1.0.0 and < 2.0.0" }
-globlin = { version = ">= 2.0.2 and < 3.0.0" }
+gleam_crypto = { version = ">= 1.5.1 and < 2.0.0" }
+gleam_erlang = { version = ">= 1.2.0 and < 2.0.0" }
+gleam_otp = { version = ">= 1.0.0 and < 2.0.0" }
+gleam_stdlib = { version = ">= 0.60.0 and < 1.0.0" }
+gleam_time = { version = ">= 1.2.0 and < 2.0.0" }
+gleeunit = { version = ">= 1.6.0 and < 2.0.0" }
+globlin = { version = ">= 2.0.3 and < 3.0.0" }
 globlin_fs = { version = ">= 2.0.0 and < 3.0.0" }
-gtempo = { version = ">= 7.2.0" }
-pog = { version = ">= 3.1.0 and < 4.0.0" }
-shellout = { version = ">= 1.6.0 and < 2.0.0" }
-simplifile = { version = ">= 2.2.0 and < 3.0.0" }
+gtempo = { version = ">= 7.2.2 and < 8.0.0" }
+pog = { version = ">= 4.0.0 and < 5.0.0" }
+shellout = { version = ">= 1.7.0 and < 2.0.0" }
+simplifile = { version = ">= 2.2.1 and < 3.0.0" }

src/cigogne/internal/database.gleam

@@ -3,9 +3,11 @@ import cigogne/internal/utils
 import cigogne/types
 import envoy
 import gleam/dynamic/decode
+import gleam/erlang/process
 import gleam/list
 import gleam/option
 import gleam/result
+import gleam/time/timestamp
 import pog
 import shellout
 
@@ -76,20 +78,35 @@ fn connect(
       envoy.get("DATABASE_URL")
       |> result.replace_error(types.EnvVarError("DATABASE_URL"))
       |> result.try(fn(url) {
-        pog.url_config(url)
-        |> result.replace_error(types.UrlError(url))
-        |> result.map(fn(c) { #(pog.connect(c), option.Some(url)) })
+        connection_from_url(url)
+        |> result.map(fn(c) { #(c, option.Some(url)) })
       })
     }
-    types.PogConfig(config:) -> Ok(#(config |> pog.connect, option.None))
+    types.PogConfig(config:) ->
+      config
+      |> pog.start
+      |> result.map_error(types.ActorStartError)
+      |> result.map(fn(actor) { #(actor.data, option.None) })
     types.UrlConfig(url:) -> {
-      pog.url_config(url)
-      |> result.replace_error(types.UrlError(url))
-      |> result.map(fn(c) { #(pog.connect(c), option.Some(url)) })
+      connection_from_url(url)
+      |> result.map(fn(c) { #(c, option.Some(url)) })
     }
   }
 }
 
+fn connection_from_url(
+  url: String,
+) -> Result(pog.Connection, types.MigrateError) {
+  let db_process_name = process.new_name("cigogne")
+
+  pog.url_config(db_process_name, url)
+  |> result.replace_error(types.UrlError(url))
+  |> result.try(fn(c) {
+    pog.start(c) |> result.map_error(types.ActorStartError)
+  })
+  |> result.map(fn(actor) { actor.data })
+}
+
 pub fn migrations_table_exists(
   data: DatabaseData,
 ) -> Result(Bool, types.MigrateError) {
@@ -215,7 +232,7 @@ pub fn get_applied_migrations(
 }
 
 fn build_migration_data(
-  data: #(pog.Timestamp, String, String),
+  data: #(timestamp.Timestamp, String, String),
 ) -> Result(types.Migration, types.MigrateError) {
   case utils.pog_to_tempo_timestamp(data.0) {
     Error(_) ->

src/cigogne/internal/utils.gleam

@@ -5,6 +5,8 @@ import gleam/int
 import gleam/list
 import gleam/result
 import gleam/string
+import gleam/time/calendar
+import gleam/time/timestamp
 import pog
 import tempo
 import tempo/date
@@ -32,7 +34,7 @@ pub fn describe_query_error(error: pog.QueryError) -> String {
   }
 }
 
-pub fn describe_transaction_error(error: pog.TransactionError) -> String {
+pub fn describe_transaction_error(error: pog.TransactionError(_)) -> String {
   case error {
     pog.TransactionQueryError(suberror) -> describe_query_error(suberror)
     pog.TransactionRolledBack(message) ->
@@ -50,37 +52,45 @@ pub fn describe_decode_error(error: decode.DecodeError) -> String {
   <> "]"
 }
 
-pub fn tempo_to_pog_timestamp(from: tempo.NaiveDateTime) -> pog.Timestamp {
-  let as_tuple = from |> naive_datetime.to_tuple
+pub fn tempo_to_pog_timestamp(from: tempo.NaiveDateTime) -> timestamp.Timestamp {
+  let #(#(year, month, day), #(hour, minutes, seconds)) =
+    from |> naive_datetime.to_tuple
 
-  pog.Timestamp(
-    pog.Date(as_tuple.0.0, as_tuple.0.1, as_tuple.0.2),
-    pog.Time(as_tuple.1.0, as_tuple.1.1, as_tuple.1.2, 0),
-  )
+  let assert Ok(month) = calendar.month_from_int(month)
+
+  let date = calendar.Date(year, month, day)
+  let time = calendar.TimeOfDay(hour, minutes, seconds, 0)
+
+  timestamp.from_calendar(date, time, calendar.utc_offset)
 }
 
 pub fn pog_to_tempo_timestamp(
-  from: pog.Timestamp,
+  from: timestamp.Timestamp,
 ) -> Result(tempo.NaiveDateTime, Nil) {
-  use date <- result.try(pog_to_tempo_date(from.date))
-  use time <- result.try(pog_to_tempo_time(from.time))
+  let #(date, time_of_day) = from |> timestamp.to_calendar(calendar.utc_offset)
+
+  use date <- result.try(pog_to_tempo_date(date))
+  use time <- result.try(pog_to_tempo_time(time_of_day))
   Ok(naive_datetime.new(date, time))
 }
 
-fn pog_to_tempo_date(from: pog.Date) -> Result(tempo.Date, Nil) {
-  date.new(from.year, from.month, from.day) |> result.replace_error(Nil)
+fn pog_to_tempo_date(from: calendar.Date) -> Result(tempo.Date, Nil) {
+  date.new(from.year, from.month |> calendar.month_to_int(), from.day)
+  |> result.replace_error(Nil)
 }
 
-fn pog_to_tempo_time(from: pog.Time) -> Result(tempo.Time, Nil) {
+fn pog_to_tempo_time(from: calendar.TimeOfDay) -> Result(tempo.Time, Nil) {
   time.new(from.hours, from.minutes, from.seconds) |> result.replace_error(Nil)
 }
 
-pub fn pog_timestamp_to_string(value: pog.Timestamp) -> String {
-  [value.date.year, value.date.month, value.date.day]
+pub fn pog_timestamp_to_string(value: timestamp.Timestamp) -> String {
+  let #(date, time_of_day) = value |> timestamp.to_calendar(calendar.utc_offset)
+
+  [date.year, date.month |> calendar.month_to_int(), date.day]
   |> list.map(int.to_string)
   |> string.join("-")
   <> " "
-  <> [value.time.hours, value.time.minutes, value.time.seconds]
+  <> [time_of_day.hours, time_of_day.minutes, time_of_day.seconds]
   |> list.map(fn(v: Int) {
     case v {
       v if v < 10 -> "0" <> int.to_string(v)

src/cigogne/types.gleam

@@ -1,6 +1,7 @@
 import cigogne/internal/utils
 import gleam/io
 import gleam/list
+import gleam/otp/actor
 import pog
 import tempo
 import tempo/naive_datetime
@@ -44,7 +45,7 @@ pub type MigrateError {
   FileNameError(path: String)
   CompoundError(errors: List(MigrateError))
   ContentError(path: String, error: String)
-  PGOTransactionError(error: pog.TransactionError)
+  PGOTransactionError(error: pog.TransactionError(String))
   PGOQueryError(error: pog.QueryError)
   NoResultError
   SchemaQueryError(error: String)
@@ -54,6 +55,7 @@ pub type MigrateError {
   DateParseError(date: String)
   FileHashChanged(migration_ts: tempo.NaiveDateTime, migration_name: String)
   NameTooLongError(name: String)
+  ActorStartError(error: actor.StartError)
 }
 
 /// Migrations are often generated by reading migration files.
@@ -133,5 +135,13 @@ pub fn print_migrate_error(error: MigrateError) -> Nil {
       )
     CreateFolderError(path) ->
       io.println_error("Couldn't create folder at path [" <> path <> "]")
+    ActorStartError(error:) ->
+      case error {
+        actor.InitExited(_) ->
+          io.println_error("Actor init exited unexpectedly")
+        actor.InitFailed(reason) ->
+          io.println_error("Actor init failed: " <> reason)
+        actor.InitTimeout -> io.println_error("Connection actor init timed out")
+      }
   }
 }

test/cigogne_test/internal/database_test.gleam

@@ -2,6 +2,7 @@ import cigogne/internal/database
 import cigogne/internal/migrations_utils
 import cigogne/types
 import envoy
+import gleam/erlang/process
 import gleam/list
 import gleam/option
 import gleam/result
@@ -55,10 +56,11 @@ pub fn init_with_url_test() {
 }
 
 pub fn init_with_pog_config_test() {
+  let name = process.new_name("cigogne_test")
   let init_res =
     database.init(
       types.PogConfig(
-        pog.default_config()
+        pog.default_config(name)
         |> pog.host("localhost")
         |> pog.port(5432)
         |> pog.user(db_user)
@@ -76,11 +78,12 @@ pub fn init_with_pog_config_test() {
 }
 
 pub fn init_with_connection_test() {
-  let assert Ok(conf) = pog.url_config(db_url())
-  let conn = pog.connect(conf)
+  let name = process.new_name("cigogne_test")
+  let assert Ok(conf) = pog.url_config(name, db_url())
+  let assert Ok(actor) = pog.start(conf)
 
   let init_res =
-    database.init(types.ConnectionConfig(conn), schema, migration_table)
+    database.init(types.ConnectionConfig(actor.data), schema, migration_table)
   let assert Ok(init_res) = init_res
 
   assert init_res.db_url == option.None

test/cigogne_test/internal/utils_test.gleam

@@ -1,7 +1,8 @@
 import cigogne/internal/utils
 import gleam/string
+import gleam/time/calendar
+import gleam/time/timestamp
 import gleeunit/should
-import pog
 import tempo/naive_datetime
 
 pub fn tempo_epoch_test() {
@@ -13,18 +14,30 @@ pub fn tempo_epoch_test() {
 pub fn tempo_to_pog_test() {
   naive_datetime.literal("2004-10-15T04:25:33")
   |> utils.tempo_to_pog_timestamp
-  |> should.equal(pog.Timestamp(pog.Date(2004, 10, 15), pog.Time(04, 25, 33, 0)))
+  |> should.equal(timestamp.from_calendar(
+    calendar.Date(2004, calendar.October, 15),
+    calendar.TimeOfDay(04, 25, 33, 0),
+    calendar.utc_offset,
+  ))
 }
 
 pub fn pog_to_tempo_test() {
-  pog.Timestamp(pog.Date(2410, 12, 24), pog.Time(16, 42, 0, 0))
+  timestamp.from_calendar(
+    calendar.Date(2410, calendar.December, 24),
+    calendar.TimeOfDay(16, 42, 0, 0),
+    calendar.utc_offset,
+  )
   |> utils.pog_to_tempo_timestamp
   |> should.be_ok
   |> should.equal(naive_datetime.literal("2410-12-24T16:42:00"))
 }
 
 pub fn pog_to_string_test() {
-  pog.Timestamp(pog.Date(2410, 12, 24), pog.Time(16, 42, 0, 0))
+  timestamp.from_calendar(
+    calendar.Date(2410, calendar.December, 24),
+    calendar.TimeOfDay(16, 42, 0, 0),
+    calendar.utc_offset,
+  )
   |> utils.pog_timestamp_to_string
   |> should.equal("2410-12-24 16:42:00")
 }