fix warnings

Author: s9gf4ult

.gitignore

@@ -5,3 +5,4 @@ cabal.sandbox.config
 TAGS
 cabal.config
 .stack-work
+stack.yaml

lts-2.9.yaml

@@ -0,0 +1,11 @@
+flags: {}
+extra-package-dbs: []
+packages:
+- '.'
+extra-deps:
+- hreader-1.0.2
+- hset-2.2.0
+- inflections-0.2.0.0
+- th-lift-instances-0.1.6
+- type-fun-0.1.0
+resolver: lts-2.9

stack.yaml renamed to lts-6.7.yaml

@@ -7,4 +7,4 @@ extra-deps:
 - hset-2.2.0
 - th-lift-instances-0.1.6
 - type-fun-0.1.0
-resolver: lts-5.14
+resolver: lts-6.7

postgresql-query.cabal

@@ -42,7 +42,8 @@ library
                  , Database.PostgreSQL.Query.TH.SqlExp
                  , Database.PostgreSQL.Query.Types
 
-  default-extensions: CPP
+  default-extensions: AutoDeriveTypeable
+                    , CPP
                     , ConstraintKinds
                     , DataKinds
                     , DeriveDataTypeable
@@ -111,7 +112,8 @@ test-suite test
   other-modules: BuilderTest
                , ParserTest
 
-  default-extensions: FlexibleInstances
+  default-extensions: CPP
+                    , FlexibleInstances
                     , OverloadedStrings
                     , QuasiQuotes
                     , TemplateHaskell
@@ -137,7 +139,8 @@ test-suite example
   hs-source-dirs:  example
   main-is: Main.hs
 
-  default-extensions: FlexibleInstances
+  default-extensions: AutoDeriveTypeable
+                    , FlexibleInstances
                     , OverloadedStrings
                     , TemplateHaskell
 

src/Database/PostgreSQL/Query/Entity/Functions.hs

@@ -14,7 +14,6 @@ module Database.PostgreSQL.Query.Entity.Functions
   , pgSelectCount
   ) where
 
-import Control.Applicative
 import Control.Monad.Logger
 import Data.Int ( Int64 )
 import Data.Maybe ( listToMaybe )
@@ -31,6 +30,10 @@ import Database.PostgreSQL.Simple
 import Database.PostgreSQL.Simple.FromField
 import Database.PostgreSQL.Simple.ToField
 
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative
+#endif
+
 import qualified Data.List as L
 import qualified Data.List.NonEmpty as NL
 

src/Database/PostgreSQL/Query/Functions.hs

@@ -14,7 +14,6 @@ module Database.PostgreSQL.Query.Functions
        , pgRepsertRow
        ) where
 
-import Control.Applicative
 import Control.Monad
 import Control.Monad.Base
 import Control.Monad.Logger

src/Database/PostgreSQL/Query/Internal.hs

@@ -9,6 +9,11 @@ import Database.PostgreSQL.Query.SqlBuilder
 import Database.PostgreSQL.Query.TH
 import Database.PostgreSQL.Query.Types
 
+#if !MIN_VERSION_base(4,8,0)
+import Data.Monoid
+#endif
+
+
 import qualified Data.List as L
 
 {- $setup

src/Database/PostgreSQL/Query/SqlBuilder/Builder.hs

@@ -24,6 +24,10 @@ import Database.PostgreSQL.Simple.ToField
 import Database.PostgreSQL.Simple.Types
 import GHC.Generics (Generic)
 
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative
+#endif
+
 import qualified Blaze.ByteString.Builder as BB
 import qualified Blaze.ByteString.Builder.Char.Utf8 as BB
 

src/Database/PostgreSQL/Query/TH/Enum.hs

@@ -5,13 +5,16 @@ module Database.PostgreSQL.Query.TH.Enum
   , InflectorFunc
   ) where
 
-import Prelude
-
 import Data.FileEmbed
 import Database.PostgreSQL.Simple.FromField
 import Database.PostgreSQL.Simple.ToField
 import Language.Haskell.TH
 
+#if !MIN_VERSION_base(4,8,0)
+import Data.Traversable
+import Control.Applicative
+#endif
+
 import qualified Data.Text.Encoding as T
 import qualified Data.Text as T
 

src/Database/PostgreSQL/Query/TH/Row.hs

@@ -10,6 +10,9 @@ import Database.PostgreSQL.Simple.FromRow ( FromRow(..), field )
 import Database.PostgreSQL.Simple.ToRow ( ToRow(..) )
 import Language.Haskell.TH
 
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative
+#endif
 
 {-| Derive 'FromRow' instance. i.e. you have type like that