diff --git a/hasql-implicits.cabal b/hasql-implicits.cabal --- a/hasql-implicits.cabal +++ b/hasql-implicits.cabal @@ -1,38 +1,55 @@ -name: hasql-implicits -version: 0.1.1 -synopsis: Implicit definitions for Hasql, such as default codecs for standard types -homepage: https://github.com/nikita-volkov/hasql-implicits -bug-reports: https://github.com/nikita-volkov/hasql-implicits/issues -author: Nikita Volkov -maintainer: Nikita Volkov -copyright: (c) 2019, Nikita Volkov -license: MIT -license-file: LICENSE -build-type: Simple +name: hasql-implicits +version: 0.1.1.1 +synopsis: + Implicit definitions for Hasql, such as default codecs for standard types + +homepage: https://github.com/nikita-volkov/hasql-implicits +bug-reports: https://github.com/nikita-volkov/hasql-implicits/issues +author: Nikita Volkov +maintainer: Nikita Volkov +copyright: (c) 2019, Nikita Volkov +license: MIT +license-file: LICENSE +build-type: Simple cabal-version: >=1.10 source-repository head - type: git + type: git location: git://github.com/nikita-volkov/hasql-implicits.git library - hs-source-dirs: library - default-extensions: BangPatterns, DeriveDataTypeable, DeriveGeneric, DeriveFunctor, DeriveTraversable, GeneralizedNewtypeDeriving, FlexibleContexts, FlexibleInstances, LambdaCase, NoImplicitPrelude, OverloadedStrings, RankNTypes, ScopedTypeVariables, StandaloneDeriving, TypeApplications, TypeFamilies - ghc-options: -funbox-strict-fields - default-language: Haskell2010 - exposed-modules: - Hasql.Implicits.Encoders - other-modules: - Hasql.Implicits.Prelude + hs-source-dirs: library + default-extensions: + NoImplicitPrelude + BangPatterns + DeriveDataTypeable + DeriveFunctor + DeriveGeneric + DeriveTraversable + FlexibleContexts + FlexibleInstances + GeneralizedNewtypeDeriving + LambdaCase + OverloadedStrings + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TypeApplications + TypeFamilies + + ghc-options: -funbox-strict-fields + default-language: Haskell2010 + exposed-modules: Hasql.Implicits.Encoders + other-modules: Hasql.Implicits.Prelude build-depends: - aeson >=1 && <3, - base >=4.12 && <5, - bytestring >=0.10 && <0.12, - containers >=0.6 && <0.7, - hasql >=1.4 && <1.7, - network-ip >=0.2 && <1, - scientific >=0.2 && <0.4, - text >=1 && <3, - time >=1.4 && <2, - uuid >=1.3 && <1.4, - vector >=0.10 && <0.14 + aeson >=1 && <3 + , base >=4.12 && <5 + , bytestring >=0.10 && <0.13 + , containers >=0.6 && <0.7 + , hasql >=1.4 && <1.7 + , network-ip >=0.2 && <1 + , scientific >=0.2 && <0.4 + , text >=1 && <3 + , time >=1.4 && <2 + , uuid >=1.3 && <1.4 + , vector >=0.10 && <0.14 diff --git a/library/Hasql/Implicits/Encoders.hs b/library/Hasql/Implicits/Encoders.hs --- a/library/Hasql/Implicits/Encoders.hs +++ b/library/Hasql/Implicits/Encoders.hs @@ -1,14 +1,14 @@ {-# LANGUAGE CPP #-} + module Hasql.Implicits.Encoders where -import Hasql.Implicits.Prelude hiding (bool) -import Hasql.Encoders import qualified Data.Aeson as Aeson - +import Hasql.Encoders +import Hasql.Implicits.Prelude hiding (bool) -{-| Provides a default implementation of parameter encoder. -} +-- | Provides a default implementation of parameter encoder. class DefaultParamEncoder a where - {-| Default parameter encoder with nullability specified. -} + -- | Default parameter encoder with nullability specified. defaultParam :: NullableOrNot Value a #define INSTANCES(VALUE, ENCODER) \ @@ -67,24 +67,24 @@ defaultParam = (nullable . array . dimension foldlStrict . dimension foldlStrict . element . nullable) ENCODER; \ } -INSTANCES(Char, char) -INSTANCES(Double, float8) -INSTANCES(Float, float4) -INSTANCES(Int16, int2) -INSTANCES(Int32, int4) -INSTANCES(Int64, int8) -INSTANCES(ByteString, bytea) -INSTANCES(Scientific, numeric) -INSTANCES(Text, text) -INSTANCES(UTCTime, timestamptz) -INSTANCES(Aeson.Value, jsonb) -INSTANCES(UUID, uuid) -INSTANCES(Day, date) -INSTANCES(DiffTime, interval) -INSTANCES(TimeOfDay, time) -INSTANCES(LocalTime, timestamp) -INSTANCES((TimeOfDay, TimeZone), timetz) -INSTANCES((NetAddr IP), inet) -INSTANCES(Bool, bool) +INSTANCES (Char, char) +INSTANCES (Double, float8) +INSTANCES (Float, float4) +INSTANCES (Int16, int2) +INSTANCES (Int32, int4) +INSTANCES (Int64, int8) +INSTANCES (ByteString, bytea) +INSTANCES (Scientific, numeric) +INSTANCES (Text, text) +INSTANCES (UTCTime, timestamptz) +INSTANCES (Aeson.Value, jsonb) +INSTANCES (UUID, uuid) +INSTANCES (Day, date) +INSTANCES (DiffTime, interval) +INSTANCES (TimeOfDay, time) +INSTANCES (LocalTime, timestamp) +INSTANCES ((TimeOfDay, TimeZone), timetz) +INSTANCES ((NetAddr IP), inet) +INSTANCES (Bool, bool) #undef INSTANCES diff --git a/library/Hasql/Implicits/Prelude.hs b/library/Hasql/Implicits/Prelude.hs --- a/library/Hasql/Implicits/Prelude.hs +++ b/library/Hasql/Implicits/Prelude.hs @@ -1,11 +1,9 @@ module Hasql.Implicits.Prelude -( - module Exports, - foldlStrict, -) + ( module Exports, + foldlStrict, + ) where - -- base ------------------------- import Control.Applicative as Exports @@ -13,13 +11,19 @@ import Control.Category as Exports import Control.Concurrent as Exports import Control.Exception as Exports -import Control.Monad as Exports hiding (fail, mapM_, sequence_, forM_, msum, mapM, sequence, forM) -import Control.Monad.IO.Class as Exports +import Control.Monad as Exports hiding (fail, forM, forM_, mapM, mapM_, msum, sequence, sequence_) import Control.Monad.Fail as Exports import Control.Monad.Fix as Exports hiding (fix) +import Control.Monad.IO.Class as Exports import Control.Monad.ST as Exports import Data.Bits as Exports import Data.Bool as Exports +-- containers +------------------------- + +-- bytestring +------------------------- +import Data.ByteString as Exports (ByteString) import Data.Char as Exports import Data.Coerce as Exports import Data.Complex as Exports @@ -29,37 +33,58 @@ import Data.Fixed as Exports import Data.Foldable as Exports hiding (toList) import Data.Function as Exports hiding (id, (.)) -import Data.Functor as Exports +import Data.Functor as Exports hiding (unzip) import Data.Functor.Contravariant as Exports import Data.Functor.Identity as Exports -import Data.Int as Exports import Data.IORef as Exports +import Data.Int as Exports import Data.Ix as Exports -import Data.List as Exports hiding (sortOn, isSubsequenceOf, uncons, concat, foldr, foldl1, maximum, minimum, product, sum, all, and, any, concatMap, elem, foldl, foldr1, notElem, or, find, maximumBy, minimumBy, mapAccumL, mapAccumR, foldl') +import Data.List as Exports hiding (all, and, any, concat, concatMap, elem, find, foldl, foldl', foldl1, foldr, foldr1, isSubsequenceOf, mapAccumL, mapAccumR, maximum, maximumBy, minimum, minimumBy, notElem, or, product, sortOn, sum, uncons) import Data.Maybe as Exports -import Data.Monoid as Exports hiding (Last(..), First(..), (<>)) +import Data.Monoid as Exports hiding (First (..), Last (..), (<>)) import Data.Ord as Exports import Data.Proxy as Exports import Data.Ratio as Exports -import Data.Semigroup as Exports import Data.STRef as Exports +-- text +------------------------- + +-- vector +------------------------- + +-- scientific +------------------------- +import Data.Scientific as Exports (Scientific) +import Data.Semigroup as Exports +import Data.Sequence as Exports (Seq) import Data.String as Exports +import Data.Text as Exports (Text) +-- uuid +------------------------- + +-- time +------------------------- +import Data.Time as Exports import Data.Traversable as Exports import Data.Tuple as Exports +import Data.UUID as Exports (UUID) import Data.Unique as Exports +import Data.Vector as Exports (Vector) import Data.Version as Exports import Data.Word as Exports import Debug.Trace as Exports import Foreign.ForeignPtr as Exports import Foreign.Ptr as Exports import Foreign.StablePtr as Exports -import Foreign.Storable as Exports hiding (sizeOf, alignment) -import GHC.Conc as Exports hiding (withMVar, threadWaitWriteSTM, threadWaitWrite, threadWaitReadSTM, threadWaitRead) -import GHC.Exts as Exports (lazy, inline, sortWith, groupWith, IsList(..)) +import Foreign.Storable as Exports hiding (alignment, sizeOf) +import GHC.Conc as Exports hiding (threadWaitRead, threadWaitReadSTM, threadWaitWrite, threadWaitWriteSTM, withMVar) +import GHC.Exts as Exports (IsList (..), groupWith, inline, lazy, sortWith) import GHC.Generics as Exports (Generic, Generic1) import GHC.IO.Exception as Exports +-- network-ip +------------------------- +import Network.IP.Addr as Exports (IP, NetAddr) import Numeric as Exports -import Prelude as Exports hiding (fail, concat, foldr, mapM_, sequence_, foldl1, maximum, minimum, product, sum, all, and, any, concatMap, elem, foldl, foldr1, notElem, or, mapM, sequence, id, (.)) import System.Environment as Exports import System.Exit as Exports import System.IO as Exports @@ -69,43 +94,12 @@ import System.Mem.StableName as Exports import System.Timeout as Exports import Text.ParserCombinators.ReadP as Exports (ReadP, ReadS, readP_to_S, readS_to_P) -import Text.ParserCombinators.ReadPrec as Exports (ReadPrec, readPrec_to_P, readP_to_Prec, readPrec_to_S, readS_to_Prec) -import Text.Printf as Exports (printf, hPrintf) -import Text.Read as Exports (Read(..), readMaybe, readEither) +import Text.ParserCombinators.ReadPrec as Exports (ReadPrec, readP_to_Prec, readPrec_to_P, readPrec_to_S, readS_to_Prec) +import Text.Printf as Exports (hPrintf, printf) +import Text.Read as Exports (Read (..), readEither, readMaybe) import Unsafe.Coerce as Exports - --- containers -------------------------- -import Data.Sequence as Exports (Seq) - --- bytestring -------------------------- -import Data.ByteString as Exports (ByteString) - --- text -------------------------- -import Data.Text as Exports (Text) - --- vector -------------------------- -import Data.Vector as Exports (Vector) - --- scientific -------------------------- -import Data.Scientific as Exports (Scientific) - --- uuid -------------------------- -import Data.UUID as Exports (UUID) - --- time -------------------------- -import Data.Time as Exports - --- network-ip -------------------------- -import Network.IP.Addr as Exports (NetAddr, IP) +import Prelude as Exports hiding (all, and, any, concat, concatMap, elem, fail, foldl, foldl1, foldr, foldr1, id, mapM, mapM_, maximum, minimum, notElem, or, product, sequence, sequence_, sum, (.)) {-# INLINE foldlStrict #-} -foldlStrict :: Foldable foldable => (b -> a -> b) -> b -> foldable a -> b +foldlStrict :: (Foldable foldable) => (b -> a -> b) -> b -> foldable a -> b foldlStrict = foldl'