From 1ccca735cd4212c35e5f92e4ff0305006c88bccc Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Tue, 1 Aug 2023 13:09:12 -0400 Subject: [PATCH] fix ram comparison --- src/Database/Queries.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Database/Queries.hs b/src/Database/Queries.hs index d3e12b3..7d47c13 100644 --- a/src/Database/Queries.hs +++ b/src/Database/Queries.hs @@ -116,7 +116,7 @@ import Startlude ( (<$>), Int, ) import Database.Esqueleto.Experimental (isNothing) -import Database.Esqueleto.Experimental ((>=.)) +import Database.Esqueleto.Experimental ((<=.)) serviceQuerySource :: (MonadResource m, MonadIO m) => @@ -133,7 +133,7 @@ serviceQuerySource mCat query arches mRam = selectSource $ do `innerJoin` table @PkgRecord `on` (\(v :& _ :& p) -> (PkgRecordId === VersionRecordPkgId) (p :& v)) where_ (service ^. VersionRecordNumber ==. vp ^. VersionPlatformVersionNumber) where_ (vp ^. VersionPlatformArch `in_` (valList arches)) - where_ (vp ^. VersionPlatformRam >=. val mRam ||. isNothing (vp ^. VersionPlatformRam)) + where_ (vp ^. VersionPlatformRam <=. val mRam ||. isNothing (vp ^. VersionPlatformRam)) where_ (pr ^. PkgRecordHidden ==. val False) where_ $ queryInMetadata query service pure (service, vp) @@ -150,7 +150,7 @@ serviceQuerySource mCat query arches mRam = selectSource $ do where_ $ cat ^. CategoryName ==. val category &&. queryInMetadata query service where_ (service ^. VersionRecordNumber ==. vp ^. VersionPlatformVersionNumber) where_ (vp ^. VersionPlatformArch `in_` (valList arches)) - where_ (vp ^. VersionPlatformRam >=. val mRam ||. isNothing (vp ^. VersionPlatformRam)) + where_ (vp ^. VersionPlatformRam <=. val mRam ||. isNothing (vp ^. VersionPlatformRam)) where_ (pr ^. PkgRecordHidden ==. val False) pure (service, vp) orderBy @@ -173,7 +173,7 @@ getPkgDataSource pkgs arches mRam = selectSource $ do `innerJoin` table @VersionPlatform `on` (\(service :& vp) -> (VersionPlatformPkgId === VersionRecordPkgId) (vp :& service)) where_ (pkgData ^. VersionRecordNumber ==. vp ^. VersionPlatformVersionNumber) where_ (vp ^. VersionPlatformArch `in_` (valList arches)) - where_ (vp ^. VersionPlatformRam >=. val mRam ||. isNothing (vp ^. VersionPlatformRam)) + where_ (vp ^. VersionPlatformRam <=. val mRam ||. isNothing (vp ^. VersionPlatformRam)) where_ (pkgData ^. VersionRecordPkgId `in_` valList (PkgRecordKey <$> pkgs)) pure (pkgData, vp)