Sort out tests

Author: arybczak

test/Main.hs

@@ -6,7 +6,7 @@ import Control.Monad (void)
 import Data.Int (Int32)
 import Data.Text qualified as T
 import Effectful
-import Effectful.Error.Static
+import Effectful.Exception
 import Effectful.HPQTypes
 import System.Environment (lookupEnv)
 import Test.Tasty
@@ -21,69 +21,68 @@ tests =
     "tests"
     [ testCase "test getLastQuery" testGetLastQuery
     , testCase "test withFrozenLastQuery" testWithFrozenLastQuery
-    --    , testCase "test connection stats retrieval with new connection" testConnectionStatsWithNewConnection
+    , testCase "test connection stats retrieval with new connection" testConnectionStatsWithNewConnection
     ]
 
 testGetLastQuery :: Assertion
 testGetLastQuery = do
   dbUrl <- getConnString
   let connectionSource = simpleSource $ defaultConnectionSettings {csConnInfo = dbUrl}
-  void . runEff . runErrorNoCallStack @HPQTypesError . runDB (unConnectionSource connectionSource) defaultTransactionSettings $ do
+  void . runEff . runDB (unConnectionSource connectionSource) defaultTransactionSettings $ do
     do
       -- Run the first query and perform some basic sanity checks
-      let sql = mkSQL "SELECT 1"
-      rowNo <- runQuery sql
+      let sql = "SELECT 1"
+      rowNo <- runSQL sql
       liftIO $ assertEqual "One row should be retrieved" 1 rowNo
       result <- fetchMany (runIdentity @Int32)
       liftIO $ assertEqual "Result should be [1]" [1] result
       (_, SomeSQL lastQuery) <- getLastQuery
       liftIO $ assertEqual "SQL don't match" (show sql) (show lastQuery)
     do
       -- Run the second query and check that `getLastQuery` gives updated result
-      let newSQL = mkSQL "SELECT 2"
-      runQuery_ newSQL
+      let newSQL = "SELECT 2"
+      runSQL_ newSQL
       (_, SomeSQL newLastQuery) <- getLastQuery
       liftIO $ assertEqual "SQL don't match" (show newSQL) (show newLastQuery)
 
 testWithFrozenLastQuery :: Assertion
 testWithFrozenLastQuery = do
   dbUrl <- getConnString
   let connectionSource = simpleSource $ defaultConnectionSettings {csConnInfo = dbUrl}
-  void . runEff . runErrorNoCallStack @HPQTypesError . runDB (unConnectionSource connectionSource) defaultTransactionSettings $ do
-    let sql = mkSQL "SELECT 1"
-    runQuery_ sql
+  void . runEff . runDB (unConnectionSource connectionSource) defaultTransactionSettings $ do
+    let sql = "SELECT 1"
+    runSQL_ sql
     withFrozenLastQuery $ do
-      runQuery_ $ mkSQL "SELECT 2"
-      getLastQuery >>= \(_, SomeSQL lastQuery) ->
-        liftIO $ assertEqual "The last query before freeze should be reported" (show sql) (show lastQuery)
-    getLastQuery >>= \(_, SomeSQL lastQuery) ->
+      runSQL_ "SELECT 2"
+      (_, SomeSQL lastQuery) <- getLastQuery
       liftIO $ assertEqual "The last query before freeze should be reported" (show sql) (show lastQuery)
+    (_, SomeSQL lastQuery) <- getLastQuery
+    liftIO $ assertEqual "The last query before freeze should be reported" (show sql) (show lastQuery)
 
-{-
 testConnectionStatsWithNewConnection :: Assertion
 testConnectionStatsWithNewConnection = do
   dbUrl <- getConnString
   let connectionSource = simpleSource $ defaultConnectionSettings {csConnInfo = dbUrl}
-  void . runEff . runErrorNoCallStack @HPQTypesError . runDB (unConnectionSource connectionSource) defaultTransactionSettings . unsafeWithoutTransaction $ do
-    do
-      runQuery_ $ mkSQL "SELECT 1"
-      runQuery_ $ mkSQL "SELECT 2"
-      connectionStats <- getConnectionStats
-      liftIO $ assertEqual "Incorrect connection stats" (ConnectionStats 3 3 3 0) connectionStats
-    do
-      runQuery_ $ mkSQL "CREATE TABLE some_table (field INT)"
-      runQuery_ $ mkSQL "BEGIN"
-      runQuery_ $ mkSQL "INSERT INTO some_table VALUES (1)"
-      withNewConnection $ do
-        connectionStats <- getConnectionStats
-        liftIO $ assertEqual "Connection stats should be reset" (ConnectionStats 1 1 1 0) connectionStats
-        noOfResults <- runQuery $ mkSQL "SELECT * FROM some_table"
-        liftIO $ assertEqual "Results should not be visible yet" 0 noOfResults
-      runQuery_ $ mkSQL "COMMIT"
-      noOfResults <- runQuery $ mkSQL "SELECT * FROM some_table"
-      liftIO $ assertEqual "Results should be visible" 1 noOfResults
-      runQuery_ $ mkSQL "DROP TABLE some_table"
--}
+  void . runEff . runDB (unConnectionSource connectionSource) defaultTransactionSettings $ do
+    runSQL_ "SELECT 1"
+    runSQL_ "SELECT 2"
+    stats <- getConnectionStats
+    liftIO $ assertEqual "Incorrect statsQueries" 2 $ statsQueries stats
+    unsafeWithoutTransaction
+      . bracket_
+        (runSQL_ "CREATE TABLE some_table (field INT)")
+        (runSQL_ "DROP TABLE some_table")
+      $ do
+        runSQL_ "BEGIN"
+        runSQL_ "INSERT INTO some_table VALUES (1)"
+        withNewConnection $ do
+          newStats <- getConnectionStats
+          liftIO $ assertEqual "Connection stats should be reset" 0 $ statsQueries newStats
+          noOfResults <- runSQL "SELECT * FROM some_table"
+          liftIO $ assertEqual "Results should not be visible yet" 0 noOfResults
+        runSQL_ "COMMIT"
+        noOfResults <- runSQL "SELECT * FROM some_table"
+        liftIO $ assertEqual "Results should be visible" 1 noOfResults
 
 ----------------------------------------
 -- Helpers