Fix inverted conditional

Author: pbrisbin

dbmigrations.cabal

@@ -114,6 +114,47 @@ library
   if impl(ghc >= 8.10)
     ghc-options: -Wno-missing-safe-haskell-mode
 
+executable dbm-sqlite
+  main-is: Main.hs
+  other-modules:
+      Paths_dbmigrations
+  hs-source-dirs:
+      sqlite/app
+  default-extensions:
+      BangPatterns
+      DataKinds
+      DeriveAnyClass
+      DeriveFoldable
+      DeriveFunctor
+      DeriveGeneric
+      DeriveLift
+      DeriveTraversable
+      DerivingStrategies
+      FlexibleContexts
+      FlexibleInstances
+      GADTs
+      GeneralizedNewtypeDeriving
+      LambdaCase
+      MultiParamTypeClasses
+      NoImplicitPrelude
+      NoMonomorphismRestriction
+      OverloadedStrings
+      RankNTypes
+      ScopedTypeVariables
+      StandaloneDeriving
+      TypeApplications
+      TypeFamilies
+  ghc-options: -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-safe -Wno-unsafe -threaded -rtsopts "-with-rtsopts=-N"
+  build-depends:
+      HDBC-sqlite3
+    , base <5
+    , dbmigrations
+  default-language: GHC2021
+  if impl(ghc >= 9.2)
+    ghc-options: -Wno-missing-kind-signatures
+  if impl(ghc >= 8.10)
+    ghc-options: -Wno-missing-safe-haskell-mode
+
 test-suite spec
   type: exitcode-stdio-1.0
   main-is: Spec.hs
@@ -126,7 +167,6 @@ test-suite spec
       FilesystemParseSpec
       FilesystemSerializeSpec
       FilesystemSpec
-      HDBCSpec
       InMemoryStore
       LinearMigrationsSpec
       MigrationsSpec
@@ -160,9 +200,7 @@ test-suite spec
       TypeFamilies
   ghc-options: -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-safe -Wno-unsafe -threaded -rtsopts "-with-rtsopts=-N"
   build-depends:
-      HDBC
-    , HDBC-sqlite3
-    , base <5
+      base <5
     , containers
     , dbmigrations
     , directory
@@ -179,3 +217,47 @@ test-suite spec
     ghc-options: -Wno-missing-kind-signatures
   if impl(ghc >= 8.10)
     ghc-options: -Wno-missing-safe-haskell-mode
+
+test-suite sqlite-spec
+  type: exitcode-stdio-1.0
+  main-is: Main.hs
+  other-modules:
+      Paths_dbmigrations
+  hs-source-dirs:
+      sqlite/tests
+  default-extensions:
+      BangPatterns
+      DataKinds
+      DeriveAnyClass
+      DeriveFoldable
+      DeriveFunctor
+      DeriveGeneric
+      DeriveLift
+      DeriveTraversable
+      DerivingStrategies
+      FlexibleContexts
+      FlexibleInstances
+      GADTs
+      GeneralizedNewtypeDeriving
+      LambdaCase
+      MultiParamTypeClasses
+      NoImplicitPrelude
+      NoMonomorphismRestriction
+      OverloadedStrings
+      RankNTypes
+      ScopedTypeVariables
+      StandaloneDeriving
+      TypeApplications
+      TypeFamilies
+  ghc-options: -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-safe -Wno-unsafe -threaded -rtsopts "-with-rtsopts=-N"
+  build-depends:
+      HDBC
+    , HDBC-sqlite3
+    , base <5
+    , dbmigrations
+    , hspec
+  default-language: GHC2021
+  if impl(ghc >= 9.2)
+    ghc-options: -Wno-missing-kind-signatures
+  if impl(ghc >= 8.10)
+    ghc-options: -Wno-missing-safe-haskell-mode

package.yaml

@@ -90,14 +90,21 @@ library:
     - time
     - yaml
 
+executables:
+  dbm-sqlite:
+    source-dirs: sqlite/app
+    ghc-options: -threaded -rtsopts "-with-rtsopts=-N"
+    main: Main.hs
+    dependencies:
+      - HDBC-sqlite3
+      - dbmigrations
+
 tests:
   spec:
     source-dirs: tests
     ghc-options: -threaded -rtsopts "-with-rtsopts=-N"
     main: Spec.hs
     dependencies:
-      - HDBC
-      - HDBC-sqlite3
       - containers
       - dbmigrations
       - directory
@@ -109,3 +116,13 @@ tests:
       - template-haskell
       - text
       - time
+
+  sqlite-spec:
+    source-dirs: sqlite/tests
+    ghc-options: -threaded -rtsopts "-with-rtsopts=-N"
+    main: Main.hs
+    dependencies:
+      - HDBC
+      - HDBC-sqlite3
+      - dbmigrations
+      - hspec

sqlite/app/Main.hs

@@ -0,0 +1,25 @@
+module Main (main) where
+
+import Prelude hiding (lookup)
+
+import Database.HDBC.Sqlite3 (connectSqlite3)
+import Database.Schema.Migrations.Backend.HDBC (hdbcBackend)
+import Moo.Core
+import Moo.Main
+import System.Environment (getArgs)
+import System.Exit
+
+main :: IO ()
+main = do
+  args <- getArgs
+  (_, opts, _) <- procArgs args
+  loadedConf <- loadConfiguration $ _configFilePath opts
+  case loadedConf of
+    Left e -> putStrLn e >> exitFailure
+    Right conf -> do
+      let connectionString = _connectionString conf
+      connection <- connectSqlite3 connectionString
+      let
+        backend = hdbcBackend connection
+        parameters = makeParameters conf backend
+      mainWithParameters args parameters

tests/HDBCSpec.hs sqlite/tests/Main.hstests/HDBCSpec.hs renamed to sqlite/tests/Main.hs

@@ -1,11 +1,7 @@
 {-# LANGUAGE DerivingVia #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
--- | Use SQlite3 as an example to test the supplied 'hdbcBackend'
-module HDBCSpec
-  ( spec
-  )
-where
+module Main (main) where
 
 import Prelude
 
@@ -18,5 +14,8 @@ import Test.Hspec
 
 deriving via (HDBCConnection Connection) instance BackendConnection Connection
 
-spec :: Spec
-spec = before (connectSqlite3 ":memory:") $ after disconnect BackendTest.spec
+main :: IO ()
+main =
+  hspec
+    . before (connectSqlite3 ":memory:")
+    $ after disconnect BackendTest.spec

src/Database/Schema/Migrations/Test/BackendTest.hs

@@ -197,9 +197,8 @@ makeBootstrappedBackend conn = do
 -- backend does not support that.
 needDDL :: BackendConnection bc => (bc -> Expectation) -> bc -> Expectation
 needDDL f conn
-  | supportsTransactionalDDL conn =
-      pendingWith "Skipping due to lack of Transactional DDL"
-  | otherwise = f conn
+  | supportsTransactionalDDL conn = f conn
+  | otherwise = pendingWith "Skipping due to lack of Transactional DDL"
 
 ignoreSqlExceptions_ :: BackendConnection bc => bc -> IO a -> IO ()
 ignoreSqlExceptions_ conn act = void act `catch` pure ()