Merge pull request #4 from inoas/new-fix-sqlight-decoder

fix: sqlight decoder rebased on main

Author: inoas

CHANGELOG.md

@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 <!-- ## [Unreleased] -->
+## [1.1.0] - 2025-01-11
+
+- Fixed compatibility with `gleam_stdlib >= 0.50` and `sqlight >= 1.0.0`.
+
 ## [1.0.3] - 2025-01-11
 
 - Dev release: Added basic unit tests and CI pipeline.

gleam.toml

@@ -1,12 +1,11 @@
 name = "cake_sqlight"
-version = "1.0.3"
+version = "1.1.0"
 description = "🎂Cake 🪶SQLite adapter which passes PreparedStatements to the sqlight library for execution written in Gleam."
 licences = ["MPL-2.0"]
 repository = { type = "github", user = "inoas", repo = "gleam-cake-sqlight" }
 # links = [{ title = "Website", href = "https://gleam.run" }]
 
-gleam = ">= 1.4.0 and < 2.0.0"
-dev-dependencies = { gleeunit = ">= 1.2.0 and < 2.0.0", pprint = ">= 1.0.4 and < 2.0.0", birdie = ">= 1.2.3 and < 2.0.0" }
+gleam = ">= 1.6.0"
 
 [documentation]
 pages = [
@@ -15,5 +14,10 @@ pages = [
 
 [dependencies]
 cake = ">= 2.0.0 and < 3.0.0"
-gleam_stdlib = ">= 0.40.0 and < 2.0.0"
-sqlight = ">= 0.9.1 and < 2.0.0"
+gleam_stdlib = ">= 0.50.0 and <= 2.0.0"
+sqlight = ">= 1.0.0 and < 2.0.0"
+
+[dev-dependencies]
+pprint = ">= 1.0.4 and < 2.0.0"
+gleeunit = ">= 1.2.0 and < 2.0.0"
+birdie = ">= 1.2.3 and < 2.0.0"

manifest.toml

@@ -3,33 +3,33 @@
 
 packages = [
   { name = "argv", version = "1.0.2", build_tools = ["gleam"], requirements = [], otp_app = "argv", source = "hex", outer_checksum = "BA1FF0929525DEBA1CE67256E5ADF77A7CDDFE729E3E3F57A5BDCAA031DED09D" },
-  { name = "birdie", version = "1.2.3", build_tools = ["gleam"], requirements = ["argv", "edit_distance", "filepath", "glance", "gleam_community_ansi", "gleam_erlang", "gleam_stdlib", "justin", "rank", "simplifile", "trie_again"], otp_app = "birdie", source = "hex", outer_checksum = "AE1207210E9CC8F4170BCE3FB3C23932F314C352C3FD1BCEA44CF4BF8CF60F93" },
-  { name = "cake", version = "2.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "cake", source = "hex", outer_checksum = "0F9D47447C0BDABE21522CC9792DA42AEBC1EC43E53919F6173FD843DA88A1B8" },
+  { name = "birdie", version = "1.2.5", build_tools = ["gleam"], requirements = ["argv", "edit_distance", "filepath", "glance", "gleam_community_ansi", "gleam_erlang", "gleam_stdlib", "justin", "rank", "simplifile", "trie_again"], otp_app = "birdie", source = "hex", outer_checksum = "2531AD6AC71C89DFB7ECC8839C3DAB858963ECA425E9308302D3B93B8AE0FEAD" },
+  { name = "cake", version = "2.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "cake", source = "hex", outer_checksum = "141FEBE63A3BBD2872232BBB61B83E75F9367A4C07DD825286D58AF8D86D7702" },
   { name = "edit_distance", version = "2.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "edit_distance", source = "hex", outer_checksum = "A1E485C69A70210223E46E63985FA1008B8B2DDA9848B7897469171B29020C05" },
-  { name = "esqlite", version = "0.8.8", build_tools = ["rebar3"], requirements = [], otp_app = "esqlite", source = "hex", outer_checksum = "374902457C7D94DC9409C98D3BDD1CA0D50A60DC9F3BDF1FD8EB74C0DCDF02D6" },
-  { name = "filepath", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "EFB6FF65C98B2A16378ABC3EE2B14124168C0CE5201553DE652E2644DCFDB594" },
+  { name = "esqlite", version = "0.8.9", build_tools = ["rebar3"], requirements = [], otp_app = "esqlite", source = "hex", outer_checksum = "465AE9AE28AE4192EA54C829FDC90C320447D439A9B2E10946621672FC6A6F8C" },
+  { name = "filepath", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "67A6D15FB39EEB69DD31F8C145BB5A421790581BD6AA14B33D64D5A55DBD6587" },
   { name = "glam", version = "2.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "glam", source = "hex", outer_checksum = "66EC3BCD632E51EED029678F8DF419659C1E57B1A93D874C5131FE220DFAD2B2" },
-  { name = "glance", version = "0.11.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "glexer"], otp_app = "glance", source = "hex", outer_checksum = "8F3314D27773B7C3B9FB58D8C02C634290422CE531988C0394FA0DF8676B964D" },
+  { name = "glance", version = "2.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "glexer"], otp_app = "glance", source = "hex", outer_checksum = "784CE3B5658CF589B2E811031992FDADDFA9C7FD2A51F1140EE019F121D6D0EB" },
   { name = "gleam_community_ansi", version = "1.4.2", build_tools = ["gleam"], requirements = ["gleam_community_colour", "gleam_regexp", "gleam_stdlib"], otp_app = "gleam_community_ansi", source = "hex", outer_checksum = "479DEDC748D08B310C9FEB9C4CBEC46B95C874F7F4F2844304D6D20CA78A8BB5" },
   { name = "gleam_community_colour", version = "1.4.1", build_tools = ["gleam"], requirements = ["gleam_json", "gleam_stdlib"], otp_app = "gleam_community_colour", source = "hex", outer_checksum = "386CB9B01B33371538672EEA8A6375A0A0ADEF41F17C86DDCB81C92AD00DA610" },
   { name = "gleam_erlang", version = "0.33.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_erlang", source = "hex", outer_checksum = "A1D26B80F01901B59AABEE3475DD4C18D27D58FA5C897D922FCB9B099749C064" },
-  { name = "gleam_json", version = "2.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "CB10B0E7BF44282FB25162F1A24C1A025F6B93E777CCF238C4017E4EEF2CDE97" },
+  { name = "gleam_json", version = "2.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "C55C5C2B318533A8072D221C5E06E5A75711C129E420DD1CE463342106012E5D" },
   { name = "gleam_regexp", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_regexp", source = "hex", outer_checksum = "A3655FDD288571E90EE9C4009B719FEF59FA16AFCDF3952A76A125AF23CF1592" },
-  { name = "gleam_stdlib", version = "0.40.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "86606B75A600BBD05E539EB59FABC6E307EEEA7B1E5865AFB6D980A93BCB2181" },
+  { name = "gleam_stdlib", version = "0.52.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "50703862DF26453B277688FFCDBE9DD4AC45B3BD9742C0B370DB62BC1629A07D" },
   { name = "gleeunit", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "F7A7228925D3EE7D0813C922E062BFD6D7E9310F0BEE585D3A42F3307E3CFD13" },
-  { name = "glexer", version = "1.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "glexer", source = "hex", outer_checksum = "BD477AD657C2B637FEF75F2405FAEFFA533F277A74EF1A5E17B55B1178C228FB" },
+  { name = "glexer", version = "2.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "glexer", source = "hex", outer_checksum = "F74FB4F78C3C1E158DF15A7226F33A662672F58EEF1DFE6593B7FCDA38B0A0EB" },
   { name = "justin", version = "1.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "justin", source = "hex", outer_checksum = "7FA0C6DB78640C6DC5FBFD59BF3456009F3F8B485BF6825E97E1EB44E9A1E2CD" },
   { name = "pprint", version = "1.0.4", build_tools = ["gleam"], requirements = ["glam", "gleam_stdlib"], otp_app = "pprint", source = "hex", outer_checksum = "C310A98BDC0995644847C3C8702DE19656D6BCD638B2A8A358B97824379ECAA1" },
   { name = "rank", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "rank", source = "hex", outer_checksum = "5660E361F0E49CBB714CC57CC4C89C63415D8986F05B2DA0C719D5642FAD91C9" },
   { name = "simplifile", version = "2.2.0", build_tools = ["gleam"], requirements = ["filepath", "gleam_stdlib"], otp_app = "simplifile", source = "hex", outer_checksum = "0DFABEF7DC7A9E2FF4BB27B108034E60C81BEBFCB7AB816B9E7E18ED4503ACD8" },
-  { name = "sqlight", version = "0.9.1", build_tools = ["gleam"], requirements = ["esqlite", "gleam_stdlib"], otp_app = "sqlight", source = "hex", outer_checksum = "A495F2892627B2268CCBCC5107EDC1E1AD9547D5F4F21A5DB04CEA72B8931B00" },
+  { name = "sqlight", version = "1.0.0", build_tools = ["gleam"], requirements = ["esqlite", "gleam_stdlib"], otp_app = "sqlight", source = "hex", outer_checksum = "18A860646F29DDDDE819A9561696E6A4CA9825770EE7A9CA039E58EF5C312EC0" },
   { name = "trie_again", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "trie_again", source = "hex", outer_checksum = "5B19176F52B1BD98831B57FDC97BD1F88C8A403D6D8C63471407E78598E27184" },
 ]
 
 [requirements]
 birdie = { version = ">= 1.2.3 and < 2.0.0" }
 cake = { version = ">= 2.0.0 and < 3.0.0" }
-gleam_stdlib = { version = ">= 0.40.0 and < 2.0.0" }
+gleam_stdlib = { version = ">= 0.50.0 and <= 2.0.0" }
 gleeunit = { version = ">= 1.2.0 and < 2.0.0" }
 pprint = { version = ">= 1.0.4 and < 2.0.0" }
-sqlight = { version = ">= 0.9.1 and < 2.0.0" }
+sqlight = { version = ">= 1.0.0 and < 2.0.0" }

src/cake/adapter/sqlite.gleam

@@ -10,7 +10,7 @@ import cake/dialect/sqlite_dialect
 import cake/param.{
   type Param, BoolParam, FloatParam, IntParam, NullParam, StringParam,
 }
-import gleam/dynamic.{type DecodeError, type Dynamic}
+import gleam/dynamic/decode.{type Decoder}
 import gleam/list
 import sqlight.{type Connection, type Error, type Value}
 
@@ -53,7 +53,7 @@ pub fn write_query_to_prepared_statement(
 ///
 pub fn run_read_query(
   query query: ReadQuery,
-  decoder decoder: fn(Dynamic) -> Result(a, List(DecodeError)),
+  decoder decoder: Decoder(a),
   db_connection db_connection: Connection,
 ) -> Result(List(a), Error) {
   let prepared_statement = query |> read_query_to_prepared_statement
@@ -71,7 +71,7 @@ pub fn run_read_query(
 ///
 pub fn run_write_query(
   query query: WriteQuery(a),
-  decoder decoder: fn(Dynamic) -> Result(a, List(DecodeError)),
+  decoder decoder: Decoder(a),
   db_connection db_connection: Connection,
 ) -> Result(List(a), Error) {
   let prepared_statement = query |> write_query_to_prepared_statement
@@ -91,7 +91,7 @@ pub fn run_write_query(
 ///
 pub fn run_query(
   query query: CakeQuery(a),
-  decoder decoder: fn(Dynamic) -> Result(a, List(DecodeError)),
+  decoder decoder: Decoder(a),
   db_connection db_connection: Connection,
 ) -> Result(List(a), Error) {
   case query {

test/test_helper/sqlite_test_helper.gleam

@@ -1,5 +1,5 @@
 import cake/adapter/sqlite
-import gleam/dynamic
+import gleam/dynamic/decode
 import test_support/test_data
 
 pub fn setup_and_run(query) {
@@ -18,7 +18,7 @@ pub fn setup_and_run(query) {
   let _ = test_data.create_dogs_table() |> sqlite.execute_raw_sql(conn)
   let _ = test_data.insert_dogs_rows() |> sqlite.execute_raw_sql(conn)
 
-  query |> sqlite.run_read_query(dynamic.dynamic, conn)
+  query |> sqlite.run_read_query(decode.dynamic, conn)
 }
 
 pub fn setup_and_run_write(query) {
@@ -42,5 +42,5 @@ pub fn setup_and_run_write(query) {
   let _ = test_data.create_counters_table() |> sqlite.execute_raw_sql(conn)
   let _ = test_data.insert_counters_rows() |> sqlite.execute_raw_sql(conn)
 
-  query |> sqlite.run_write_query(dynamic.dynamic, conn)
+  query |> sqlite.run_write_query(decode.dynamic, conn)
 }