stylish haskell

This commit is contained in:
parsonsmatt 2021-03-29 14:04:51 -06:00
parent 7bc4fdd3d4
commit 6a6a63cb97
2 changed files with 37 additions and 42 deletions

View File

@ -1,29 +1,30 @@
{-# LANGUAGE ScopedTypeVariables {-# LANGUAGE FlexibleContexts #-}
, FlexibleContexts {-# LANGUAGE RankNTypes #-}
, RankNTypes {-# LANGUAGE ScopedTypeVariables #-}
, TypeFamilies {-# LANGUAGE TypeApplications #-}
, TypeApplications {-# LANGUAGE TypeFamilies #-}
#-}
module Main (main) where module Main (main) where
import Control.Applicative import Control.Applicative
import System.Environment
import Control.Monad (void) import Control.Monad (void)
import Control.Monad.IO.Class (MonadIO(liftIO)) import Control.Monad.IO.Class (MonadIO(liftIO))
import Control.Monad.Logger (runStderrLoggingT, runNoLoggingT) import Control.Monad.Logger (runNoLoggingT, runStderrLoggingT)
import Control.Monad.Trans.Reader (ReaderT) import Control.Monad.Trans.Reader (ReaderT)
import Database.Persist.MySQL ( withMySQLConn import qualified Control.Monad.Trans.Resource as R
, connectHost
, connectDatabase
, connectUser
, connectPassword
, connectPort
, defaultConnectInfo)
import Database.Esqueleto import Database.Esqueleto
import Database.Esqueleto.Experimental hiding (from, on) import Database.Esqueleto.Experimental hiding (from, on)
import qualified Database.Esqueleto.Experimental as Experimental import qualified Database.Esqueleto.Experimental as Experimental
import qualified Control.Monad.Trans.Resource as R import Database.Persist.MySQL
( connectDatabase
, connectHost
, connectPassword
, connectPort
, connectUser
, defaultConnectInfo
, withMySQLConn
)
import System.Environment
import Test.Hspec import Test.Hspec
import Common.Test import Common.Test

View File

@ -1,51 +1,50 @@
{-# OPTIONS_GHC -fno-warn-unused-binds #-} {-# OPTIONS_GHC -fno-warn-unused-binds #-}
{-# LANGUAGE FlexibleContexts {-# LANGUAGE FlexibleContexts #-}
, LambdaCase {-# LANGUAGE LambdaCase #-}
, NamedFieldPuns {-# LANGUAGE NamedFieldPuns #-}
, OverloadedStrings {-# LANGUAGE OverloadedStrings #-}
, RankNTypes {-# LANGUAGE PartialTypeSignatures #-}
, ScopedTypeVariables {-# LANGUAGE RankNTypes #-}
, TypeApplications {-# LANGUAGE ScopedTypeVariables #-}
, TypeFamilies {-# LANGUAGE TypeApplications #-}
, PartialTypeSignatures {-# LANGUAGE TypeFamilies #-}
#-}
module Main (main) where module Main (main) where
import Data.Coerce
import Data.Foldable
import qualified Data.Map.Strict as Map
import Data.Map (Map)
import Data.Time
import Control.Arrow ((&&&)) import Control.Arrow ((&&&))
import Control.Monad (void, when) import Control.Monad (void, when)
import Control.Monad.Catch import Control.Monad.Catch
import Control.Monad.IO.Class (MonadIO(liftIO)) import Control.Monad.IO.Class (MonadIO(liftIO))
import Control.Monad.Logger (runStderrLoggingT, runNoLoggingT) import Control.Monad.Logger (runNoLoggingT, runStderrLoggingT)
import Control.Monad.Trans.Reader (ReaderT, ask) import Control.Monad.Trans.Reader (ReaderT, ask)
import qualified Control.Monad.Trans.Resource as R import qualified Control.Monad.Trans.Resource as R
import Data.Aeson hiding (Value) import Data.Aeson hiding (Value)
import qualified Data.Aeson as A (Value) import qualified Data.Aeson as A (Value)
import Data.ByteString (ByteString) import Data.ByteString (ByteString)
import qualified Data.ByteString.Lazy as BSL
import qualified Data.Char as Char import qualified Data.Char as Char
import Data.Coerce
import Data.Foldable
import qualified Data.List as L import qualified Data.List as L
import Data.Map (Map)
import qualified Data.Map.Strict as Map
import Data.Ord (comparing) import Data.Ord (comparing)
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Encoding as TE import qualified Data.Text.Encoding as TE
import Data.Time.Clock (getCurrentTime, diffUTCTime, UTCTime) import Data.Time
import Data.Time.Clock (UTCTime, diffUTCTime, getCurrentTime)
import Database.Esqueleto hiding (random_) import Database.Esqueleto hiding (random_)
import Database.Esqueleto.Experimental hiding (random_, from, on) import Database.Esqueleto.Experimental hiding (from, on, random_)
import qualified Database.Esqueleto.Experimental as Experimental import qualified Database.Esqueleto.Experimental as Experimental
import qualified Database.Esqueleto.Internal.Sql as ES import qualified Database.Esqueleto.Internal.Sql as ES
import Database.Esqueleto.PostgreSQL (random_) import Database.Esqueleto.PostgreSQL (random_)
import qualified Database.Esqueleto.PostgreSQL as EP import qualified Database.Esqueleto.PostgreSQL as EP
import Database.Esqueleto.PostgreSQL.JSON hiding ((?.), (-.), (||.)) import Database.Esqueleto.PostgreSQL.JSON hiding ((-.), (?.), (||.))
import qualified Database.Esqueleto.PostgreSQL.JSON as JSON import qualified Database.Esqueleto.PostgreSQL.JSON as JSON
import Database.Persist.Postgresql (withPostgresqlConn) import Database.Persist.Postgresql (withPostgresqlConn)
import Database.PostgreSQL.Simple (SqlError(..), ExecStatus(..)) import Database.PostgreSQL.Simple (ExecStatus(..), SqlError(..))
import System.Environment import System.Environment
import Test.Hspec import Test.Hspec
import Test.Hspec.QuickCheck import Test.Hspec.QuickCheck
import qualified Data.ByteString.Lazy as BSL
import Common.Test import Common.Test
import PostgreSQL.MigrateJSON import PostgreSQL.MigrateJSON
@ -571,11 +570,6 @@ testPostgresModule = do
-- | Get the time diff and check it's less than a second -- | Get the time diff and check it's less than a second
liftIO $ diffUTCTime nowUtc now `shouldSatisfy` (< oneSecond) liftIO $ diffUTCTime nowUtc now `shouldSatisfy` (< oneSecond)
--------------- JSON --------------- JSON --------------- JSON ---------------
--------------- JSON --------------- JSON --------------- JSON ---------------
--------------- JSON --------------- JSON --------------- JSON ---------------
testJSONInsertions :: Spec testJSONInsertions :: Spec
testJSONInsertions = testJSONInsertions =
describe "JSON Insertions" $ do describe "JSON Insertions" $ do