428131d · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

on master help sign in

Merge pull request #235 from MailOnline/master

428131dLeon P Smith9 years ago

src/Database/PostgreSQL/Simple/Internal.hs+4−2

@@ -1,5 +1,6 @@

1{-# LANGUAGE CPP, BangPatterns, DoAndIfThenElse, RecordWildCards #-}

2+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}

2−{-# LANGUAGE DeriveDataTypeable, GeneralizedNewtypeDeriving #-}

3+{-# LANGUAGE GeneralizedNewtypeDeriving #-}

4------------------------------------------------------------------------------

5------------------------------------------------------------------------------

5-- |

6-- |

@@ -50,6 +51,7 @@ import Database.PostgreSQL.Simple.TypeInfo.Types(TypeInfo)

50import Control.Monad.Trans.State.Strict

51import Control.Monad.Trans.State.Strict

51import Control.Monad.Trans.Reader

52import Control.Monad.Trans.Reader

52import Control.Monad.Trans.Class

53import Control.Monad.Trans.Class

54+import GHC.Generics

53import GHC.IO.Exception

55import GHC.IO.Exception

54#if !defined(mingw32_HOST_OS)

56#if !defined(mingw32_HOST_OS)

55import Control.Concurrent(threadWaitRead, threadWaitWrite)

57import Control.Concurrent(threadWaitRead, threadWaitWrite)

@@ -119,7 +121,7 @@ data ConnectInfo = ConnectInfo {

119 , connectUser :: String

121 , connectUser :: String

120 , connectPassword :: String

122 , connectPassword :: String

121 , connectDatabase :: String

123 , connectDatabase :: String

122− } deriving (Eq,Read,Show,Typeable)

124+ } deriving (Generic,Eq,Read,Show,Typeable)

123

125

124-- | Default information for setting up a connection.

126-- | Default information for setting up a connection.

125--

127--