Merge master, resolve conflict in FromRow.hs

mpscholten · claude · mpscholten · commit 5684314e80f3 · 2026-02-15T15:56:11.000+01:00
Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/ihp-context/ihp-context.cabal b/ihp-context/ihp-context.cabal
@@ -32,7 +32,7 @@ common shared-properties
         , ImplicitParams
         , BlockArguments
         , LambdaCase
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: shared-properties
diff --git a/ihp-datasync-typescript/ihp-datasync-typescript.cabal b/ihp-datasync-typescript/ihp-datasync-typescript.cabal
@@ -36,7 +36,7 @@ common shared-properties
         , LambdaCase
         , TemplateHaskell
         , OverloadedRecordDot
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: shared-properties
diff --git a/ihp-datasync/ihp-datasync.cabal b/ihp-datasync/ihp-datasync.cabal
@@ -91,7 +91,7 @@ common shared-properties
             +RTS -A256m -n4m -H512m -qg -N -RTS
             -Wunused-imports
             -Wunused-foralls
-            -Wmissing-fields
+            -Werror=missing-fields
             -Winaccessible-code
             -Wmissed-specialisations
             -Wall-missed-specialisations
@@ -106,7 +106,7 @@ common shared-properties
             +RTS -A256m -n4m -H512m -qg -N -RTS
             -Wunused-imports
             -Wunused-foralls
-            -Wmissing-fields
+            -Werror=missing-fields
             -Winaccessible-code
             -Wmissed-specialisations
             -Wall-missed-specialisations
diff --git a/ihp-graphql/ihp-graphql.cabal b/ihp-graphql/ihp-graphql.cabal
@@ -47,7 +47,7 @@ common shared-properties
         , LambdaCase
         , TemplateHaskell
         , OverloadedRecordDot
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: shared-properties
diff --git a/ihp-hspec/ihp-hspec.cabal b/ihp-hspec/ihp-hspec.cabal
@@ -27,7 +27,7 @@ library
         OverloadedStrings
         ImplicitParams
         RecordWildCards
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
     build-depends: base >= 4.17.0 && < 4.22, ihp, ihp-log, wai, process, text, ihp-ide, vault, uuid, hasql, wai-request-params
     hs-source-dirs: .
     exposed-modules: IHP.Hspec
diff --git a/ihp-hsx/ihp-hsx.cabal b/ihp-hsx/ihp-hsx.cabal
@@ -60,7 +60,7 @@ common common-flags
         -Wredundant-constraints
         -Wunused-imports
         -Wunused-foralls
-        -Wmissing-fields
+        -Werror=missing-fields
         -Winaccessible-code
         -Wmissed-specialisations
         -Wall-missed-specialisations
diff --git a/ihp-ide/ihp-ide.cabal b/ihp-ide/ihp-ide.cabal
@@ -120,7 +120,7 @@ common shared-properties
 
             -Wunused-imports
             -Wunused-foralls
-            -Wmissing-fields
+            -Werror=missing-fields
             -Winaccessible-code
             -Wmissed-specialisations
             -Wall-missed-specialisations
@@ -135,7 +135,7 @@ common shared-properties
 
             -Wunused-imports
             -Wunused-foralls
-            -Wmissing-fields
+            -Werror=missing-fields
             -Winaccessible-code
             -Wmissed-specialisations
             -Wall-missed-specialisations
diff --git a/ihp-imagemagick/ihp-imagemagick.cabal b/ihp-imagemagick/ihp-imagemagick.cabal
@@ -30,7 +30,7 @@ common ihp-std
         BlockArguments
         OverloadedStrings
         ImplicitParams
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: ihp-std
diff --git a/ihp-job-dashboard/ihp-job-dashboard.cabal b/ihp-job-dashboard/ihp-job-dashboard.cabal
@@ -15,7 +15,7 @@ build-type:          Simple
 
 library
     default-language: GHC2021
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
     build-depends:
             base >= 4.17.0 && < 4.22
             , wai
diff --git a/ihp-log/ihp-log.cabal b/ihp-log/ihp-log.cabal
@@ -32,7 +32,7 @@ common shared-properties
         , OverloadedRecordDot
         , DuplicateRecordFields
         , LambdaCase
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: shared-properties
diff --git a/ihp-mail/ihp-mail.cabal b/ihp-mail/ihp-mail.cabal
@@ -41,7 +41,7 @@ common shared-properties
         , TemplateHaskell
         , OverloadedRecordDot
         , DeepSubsumption
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: shared-properties
diff --git a/ihp-migrate/ihp-migrate.cabal b/ihp-migrate/ihp-migrate.cabal
@@ -24,7 +24,7 @@ common ihp-std
         BlockArguments
         OverloadedStrings
         ImplicitParams
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: ihp-std
diff --git a/ihp-modal/ihp-modal.cabal b/ihp-modal/ihp-modal.cabal
@@ -30,7 +30,7 @@ common shared-properties
         , RecordWildCards
         , QuasiQuotes
         , OverloadedRecordDot
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: shared-properties
diff --git a/ihp-openai/ihp-openai.cabal b/ihp-openai/ihp-openai.cabal
@@ -49,7 +49,7 @@ library
         -Wredundant-constraints
         -Wunused-imports
         -Wunused-foralls
-        -Wmissing-fields
+        -Werror=missing-fields
         -Winaccessible-code
         -Wmissed-specialisations
         -fexpose-all-unfoldings
