aaa12f3 · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

on master help sign in

Stop using quasiquotes in Simple.hs

aaa12f3Leon P Smith14 years ago

src/Database/PostgreSQL/Simple.hs+5−8

compare with master

unifiedsplit

@@ -4,7 +4,6 @@

4{-# LANGUAGE PatternGuards #-}

5{-# LANGUAGE RecordWildCards #-}

6{-# LANGUAGE ViewPatterns #-}

7−{-# LANGUAGE QuasiQuotes #-}

9------------------------------------------------------------------------------

8------------------------------------------------------------------------------

10-- |

9-- |

@@ -145,7 +144,6 @@ import Database.PostgreSQL.Simple.ToRow (ToRow(..))

145import Database.PostgreSQL.Simple.Types

144import Database.PostgreSQL.Simple.Types

146 ( Binary(..), In(..), Only(..), Query(..), (:.)(..) )

145 ( Binary(..), In(..), Only(..), Query(..), (:.)(..) )

147import Database.PostgreSQL.Simple.Internal as Base

146import Database.PostgreSQL.Simple.Internal as Base

148−import Database.PostgreSQL.Simple.SqlQQ (sql)

149import qualified Database.PostgreSQL.LibPQ as PQ

147import qualified Database.PostgreSQL.LibPQ as PQ

150import qualified Data.ByteString.Char8 as B

148import qualified Data.ByteString.Char8 as B

151import qualified Data.Text as T

149import qualified Data.Text as T

@@ -1035,12 +1033,11 @@ getTypeInfo conn@Connection{..} oid =

1035 case IntMap.lookup (oid2int oid) oidmap of

1033 case IntMap.lookup (oid2int oid) oidmap of

1036 Just typeinfo -> return (oidmap, typeinfo)

1034 Just typeinfo -> return (oidmap, typeinfo)

1037 Nothing -> do

1035 Nothing -> do

1038− names <- query conn

1039− [sql| SELECT p.oid, p.typname, c.oid, c.typname

1036+ names <- query conn "SELECT p.oid, p.typname, c.oid, c.typname\

1040− FROM pg_type AS p LEFT OUTER JOIN pg_type AS c

1037+ \ FROM pg_type AS p LEFT OUTER JOIN pg_type AS c\

1041− ON c.oid = p.typelem

1038+ \ ON c.oid = p.typelem\

1042− WHERE p.oid = ?

1039+ \ WHERE p.oid = ?"

1043− |] (Only oid)

1040+ (Only oid)

1044 typinf <- case names of

1041 typinf <- case names of

1045 [] -> return $ throw (fatalError "invalid type oid")

1042 [] -> return $ throw (fatalError "invalid type oid")

1046 [(pOid, pTypName, mbCOid, mbCTypName)] ->

1043 [(pOid, pTypName, mbCOid, mbCTypName)] ->