feat(deps)!: upgrade shibuya-pgmq-adapter and the pgmq-hs family

Bump shibuya-pgmq-adapter to 0.12.0.0 and the pgmq-* family to 0.4.0.0, which
puts the PGMQ path on the pg-migrate 1.1 family alongside kiroku and keiro.
Picks up the adapter fix where idle streams now observe shutdown instead of
polling until forcibly cancelled. shibuya-core is already at its latest 0.8.0.1.

pgmq-migration 0.4 removed its migrate/upgrade/validate runner in favor of a
native pg-migrate component, so the keiro-pgmq suite no longer installs the PGMQ
schema with a second, standalone migration. A pg-migrate ledger is shared by
every component in it, and a pgmq-only plan failed strict verification with
UnknownStoredMigration against a template that already carried the kiroku and
keiro components. The component is now composed into the framework plan so one
ledger owns all three.

Drop the hasql-migration source-repository-package pin: it existed only for
pgmq-migration 0.3, and nothing in the build plan depends on it now.

BREAKING CHANGE: Keiro.Test.Postgres.withMigratedSuiteWith takes
[MigrationComponent] appended to the framework plan instead of a Text -> IO ()
hook that ran its own migration against the template database.

Author: shinzui

CHANGELOG.md

@@ -10,6 +10,13 @@ packages follow the [Haskell Package Versioning Policy](https://pvp.haskell.org/
 
 - `keiro-migrate check` now takes the manifest as `--manifest PATH` instead of a
   positional argument, following the `pg-migrate-cli` 1.1.0.0 parser.
+- `Keiro.Test.Postgres.withMigratedSuiteWith` now takes `[MigrationComponent]` —
+  extra `pg-migrate` components appended to the framework plan — instead of a
+  `Text -> IO ()` hook that ran its own migration against the template database.
+  A `pg-migrate` ledger is shared by every component in it, so a second plan that
+  omitted Kiroku's and Keiro's components failed strict verification with
+  `UnknownStoredMigration`. Suites that installed extra schema (such as PGMQ) now
+  pass the component itself: `withMigratedSuiteWith [pgmqMigrations]`.
 
 ### Changed
 
@@ -21,6 +28,17 @@ packages follow the [Haskell Package Versioning Policy](https://pvp.haskell.org/
   From `kiroku-store` 0.3.0.1, a failure raised inside an opaque `runTransaction`
   body now preserves its SQLSTATE and server message instead of surfacing as
   `StreamNotFound (StreamName "<transaction>")`.
+- Upgraded `keiro-pgmq` to `shibuya-pgmq-adapter` 0.12.0.0 and the `pgmq-*` 0.4
+  package family, which is what aligns the PGMQ path with pg-migrate 1.1. The
+  adapter's own API is unchanged; the notable fix is that idle streams now observe
+  shutdown, so a processor with nothing to consume finishes on request instead of
+  polling until it is forcibly cancelled. `shibuya-core` stays at 0.8.0.1 (already
+  the latest).
+- Dropped the `hasql-migration` `source-repository-package` pin from
+  `cabal.project`. It existed only because `pgmq-migration` 0.3 depended on
+  `hasql-migration`, whose Hackage release does not build against hasql 1.10;
+  `pgmq-migration` 0.4 is a native `pg-migrate` component and nothing in the build
+  plan depends on it now.
 
 ## 0.2.0.0 — 2026-07-13
 

cabal.project

@@ -12,15 +12,5 @@ source-repository-package
   location: https://github.com/mzabani/codd.git
   tag: v0.1.8
 
--- The keiro-pgmq test suite installs the PGMQ schema with pgmq-migration, which
--- depends on hasql-migration. The Hackage hasql-migration 0.3.1 does not build
--- against the hasql 1.10 ecosystem this repo uses (it uses Statement as a
--- term-level constructor). Pin the patched fork, matching pgmq-hs's own
--- cabal.project. Only the test build pulls this in; the library does not.
-source-repository-package
-  type: git
-  location: https://github.com/shinzui/hasql-migration
-  tag: 4aaff6c0919d1fe8e1c248c3ce4ce05775c59c8c
-
 allow-newer:
   haxl:time

keiro-pgmq/CHANGELOG.md

@@ -6,7 +6,17 @@ All notable changes to `keiro-pgmq` are recorded here. The format follows
 
 ## [Unreleased]
 
-_No unreleased changes._
+### Changed
+
+- Upgraded to `shibuya-pgmq-adapter` 0.12.0.0 and the `pgmq-*` 0.4 package family
+  (`pgmq-core`, `pgmq-config`, `pgmq-effectful`, `pgmq-hasql`, and `pgmq-migration`
+  in the test suite). `keiro-pgmq`'s own API is unchanged. The adapter's 0.12 fix
+  makes idle streams observe shutdown: a processor with nothing to consume now
+  finishes on request instead of polling until it is forcibly cancelled.
+- The test suite installs the PGMQ schema by appending `pgmq-migration`'s native
+  `pgmqMigrations` component to the suite's framework plan, rather than calling the
+  `migrate` runner that `pgmq-migration` 0.4 removed. One pg-migrate ledger now owns
+  the kiroku, keiro, and pgmq components together.
 
 ## 0.2.0.0 — 2026-07-13
 

keiro-pgmq/keiro-pgmq.cabal

@@ -59,12 +59,12 @@ library
     , hasql-pool            >=1.2
     , hs-opentelemetry-api  >=1.0      && <1.1
     , keiro-core            ^>=0.2.0.0
-    , pgmq-config           >=0.3      && <0.4
-    , pgmq-core             >=0.3      && <0.4
-    , pgmq-effectful        >=0.3      && <0.4
-    , pgmq-hasql            >=0.3      && <0.4
+    , pgmq-config           >=0.4      && <0.5
+    , pgmq-core             >=0.4      && <0.5
+    , pgmq-effectful        >=0.4      && <0.5
+    , pgmq-hasql            >=0.4      && <0.5
     , shibuya-core          >=0.8.0.1  && <0.9
-    , shibuya-pgmq-adapter  >=0.11     && <0.12
+    , shibuya-pgmq-adapter  >=0.12     && <0.13
     , streamly-core         >=0.3
     , text                  >=2.1
     , time                  >=1.12
@@ -88,10 +88,10 @@ test-suite keiro-pgmq-test
     , keiro-core                       ^>=0.2.0.0
     , keiro-pgmq
     , keiro-test-support
-    , pgmq-config                      >=0.3      && <0.4
-    , pgmq-core                        >=0.3      && <0.4
-    , pgmq-effectful                   >=0.3      && <0.4
-    , pgmq-migration                   >=0.3      && <0.4
+    , pgmq-config                      >=0.4      && <0.5
+    , pgmq-core                        >=0.4      && <0.5
+    , pgmq-effectful                   >=0.4      && <0.5
+    , pgmq-migration                   >=0.4      && <0.5
     , shibuya-core                     >=0.8.0.1  && <0.9
-    , shibuya-pgmq-adapter             >=0.11     && <0.12
+    , shibuya-pgmq-adapter             >=0.12     && <0.13
     , text                             >=2.1

keiro-pgmq/test/Main.hs

@@ -76,22 +76,16 @@ data Ping = Ping
 type Stack = '[Reader PgmqAdapterEnv, Pgmq, Tracing, Error PgmqRuntimeError, IOE]
 
 main :: IO ()
-main =
-    Postgres.withMigratedSuiteWith installPgmq \fixture ->
+main = do
+    -- PGMQ's schema is installed by appending pgmq-migration's native component to
+    -- the suite's framework plan, so one pg-migrate ledger owns kiroku, keiro, and
+    -- pgmq together.
+    pgmq <- either (fail . show) pure Migration.pgmqMigrations
+    Postgres.withMigratedSuiteWith [pgmq] \fixture ->
         hspec $
             describe "Keiro.PGMQ" $
                 around (Postgres.withFreshDatabase fixture) spec
 
--- | Install the PGMQ schema into the ephemeral database via @pgmq-migration@.
-installPgmq :: Text -> IO ()
-installPgmq connStr =
-    withPool connStr $ \pool -> do
-        result <- Pool.use pool Migration.migrate
-        case result of
-            Left usageErr -> fail ("pgmq pool error during migration: " <> show usageErr)
-            Right (Left migErr) -> fail ("pgmq migration error: " <> show migErr)
-            Right (Right ()) -> pure ()
-
 withPool :: Text -> (Pool -> IO a) -> IO a
 withPool connStr =
     bracket

keiro-test-support/src/Keiro/Test/Postgres.hs

@@ -17,7 +17,7 @@ Usage from @hspec@:
 @
 main :: IO ()
 main =
-  'withMigratedSuiteWith' installExtraSchema \\fixture ->
+  'withMigratedSuiteWith' [pgmqMigrations] \\fixture ->
     hspec $
       describe "..." $ around ('withFreshStore' fixture) $ do
         it "..." $ \\store -> ...
@@ -39,17 +39,18 @@ where
 
 import Control.Concurrent.STM (TVar, atomically, newTVarIO, stateTVar)
 import Control.Exception (bracket, onException)
+import Data.List.NonEmpty (NonEmpty (..))
 import Data.Text (Text)
 import Data.Text qualified as Text
-import Database.PostgreSQL.Migrate (defaultRunOptions, runMigrationPlan)
+import Database.PostgreSQL.Migrate (MigrationComponent, defaultRunOptions, migrationPlan, runMigrationPlan)
 import Effectful (Eff, IOE, UnliftStrategy (..), runEff, withEffToIO)
 import Effectful.Error.Static (Error, runErrorNoCallStack)
 import EphemeralPg qualified as Pg
 import Hasql.Connection.Settings qualified as Conn
 import Hasql.Pool qualified as Pool
 import Hasql.Pool.Config qualified as Pool.Config
 import Hasql.Session qualified as Session
-import Keiro.Migrations (frameworkMigrationPlan, keiroMigrations)
+import Keiro.Migrations (keiroMigrations)
 import Kiroku.Store qualified as Store
 import Kiroku.Store.Effect (Store, runStoreResource)
 import Kiroku.Store.Effect.Resource (KirokuStoreResource, getKirokuStore, withKirokuStore)
@@ -77,15 +78,21 @@ Kiroku event-store schema and Keiro framework schema to it once, then run
 are applied here against the template before any example clones it.
 -}
 withMigratedSuite :: (Fixture -> IO a) -> IO a
-withMigratedSuite = withMigratedSuiteWith \_ -> pure ()
-
-{- | Like 'withMigratedSuite', but runs an extra migration hook against the
-template database after the Kiroku and Keiro migrations and before any example
-database is cloned. Use this for suites that need additional schema, such as
-PGMQ tables, in every fresh database.
+withMigratedSuite = withMigratedSuiteWith []
+
+{- | Like 'withMigratedSuite', but appends extra @pg-migrate@ components to the
+framework plan so the template database also carries their schema — for example
+@pgmq-migration@'s @pgmqMigrations@. The extra components are applied after
+Kiroku's and Keiro's, in the order given, and before any example database is
+cloned.
+
+They join the framework plan rather than running as a separate plan because a
+@pg-migrate@ ledger is shared by every component in it: a plan that omits a
+component already recorded in the ledger fails strict verification with
+@UnknownStoredMigration@.
 -}
-withMigratedSuiteWith :: (Text -> IO ()) -> (Fixture -> IO a) -> IO a
-withMigratedSuiteWith extraTemplateMigration action = do
+withMigratedSuiteWith :: [MigrationComponent] -> (Fixture -> IO a) -> IO a
+withMigratedSuiteWith extraComponents action = do
     started <- Pg.startCached Pg.defaultConfig Pg.defaultCacheConfig
     case started of
         Left err -> fail (Text.unpack (Pg.renderStartError err))
@@ -102,8 +109,7 @@ withMigratedSuiteWith extraTemplateMigration action = do
         -- Apply migrations through short-lived pg-migrate connections, all of which are
         -- released before any clone, so the template has no active sessions when
         -- PostgreSQL copies it.
-        migrateTemplate templateConnStr
-        extraTemplateMigration templateConnStr
+        migrateTemplate extraComponents templateConnStr
         pure (Fixture server templateDbName counter)
 
 {- | Clone a fresh, empty, migrated database from the template, open a
@@ -195,11 +201,11 @@ withFreshDatabase fixture action =
         runSql fixture.server $
             "DROP DATABASE IF EXISTS " <> quoteIdentifier dbName <> " WITH (FORCE)"
 
-migrateTemplate :: Text -> IO ()
-migrateTemplate connStr = do
+migrateTemplate :: [MigrationComponent] -> Text -> IO ()
+migrateTemplate extraComponents connStr = do
     kiroku <- either (fail . show) pure Kiroku.kirokuMigrations
     keiro <- either (fail . show) pure keiroMigrations
-    plan <- either (fail . show) pure (frameworkMigrationPlan kiroku keiro)
+    plan <- either (fail . show) pure (migrationPlan (kiroku :| keiro : extraComponents))
     result <-
         runMigrationPlan
             defaultRunOptions