From b285f5fba6f31ae127b6e2a10c17790f419f5d88 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Mon, 3 Feb 2025 09:40:37 -0500 Subject: [PATCH] fix: Fix regression for schema cache reloading via NOTIFY on Windows Upstream accidentally removed the fix, which was introduced for #2524. Fixed again. --- CHANGELOG.md | 1 + cabal.project.freeze | 2 +- nix/overlays/haskell-packages.nix | 8 ++++++++ postgrest.cabal | 2 +- stack-21.7.yaml | 2 +- stack-21.7.yaml.lock | 6 +++--- stack.yaml | 1 + stack.yaml.lock | 7 +++++++ 8 files changed, 23 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a92aeea76..634d06e01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed + - #2524, Fix schema reloading notice on windows - @diogob - #3693, Prevent spread embedding to allow aggregates when they are disabled - @laurenceisla - #3693, A nested spread embedding now correctly groups by the fields of its top parent relationship - @laurenceisla - #3693, Fix spread embedding errors when using the `count()` aggregate without a field - @laurenceisla diff --git a/cabal.project.freeze b/cabal.project.freeze index 9a875ecec..1ef087e24 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -1 +1 @@ -index-state: hackage.haskell.org 2024-11-10T13:08:54Z +index-state: hackage.haskell.org 2025-02-01T14:59:33Z diff --git a/nix/overlays/haskell-packages.nix b/nix/overlays/haskell-packages.nix index 917ab2478..6d14cf0d4 100644 --- a/nix/overlays/haskell-packages.nix +++ b/nix/overlays/haskell-packages.nix @@ -58,6 +58,14 @@ let } { }); + hasql-notifications = lib.dontCheck (prev.callHackageDirect + { + pkg = "hasql-notifications"; + ver = "0.2.2.2"; + sha256 = "sha256-myKwlug7OgTa/qP6mHfCD+5Q8IhM17JvpJBfSo+M01k="; + } + { }); + jose-jwt = prev.jose-jwt_0_10_0; postgresql-libpq = lib.dontCheck (prev.callHackageDirect diff --git a/postgrest.cabal b/postgrest.cabal index 1377640ec..321893757 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -110,7 +110,7 @@ library , fuzzyset >= 0.2.4 && < 0.3 , hasql >= 1.6.1.1 && < 1.7 , hasql-dynamic-statements >= 0.3.1 && < 0.4 - , hasql-notifications >= 0.2.2.0 && < 0.3 + , hasql-notifications >= 0.2.2.2 && < 0.2.3 , hasql-pool >= 1.0.1 && < 1.1 , hasql-transaction >= 1.0.1 && < 1.1 , heredoc >= 0.2 && < 0.3 diff --git a/stack-21.7.yaml b/stack-21.7.yaml index e75e6a77c..de212c4e3 100644 --- a/stack-21.7.yaml +++ b/stack-21.7.yaml @@ -19,6 +19,6 @@ nix: extra-deps: - configurator-pg-0.2.10 - fuzzyset-0.2.4 - - hasql-notifications-0.2.2.0 + - hasql-notifications-0.2.2.2 - hasql-pool-1.0.1 - postgresql-libpq-0.10.1.0 diff --git a/stack-21.7.yaml.lock b/stack-21.7.yaml.lock index a9cc5866a..e9f8ff610 100644 --- a/stack-21.7.yaml.lock +++ b/stack-21.7.yaml.lock @@ -19,12 +19,12 @@ packages: original: hackage: fuzzyset-0.2.4 - completed: - hackage: hasql-notifications-0.2.2.0@sha256:a4e591ef3f06647b056567d3b66948c4a85371f05deb5434edb6ce190f7c845d,2021 + hackage: hasql-notifications-0.2.2.2@sha256:d1d6bc0d3ee5e418fc12ea023b78739e0decba6c34e2b43bec55b89e18bd4412,2025 pantry-tree: - sha256: bd7192a5e82ef6dbac711c3433408a0330c8db1cd3482be1ccd4fbd0a63bc2f6 + sha256: 83a9cbb179b1efd0b2acd6509583c7afcdbe63469ab033d8581d48d675a80b44 size: 452 original: - hackage: hasql-notifications-0.2.2.0 + hackage: hasql-notifications-0.2.2.2 - completed: hackage: hasql-pool-1.0.1@sha256:3cfb4c7153a6c536ac7e126c17723e6d26ee03794954deed2d72bcc826d05a40,2302 pantry-tree: diff --git a/stack.yaml b/stack.yaml index 477fe59f3..66ab15957 100644 --- a/stack.yaml +++ b/stack.yaml @@ -14,3 +14,4 @@ extra-deps: - hasql-pool-1.0.1 - jose-jwt-0.10.0 - postgresql-libpq-0.10.1.0 + - hasql-notifications-0.2.2.2 diff --git a/stack.yaml.lock b/stack.yaml.lock index 4b5fce07d..b438b8b68 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -32,6 +32,13 @@ packages: size: 1096 original: hackage: postgresql-libpq-0.10.1.0 +- completed: + hackage: hasql-notifications-0.2.2.2@sha256:d1d6bc0d3ee5e418fc12ea023b78739e0decba6c34e2b43bec55b89e18bd4412,2025 + pantry-tree: + sha256: 83a9cbb179b1efd0b2acd6509583c7afcdbe63469ab033d8581d48d675a80b44 + size: 452 + original: + hackage: hasql-notifications-0.2.2.2 snapshots: - completed: sha256: 1e32b51d9082fdf6f3bd92accc9dfffd4ddaf406404427fb10bf76d2bc03cbbb