diff --git a/ihp-pagehead/ihp-pagehead.cabal b/ihp-pagehead/ihp-pagehead.cabal
@@ -31,7 +31,7 @@ common shared-properties
         , LambdaCase
         , QuasiQuotes
         , OverloadedRecordDot
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: shared-properties
diff --git a/ihp-pglistener/ihp-pglistener.cabal b/ihp-pglistener/ihp-pglistener.cabal
@@ -40,7 +40,7 @@ common shared-properties
         , DuplicateRecordFields
         , BlockArguments
         , LambdaCase
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: shared-properties
diff --git a/ihp-postgres-parser/ihp-postgres-parser.cabal b/ihp-postgres-parser/ihp-postgres-parser.cabal
@@ -42,7 +42,7 @@ common shared-properties
         ghc-options:
             -Wunused-imports
             -Wunused-foralls
-            -Wmissing-fields
+            -Werror=missing-fields
             -Winaccessible-code
             -Wno-ambiguous-fields
             -Werror=incomplete-patterns
@@ -54,7 +54,7 @@ common shared-properties
 
             -Wunused-imports
             -Wunused-foralls
-            -Wmissing-fields
+            -Werror=missing-fields
             -Winaccessible-code
             -fspecialise-aggressively
             -Wno-ambiguous-fields
diff --git a/ihp-postgresql-simple-extra/ihp-postgresql-simple-extra.cabal b/ihp-postgresql-simple-extra/ihp-postgresql-simple-extra.cabal
@@ -49,7 +49,7 @@ common shared-properties
         , LambdaCase
         , TemplateHaskell
         , OverloadedRecordDot
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: shared-properties
diff --git a/ihp-schema-compiler/ihp-schema-compiler.cabal b/ihp-schema-compiler/ihp-schema-compiler.cabal
@@ -56,7 +56,7 @@ common shared-properties
         ghc-options:
             -Wunused-imports
             -Wunused-foralls
-            -Wmissing-fields
+            -Werror=missing-fields
             -Winaccessible-code
             -Wno-ambiguous-fields
             -Werror=incomplete-patterns
@@ -68,7 +68,7 @@ common shared-properties
 
             -Wunused-imports
             -Wunused-foralls
-            -Wmissing-fields
+            -Werror=missing-fields
             -Winaccessible-code
             -fspecialise-aggressively
             -Wno-ambiguous-fields
diff --git a/ihp-sitemap/ihp-sitemap.cabal b/ihp-sitemap/ihp-sitemap.cabal
@@ -30,7 +30,7 @@ common ihp-std
         BlockArguments
         OverloadedStrings
         ImplicitParams
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: ihp-std
diff --git a/ihp-ssc/ihp-ssc.cabal b/ihp-ssc/ihp-ssc.cabal
@@ -32,7 +32,7 @@ library
         , TemplateHaskell
         , OverloadedRecordDot
         , DeepSubsumption
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
     hs-source-dirs: .
     build-depends: ihp, ihp-log, aeson, megaparsec, bytestring, wai, websockets, ihp-hsx, base, string-conversions, basic-prelude, text, blaze-html, attoparsec, wai-request-params
     exposed-modules:
diff --git a/ihp-welcome/ihp-welcome.cabal b/ihp-welcome/ihp-welcome.cabal
@@ -32,7 +32,7 @@ common ihp-std
         ImplicitParams
         DataKinds
         UndecidableInstances
-    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
+    ghc-options: -Werror=incomplete-patterns -Werror=unused-imports -Werror=missing-fields
 
 library
     import: ihp-std
diff --git a/ihp/IHP/ControllerSupport.hs b/ihp/IHP/ControllerSupport.hs
@@ -35,7 +35,7 @@ import Data.IORef (IORef, modifyIORef', readIORef)
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Lazy as LBS
 import Data.Maybe (fromMaybe)
-import Control.Exception.Safe (SomeException, fromException, try, catches, Handler(..))
+import Control.Exception.Safe (SomeException, fromException, try, catch)
 import Data.Typeable (Typeable)
 import IHP.HaskellSupport
 import Network.Wai
@@ -92,9 +92,9 @@ runAction controller = do
             (action controller)
             ErrorController.handleNoResponseReturned controller
 
-    let handleResponseException (ResponseException response) = ?respond response
-
-    doRunAction `catches` [ Handler handleResponseException, Handler (\exception -> ErrorController.displayException exception controller "")]
+    doRunAction `catch` \(exception :: SomeException) -> case fromException exception of
+        Just (ResponseException response) -> ?respond response
+        Nothing -> ErrorController.displayException exception controller ""
 
 {-# INLINE newContextForAction #-}
 newContextForAction
@@ -172,6 +172,7 @@ prepareRLSIfNeeded modelContext = do
     case rowLevelSecurityContext of
         Just context -> pure modelContext { rowLevelSecurity = Just context }
         Nothing -> pure modelContext
+{-# INLINE prepareRLSIfNeeded #-}
 
 rlsContextVaultKey :: Vault.Key (IORef (Maybe RowLevelSecurityContext))
 rlsContextVaultKey = unsafePerformIO Vault.newKey
diff --git a/ihp/IHP/RouterSupport.hs b/ihp/IHP/RouterSupport.hs
diff --git a/ihp/Test/Test/RouterSupportSpec.hs b/ihp/Test/Test/RouterSupportSpec.hs
diff --git a/ihp/ihp.cabal b/ihp/ihp.cabal
diff --git a/wai-asset-path/wai-asset-path.cabal b/wai-asset-path/wai-asset-path.cabal
diff --git a/wai-flash-messages/wai-flash-messages.cabal b/wai-flash-messages/wai-flash-messages.cabal
diff --git a/wai-request-params/wai-request-params.cabal b/wai-request-params/wai-request-params.cabal
