endpoints: rewrite SQL builders with hasql-interpolate ^{} splices

Replace string-concat + rawSql glue with single multiline [HI.sql|...|]
quasiquotes using ^{sql} splices for fragments and #{val} for values.
Drop NeatInterpolation usage. Collapse countEndpointInbox default to
correct enp alias.

Author: tonyalaribe

cabal.project

@@ -119,12 +119,12 @@ source-repository-package
   tag: bb90850a0eeed02a0b03244283a1236b5ce03471
   subdir: .
 
--- Fork: swap haskell-src-meta -> ghc-hs-meta so #{x.y} record-dot
--- splices parse correctly. Drop once upstream merges (PR open).
+-- Upstream merge of haskell-src-meta -> ghc-hs-meta (PR #32) not yet on
+-- Hackage; pin to the merge commit until next release.
 source-repository-package
   type: git
-  location: https://github.com/tonyalaribe/hasql-interpolate
-  tag: 22909b5316bb314cbb495208061b8f0f268bf0aa
+  location: https://github.com/awkward-squad/hasql-interpolate
+  tag: 8a13a8b06babc569ffd216fd9561aae58818b66f
 
 constraints:
   streamly ^>=0.10.0,

src/Models/Apis/Endpoints.hs

@@ -532,8 +532,8 @@ fetchLogPatterns enableTfReads pid queryAST dateRange sourceM targetM skip = do
       -- Fetch member hashes for merged patterns so their hourly stats are included
       memberHashMap :: HM.HashMap Text [Text] <- HM.fromListWith (++) . map (\(canonical, mHash) -> (canonical, [mHash])) <$> Hasql.interp [HI.sql|SELECT c.pattern_hash, m.pattern_hash FROM apis.log_patterns m JOIN apis.log_patterns c ON m.canonical_id = c.id WHERE c.project_id = #{pid} AND c.source_field = #{target} AND c.pattern_hash = ANY(#{hashes})|]
       let allHashes = V.fromList $ concatMap (\h -> h : fromMaybe [] (HM.lookup h memberHashMap)) $ V.toList hashes
-      hourlyRows :: [(Text, UTCTime, Int)] <- Hasql.interp [HI.sql|SELECT pattern_hash, hour_bucket, event_count::BIGINT FROM apis.log_pattern_hourly_stats WHERE project_id = #{pid} AND source_field = #{target} AND pattern_hash = ANY(#{allHashes}) AND hour_bucket >= #{hourlyFrom} AND hour_bucket <= #{hourlyTo} ORDER BY pattern_hash, hour_bucket|]
-      let volumeMap = HM.fromListWith (++) [(h, [(t, c)]) | (h, t, c) <- hourlyRows]
+      hourlyRows :: [(Text, UTCTime, Int64)] <- Hasql.interp [HI.sql|SELECT pattern_hash, hour_bucket, event_count::BIGINT FROM apis.log_pattern_hourly_stats WHERE project_id = #{pid} AND source_field = #{target} AND pattern_hash = ANY(#{allHashes}) AND hour_bucket >= #{hourlyFrom} AND hour_bucket <= #{hourlyTo} ORDER BY pattern_hash, hour_bucket|]
+      let volumeMap = HM.fromListWith (++) [(h, [(t, fromIntegral c :: Int)]) | (h, t, c) <- hourlyRows]
           lookupVolume h = buildHourlyBuckets now $ concatMap (\mh -> fromMaybe [] $ HM.lookup mh volumeMap) (h : fromMaybe [] (HM.lookup h memberHashMap))
       pure (totalPatterns, [PatternRow{logPattern = pat, count = cnt, level = lvl, service = svc, volume = lookupVolume h, mergedCount = mc, isError = isErr} | (pat, cnt, lvl, svc, h, mc, _, isErr) <- precomputed])
     else do

src/Models/Apis/LogQueries.hs

@@ -210,12 +210,18 @@ insertUser :: DB es => User -> Eff es ()
 insertUser u = EHasql.interpExecute_ [HI.sql| INSERT INTO users.users (id, created_at, updated_at, deleted_at, active, first_name, last_name, display_image_url, email, phone_number, is_sudo) VALUES (#{u.id}, #{u.createdAt}, #{u.updatedAt}, #{u.deletedAt}, #{u.active}, #{u.firstName}, #{u.lastName}, #{u.displayImageUrl}, #{u.email}, #{u.phoneNumber}, #{u.isSudo}) |]
 
 
+-- | hasql-interpolate's strict OID check rejects the @email@ domain (OID ≠ text);
+-- list columns explicitly and cast @email::text@ so the generic 'DecodeRow' just works.
+userColsSql :: HI.Sql
+userColsSql = [HI.sql| id, created_at, updated_at, deleted_at, active, first_name, last_name, display_image_url, email::text, is_sudo, phone_number |]
+
+
 userById :: DB es => UserId -> Eff es (Maybe User)
-userById uid = EHasql.interpOne [HI.sql| SELECT * FROM users.users WHERE id = #{uid} |]
+userById uid = EHasql.interpOne $ [HI.sql| SELECT |] <> userColsSql <> [HI.sql| FROM users.users WHERE id = #{uid} |]
 
 
 userByEmail :: DB es => Text -> Eff es (Maybe User)
-userByEmail email = EHasql.interpOne [HI.sql| SELECT * FROM users.users WHERE email = #{email} |]
+userByEmail email = EHasql.interpOne $ [HI.sql| SELECT |] <> userColsSql <> [HI.sql| FROM users.users WHERE email = #{email} |]
 
 
 userIdByEmail :: DB es => Text -> Eff es (Maybe UserId)
@@ -592,7 +598,7 @@ queryLibHistoryForUser pid uid =
       )
       UNION ALL
       (
-        SELECT id, project_id, created_at, updated_at, user_id, query_type, query_text, query_ast, title, user_id=#{uid}::uuid as byMe
+        SELECT id, project_id, created_at, updated_at, user_id, query_type::text, query_text, query_ast, title, user_id=#{uid}::uuid as byMe
         FROM projects.query_library
         WHERE user_id = #{uid}::uuid AND project_id = #{pid}::uuid AND query_type = 'saved'
         ORDER BY created_at DESC

src/Models/Projects/Projects.hs

@@ -1239,8 +1239,14 @@ data Context = Context
   deriving (AE.FromJSON, AE.ToJSON) via DAE.Snake Context
 
 
--- Field order matches 'otelSpanColsSql' (and the INSERT path in 'otelColumns')
+-- | Field order matches 'otelSpanColsSql' (and the INSERT path in 'otelColumns')
 -- so FromRow / DecodeRow can be derived generically. Reorder both in lockstep.
+--
+-- Field count is pinned via doctest so any add/remove fails CI unless
+-- 'otelSpanColsSql' + 'otelColumns' are touched in the same change:
+--
+-- >>> length otelColumns
+-- 25
 data OtelLogsAndSpans = OtelLogsAndSpans
   { project_id :: Text
   , id :: Text -- UUID

src/Models/Telemetry/Telemetry.hs

@@ -275,10 +275,10 @@ fetchMetricsData respDataType sqlQuery now fromD toD authCtx dbSource = do
 
   try @SomePostgreSqlException $ checkpoint (toAnnotation (respDataType, sqlQuery)) $ case respDataType of
     DTFloat -> do
-      chartData <- withResource pool \conn -> query_ conn (Query $ encodeUtf8 sqlQuery) :: IO [Only Double]
+      chartData <- withResource pool \conn -> query_ conn (Query $ encodeUtf8 sqlQuery) :: IO [Only (Maybe Double)]
       pure
         baseMetricsData
-          { dataFloat = fromOnly <$> listToMaybe chartData
+          { dataFloat = listToMaybe chartData >>= fromOnly
           , rowsCount = 1
           }
     DTMetric -> do

src/Pages/Charts/Charts.hs

@@ -190,14 +190,14 @@ instance (KnownSymbol prefix, Show a) => HI.EncodeValue (WrappedEnum prefix a) w
   encodeValue = (\(WrappedEnum a) -> T.toUpper $ toText $ drop (length $ symbolVal (Proxy @prefix)) $ show a) `contramap` E.text
 
 
+-- | Shared helper for hasql 'D.DecodeValue' instances that parse text and refine into a Haskell value.
+refineText :: Text -> (Text -> Maybe a) -> D.Value a
+refineText ctx f = D.refine (\t -> maybe (Left (ctx <> ": cannot parse " <> t)) Right (f t)) D.text
+
+
 instance (KnownSymbol prefix, Read a) => HI.DecodeValue (WrappedEnum prefix a) where
-  decodeValue =
-    D.refine
-      ( \t -> case readMaybe (symbolVal (Proxy @prefix) <> toString (T.toTitle t)) of
-          Just a -> Right (WrappedEnum a)
-          Nothing -> Left ("WrappedEnum: cannot parse " <> t)
-      )
-      D.text
+  decodeValue = refineText "WrappedEnum" \t ->
+    WrappedEnum <$> readMaybe (symbolVal (Proxy @prefix) <> toString (T.toTitle t))
 
 
 instance (KnownSymbol prefix, Read a) => HI.DecodeRow (WrappedEnum prefix a) where
@@ -233,13 +233,7 @@ instance (KnownSymbol prefix, Show a) => HI.EncodeValue (WrappedEnumSC prefix a)
 
 
 instance (KnownSymbol prefix, Read a) => HI.DecodeValue (WrappedEnumSC prefix a) where
-  decodeValue =
-    D.refine
-      ( \t -> case decodeEnumSC @prefix (toString t) of
-          Just a -> Right (WrappedEnumSC a)
-          Nothing -> Left ("WrappedEnumSC: cannot parse " <> t)
-      )
-      D.text
+  decodeValue = refineText "WrappedEnumSC" (fmap WrappedEnumSC . decodeEnumSC @prefix . toString)
 
 
 instance (KnownSymbol prefix, Read a) => HI.DecodeRow (WrappedEnumSC prefix a) where
@@ -334,13 +328,7 @@ instance Show a => HI.EncodeValue (WrappedEnumShow a) where
 
 
 instance Read a => HI.DecodeValue (WrappedEnumShow a) where
-  decodeValue =
-    D.refine
-      ( \t -> case readMaybe (toString t) of
-          Just a -> Right (WrappedEnumShow a)
-          Nothing -> Left ("WrappedEnumShow: cannot parse " <> t)
-      )
-      D.text
+  decodeValue = refineText "WrappedEnumShow" (fmap WrappedEnumShow . readMaybe . toString)
 
 
 data BaselineState = BSLearning | BSEstablished