8fa277a · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

Compile with -Wall, and fix compile warnings

commit8fa277a941be09f20115991078f233f176222c29 authorJoey Adams <joeyadams3.14159@gmail.com> dateWed 7 Mar 2012, 23:51 (15 years ago) parent797cc3a

7 files changed+15−11

compare with master

unifiedsplit

postgresql-simple.cabal+2 src/Database/PostgreSQL/Simple.hs+5−3 src/Database/PostgreSQL/Simple/Internal.hs+1 src/Database/PostgreSQL/Simple/LargeObjects.hs−1 src/Database/PostgreSQL/Simple/Notification.hs+1 src/Database/PostgreSQL/Simple/QueryResults.hs+2−2 src/Database/PostgreSQL/Simple/Result.hs+4−5

postgresql-simple.cabal+2

@@ -49,6 +49,8 @@ Library

4949 text >= 0.11.1,

5050 time

5151

52+ ghc-options: -Wall -fno-warn-name-shadowing

53+

5254source-repository head

5355 type: git

5456 location: http://github.com/lpsmith/postgresql-simple

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

@@ -110,7 +110,6 @@ import Control.Applicative ((<$>), pure)

110110import Control.Concurrent.MVar

111111import Control.Exception (Exception, onException, throw, throwIO, finally)

112112import Control.Monad (foldM)

113−import Control.Monad.Fix (fix)

114113import Data.ByteString (ByteString)

115114import Data.Char(ord)

116115import Data.Int (Int64)

@@ -195,6 +194,7 @@ formatMany conn q@(Query template) qs = do

195194 \([^?]*)$"

196195 [caseless]

197196

197+escapeStringConn :: Connection -> ByteString -> IO (Maybe ByteString)

198198escapeStringConn conn s = withConnection conn $ \c -> do

199199 PQ.escapeStringConn c s

200200

@@ -242,7 +242,7 @@ executeMany conn q qs = do

242242 finishExecute conn q result

243243

244244finishExecute :: Connection -> Query -> PQ.Result -> IO Int64

245−finishExecute conn q result = do

245+finishExecute _conn q result = do

246246 status <- PQ.resultStatus result

247247 case status of

248248 PQ.CommandOk -> do

@@ -344,6 +344,7 @@ data FoldOptions

344344 transactionMode :: !TransactionMode

345345 }

346346

347+defaultFoldOptions :: FoldOptions

347348defaultFoldOptions = FoldOptions {

348349 fetchQuantity = Automatic,

349350 transactionMode = TransactionMode ReadCommitted ReadOnly

@@ -559,7 +560,8 @@ beginLevel lvl = beginMode defaultTransactionMode { isolationLevel = lvl }

559560-- | Begin a transaction with a given transaction mode

560561beginMode :: TransactionMode -> Connection -> IO ()

561562beginMode mode conn = do

562− execute_ conn $! case mode of

563+ _ <- execute_ conn $!

564+ case mode of

563565 TransactionMode ReadCommitted ReadWrite ->

564566 "BEGIN"

565567 TransactionMode ReadCommitted ReadOnly ->

src/Database/PostgreSQL/Simple/Internal.hs+1

@@ -195,6 +195,7 @@ exec conn sql =

195195 Just res -> do

196196 return res

197197

198+disconnectedError :: SqlError

198199disconnectedError = SqlError {

199200 sqlNativeError = -1,

200201 sqlErrorMsg = "connection disconnected",

src/Database/PostgreSQL/Simple/LargeObjects.hs−1

@@ -36,7 +36,6 @@ import qualified Data.ByteString as B

3636import Database.PostgreSQL.LibPQ (Oid(..),LoFd(..))

3737import qualified Database.PostgreSQL.LibPQ as PQ

3838import Database.PostgreSQL.Simple.Internal

39−import Foreign.C.Types (CInt)

4039import System.IO (IOMode(..),SeekMode(..))

4140

4241liftPQ :: B.ByteString -> Connection -> (PQ.Connection -> IO (Maybe a)) -> IO a

src/Database/PostgreSQL/Simple/Notification.hs+1

@@ -29,6 +29,7 @@ data Notification = Notification

2929 , notificationData :: B.ByteString

3030 }

3131

32+errfd :: String

3233errfd = "Database.PostgreSQL.Simple.Notification.getNotification: \

3334 \failed to fetch file descriptor"

3435

src/Database/PostgreSQL/Simple/QueryResults.hs+2−2

@@ -24,14 +24,13 @@ module Database.PostgreSQL.Simple.QueryResults

2424 ) where

