Merged in NCrashed/postgresql-query (pull request #4)

Support inflections-0.3

Author: Anton Gushcha

Diff for: postgresql-query.cabal

@@ -81,7 +81,7 @@ library
                , haskell-src-meta
                , hreader                       >= 1.0.0   && < 2.0.0
                , hset                          >= 2.0.0   && < 3.0.0
-               , inflections                   >= 0.2     && < 0.3
+               , inflections                   >= 0.2     && < 0.4
                , monad-control                 == 0.3.3.1 || > 1.0.0.3
                , monad-logger
                , mtl

Diff for: src/Database/PostgreSQL/Query/TH/Entity.hs

@@ -7,6 +7,7 @@ import Prelude
 
 import Data.Default
 import Data.String
+import Data.Text (pack, unpack)
 import Database.PostgreSQL.Query.Entity.Class
 import Database.PostgreSQL.Query.TH.Common
 import Database.PostgreSQL.Query.Types ( FN(..) )
@@ -29,6 +30,7 @@ data EntityOptions = EntityOptions
     , eoIdType         :: Name             -- ^ Base type for Id
     } deriving (Generic)
 
+#if !MIN_VERSION_inflections(0,3,0)
 instance Default EntityOptions where
   def = EntityOptions
         { eoTableName     = toUnderscore
@@ -37,6 +39,21 @@ instance Default EntityOptions where
                             , ''FromField, ''ToField ]
         , eoIdType        = ''Integer
         }
+#else
+instance Default EntityOptions where
+  def = EntityOptions
+        { eoTableName     = toUnderscore'
+        , eoColumnNames   = toUnderscore'
+        , eoDeriveClasses = [ ''Ord, ''Eq, ''Show
+                            , ''FromField, ''ToField ]
+        , eoIdType        = ''Integer
+        }
+
+toUnderscore' :: String -> String
+toUnderscore' s = case toUnderscore $ pack s of
+  Left er -> error $ "toUnderscore: " ++ show er
+  Right a -> unpack a
+#endif
 
 {- | Derives instance for 'Entity' using type name and field names. Also
 generates type synonim for ID. E.g. code like this: