ci nonsense

.github/workflows/haskell.yml

@@ -23,7 +23,7 @@ jobs:
           MYSQL_DATABASE: esqutest
         ## map the "external" 33306 port with the "internal" 3306
         ports:
-          - 3306:3306
+          - 33306:3306
         # Set health checks to wait until mysql database has started (it takes some seconds to start)
         options: >-
           --health-cmd="mysqladmin ping"

test/MySQL/Test.hs

@@ -237,8 +237,26 @@ migrateIt = do
 
 
 withConn :: RunDbMonad m => (SqlBackend -> R.ResourceT m a) -> m a
-withConn =
+withConn f = do
-  R.runResourceT .
+    ci <- isCI
+    let connInfo
+            | ci =
+                defaultConnectInfo
+                    { connectHost     = "localhost"
+                    , connectUser     = "travis"
+                    , connectPassword = "esqutest"
+                    , connectDatabase = "esqutest"
+                    , connectPort     = 33306
+                    }
+            | otherwise =
+                defaultConnectInfo
+                    { connectHost     = "localhost"
+                    , connectUser     = "travis"
+                    , connectPassword = "esqutest"
+                    , connectDatabase = "esqutest"
+                    , connectPort     = 3306
+                    }
+    R.runResourceT $
         withMySQLConn defaultConnectInfo
             { connectHost     = "localhost"
             , connectUser     = "travis"
@@ -246,3 +264,12 @@ withConn =
             , connectDatabase = "esqutest"
             , connectPort     = 3306
             }
+            f
+
+isCI :: IO Bool
+isCI =  do
+    env <- liftIO getEnvironment
+    return $ case lookup "TRAVIS" env <|> lookup "CI" env of
+        Just "true" -> True
+        _ -> False
+

test/PostgreSQL/Test.hs

@@ -898,7 +898,7 @@ testConcatenationOperator =
 
 testMinusOperator :: Spec
 testMinusOperator =
-    fdescribe "Minus Operator" $ do
+    describe "Minus Operator" $ do
         it "creates sane SQL" $ do
             let obj = object ["a" .= False, "b" .= True]
                 encoded = BSL.toStrict $ encode obj