2525

2626import Control.Applicative (Applicative(..), (<$>))

27−import Control.Exception (SomeException(..), throw)

27+import Control.Exception (SomeException(..))

2828import Data.ByteString (ByteString)

2929import qualified Data.ByteString.Char8 as B

3030import Data.Either()

3131import Database.PostgreSQL.Simple.Internal

3232import Database.PostgreSQL.Simple.Result (ResultError(..), Result(..))

3333import Database.PostgreSQL.Simple.Types (Only(..))

34−import qualified Database.PostgreSQL.LibPQ as LibPQ (Result)

3534

3635-- | A collection type that can be converted from a list of strings.

3736--

@@ -212,6 +211,7 @@ instance (Result a, Result b, Result c, Result d, Result e, Result f,

212211 return (a,b,c,d,e,f,g,h,i,j)

213212 convertResults fs vs = convertError fs vs 10

214213

214+(<$!>) :: Functor f => (a -> b) -> f a -> f b

215215f <$!> (!x) = f <$> x

216216infixl 4 <$!>

217217

src/Database/PostgreSQL/Simple/Result.hs+4−5

@@ -32,7 +32,7 @@ module Database.PostgreSQL.Simple.Result

3232#include "MachDeps.h"

3333

3434import Control.Applicative (Applicative, (<$>), (<*>), (<*), pure)

35−import Control.Exception (SomeException(..), Exception, throw)

35+import Control.Exception (SomeException(..), Exception)

3636import Data.Attoparsec.Char8 hiding (Result)

3737import Data.Bits ((.&.), (.|.), shiftL)

3838import Data.ByteString (ByteString)

@@ -44,10 +44,9 @@ import Data.Time.Calendar (Day, fromGregorian)

4444import Data.Time.Clock (UTCTime)

4545import Data.Time.Format (parseTime)

4646import Data.Time.LocalTime (TimeOfDay, makeTimeOfDayValid)

47−import Data.Typeable (TypeRep, Typeable, typeOf)

47+import Data.Typeable (Typeable, typeOf)

4848import Data.Word (Word64)

4949import Database.PostgreSQL.Simple.Internal

50−import Database.PostgreSQL.Simple.Field (Field(..), RawResult(..))

5150import Database.PostgreSQL.Simple.BuiltinTypes

5251import Database.PostgreSQL.Simple.Types (Binary(..), Null(..))

5352import qualified Database.PostgreSQL.LibPQ as PQ

@@ -58,7 +57,6 @@ import qualified Data.ByteString.Char8 as B8

5857import qualified Data.ByteString.Lazy as LB

5958import qualified Data.Text as ST

6059import qualified Data.Text.Encoding as ST

61−import qualified Data.Text.Encoding.Error (UnicodeException)

6260import qualified Data.Text.Lazy as LT

6361

6462-- | Exception thrown if conversion from a SQL value to a Haskell

@@ -140,6 +138,7 @@ instance Result (Ratio Integer) where

140138 convert = atto ok rational

141139 where ok = mkCompats [Float4,Float8,Int2,Int4,Numeric]

142140

141+unBinary :: Binary t -> t

143142unBinary (Binary x) = x

144143

145144instance Result SB.ByteString where

@@ -228,7 +227,7 @@ mkCompat = Compat . shiftL 1 . fromEnum

228227compat :: Compat -> Compat -> Bool

229228compat (Compat a) (Compat b) = a .&. b /= 0

230229

231−okText, okText', ok16, ok32, ok64 :: Compat

230+okText, okText', okBinary, ok16, ok32, ok64, okInt :: Compat

232231okText = mkCompats [Name,Text,Char,Bpchar,Varchar]

233232okText' = mkCompats [Name,Text,Char,Bpchar,Varchar,Unknown]

234233okBinary = mkCompats [Bytea]