wip: fixing pg_enum

Author: s9gf4ult

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

@@ -10,24 +10,28 @@ import Data.String
 import Database.PostgreSQL.Query.Entity ( Entity(..) )
 import Database.PostgreSQL.Query.TH.Common
 import Database.PostgreSQL.Query.Types ( FN(..) )
+import Database.PostgreSQL.Simple.FromField
+import Database.PostgreSQL.Simple.ToField
+import GHC.Generics (Generic)
 import Language.Haskell.TH
 import Language.Haskell.TH.Syntax
+import Text.Inflections
 
 -- | Options for deriving `Entity`
 data EntityOptions = EntityOptions
     { eoTableName      :: String -> String -- ^ Type name to table name converter
     , eoColumnNames    :: String -> String -- ^ Record field to column name converter
     , eoDeriveClasses  :: [Name]           -- ^ Typeclasses to derive for Id
     , eoIdType         :: Name             -- ^ Base type for Id
-    }
+    } deriving (Generic)
 
 instance Default EntityOptions where
-    def = EntityOptions
-        { eoTableName = id
-        , eoColumnNames = id
-                          --  FIXME: ++ FromField, ToField
-        , eoDeriveClasses = [''Ord, ''Eq, ''Show]
-        , eoIdType = ''Integer
+  def = EntityOptions
+        { eoTableName     = toUnderscore
+        , eoColumnNames   = toUnderscore
+        , eoDeriveClasses = [ ''Ord, ''Eq, ''Show
+                            , ''FromField, ''ToField ]
+        , eoIdType        = ''Integer
         }
 
 {- | Derives instance for 'Entity' using type name and field names. Also

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

@@ -7,29 +7,33 @@ module Database.PostgreSQL.Query.TH.Enum
   , GeneratorOptions(..)
   ) where
 
-import           Prelude
+import Prelude
 
-import           Data.Default
-import           Database.PostgreSQL.Simple.FromField
-import           Database.PostgreSQL.Simple.ToField
-import           Language.Haskell.TH
-import           Text.Inflections
+import Data.Default
+import Data.FileEmbed
+import Database.PostgreSQL.Simple.FromField
+import Database.PostgreSQL.Simple.ToField
+import GHC.Generics (Generic)
+import Language.Haskell.TH
+import Text.Inflections
 
-import qualified Data.ByteString.Char8 as C8
+import qualified Data.Text.Encoding as T
+import qualified Data.Text as T
 
 -- | Function to transform constructor name into its PG enum conterpart.
 -- It should have type 'String -> String'
-type InflectorFunc = Name
+type InflectorFunc = String -> String
 
 type Typ = Name
 
 -- | Option record to pass to the TH generators.
 data GeneratorOptions
   = GeneratorOptions
-  { inflectorFunc :: InflectorFunc }
+    { inflectorFunc :: InflectorFunc
+    } deriving (Generic)
 
 instance Default GeneratorOptions where
-  def = GeneratorOptions 'toUnderscore
+  def = GeneratorOptions toUnderscore
 
 {-| derives 'FromField' and 'ToField' instances for a sum-type enum like
 
@@ -122,15 +126,15 @@ withEnumConstructor :: InflectorFunc
                     -> (Name -> ExpQ -> Q a)
                     -- ^ callback function from:
                     --   1. haskell constructor name and
-                    --   2. PG enum option
+                    --   2. PG enum option (ByteString)
                     -> Con
                     -- ^ constructor to decompose
                     -> Q a
 withEnumConstructor i f = \case
   (NormalC _    (_:_))   ->
     error "constructors with arguments are not supported in makeToFieldClause"
   (NormalC nam  []   ) -> f nam inflectedBs
-    where inflected   = appE (varE i) (litE (stringL (nameBase nam)))
-          inflectedBs = [|C8.pack $inflected|]
+    where inflectedT  = T.pack $ i $ nameBase nam
+          inflectedBs = bsToExp $ T.encodeUtf8 inflectedT
   _                      ->
     error "unsupported constructor in makeFromFieldClause"