@@ -1,14 +1,18 @@
1−{-# LANGUAGE BangPatterns, DeriveDataTypeable, OverloadedStrings #-}
1+{-# LANGUAGE DeriveDataTypeable #-}
2+{-# LANGUAGE NamedFieldPuns #-}
3+{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE PatternGuards #-}
2−{-# LANGUAGE DoAndIfThenElse, RecordWildCards, NamedFieldPuns #-}
5+{-# LANGUAGE RecordWildCards #-}
6+{-# LANGUAGE ViewPatterns #-}
3------------------------------------------------------------------------------
8------------------------------------------------------------------------------
5-- Module: Database.PostgreSQL.Simple
10-- Module: Database.PostgreSQL.Simple
6-- Copyright: (c) 2011 MailRank, Inc.
11-- Copyright: (c) 2011 MailRank, Inc.
7−-- (c) 2011 Leon P Smith
12+-- (c) 2011-2012 Leon P Smith
8-- License: BSD3
13-- License: BSD3
9-- Maintainer: Leon P Smith <leon@melding-monads.com>
14-- Maintainer: Leon P Smith <leon@melding-monads.com>
10-- Stability: experimental
15-- Stability: experimental
11−-- Portability: portable
13-- A mid-level client library for the PostgreSQL database, aimed at ease of
17-- A mid-level client library for the PostgreSQL database, aimed at ease of
14-- use and high performance.
18-- use and high performance.
@@ -38,6 +42,9 @@ module Database.PostgreSQL.Simple
38 -- ** Modifying multiple rows at once
42 -- ** Modifying multiple rows at once
45+ -- ** @RETURNING@: modifications that return results
41 -- * Extracting results
48 -- * Extracting results
42 -- $result
49 -- $result
@@ -48,26 +55,35 @@ module Database.PostgreSQL.Simple
50 -- * Types
57 -- * Types
52− , Connection
58+ Connection
55 , Binary(..)
63 , Binary(..)
56 , Only(..)
64 , Only(..)
57 -- ** Exceptions
66 -- ** Exceptions
67+ , SomePostgreSqlException(..)
58 , SqlError(..)
68 , SqlError(..)
59− , FormatError(fmtMessage, fmtQuery, fmtParams)
70+ , FormatError(..)
60− , QueryError(qeMessage, qeQuery)
71+ , QueryError(..)
61− , ResultError(errSQLType, errHaskellType, errMessage)
72+ , ResultError(..)
62 -- * Connection management
73 -- * Connection management
64 , Base.connectPostgreSQL
74 , Base.connectPostgreSQL
65− , Base.postgreSQLConnectionString
66− , Base.defaultConnectInfo
67 , Base.close
75 , Base.close
78+ , Base.ConnectInfo(..)
79+ , Base.defaultConnectInfo
80+ , Base.postgreSQLConnectionString
68 -- * Queries that return results
81 -- * Queries that return results
84+ -- ** Queries taking parser as argument
71 -- * Queries that stream results
87 -- * Queries that stream results
72 , FoldOptions(..)
88 , FoldOptions(..)
73 , FetchQuantity(..)
89 , FetchQuantity(..)
@@ -78,6 +94,15 @@ module Database.PostgreSQL.Simple
78 , foldWithOptions_
94 , foldWithOptions_
80 , forEach_
96 , forEach_
98+ -- ** Queries that stream results taking a parser as an argument
100+ , foldWithOptionsAndParser
102+ , foldWithOptionsAndParser_
81 -- * Statements that do not return results
106 -- * Statements that do not return results
82 , execute
107 , execute
83 , execute_
108 , execute_
@@ -85,13 +110,9 @@ module Database.PostgreSQL.Simple
85-- , Base.insertID
110-- , Base.insertID
86 -- * Transaction handling
111 -- * Transaction handling
87 , withTransaction
112 , withTransaction
88− , TransactionMode(..)
113+ , withSavepoint
91− , withTransactionMode
92-- , Base.autocommit
114-- , Base.autocommit
96 , rollback
117 , rollback
97 -- * Helper functions
118 -- * Helper functions
@@ -99,50 +120,27 @@ module Database.PostgreSQL.Simple
99 , formatQuery
120 , formatQuery
102−import Blaze.ByteString.Builder (Builder, fromByteString, toByteString)
123+import Data.ByteString.Builder (Builder, byteString, char8)
103−import Blaze.ByteString.Builder.Char8 (fromChar)
104−import Control.Applicative ((<$>), pure)
124+import Control.Applicative ((<$>))
105−import Control.Concurrent.MVar
125+import Control.Exception as E
106−import Control.Exception (Exception, bracket, onException, throw, throwIO, finally)
107−import Control.Monad (foldM)
108−import Control.Monad.Fix (fix)
109−import Data.ByteString (ByteString)
126+import Data.ByteString (ByteString)
110−import Data.Char(ord)
111−import Data.Int (Int64)
127+import Data.Int (Int64)
112−import qualified Data.IntMap as IntMap
113−import Data.List (intersperse)
128+import Data.List (intersperse)
114−import Data.Monoid (mappend, mconcat)
129+import Data.Monoid (mconcat)
115−import Data.Typeable (Typeable)
116−import Database.PostgreSQL.Simple.BuiltinTypes (oid2builtin, builtin2typname)
117−import Database.PostgreSQL.Simple.Param (Action(..), inQuotes)
130+import Database.PostgreSQL.Simple.Compat ((<>), toByteString)
118−import Database.PostgreSQL.Simple.QueryParams (QueryParams(..))
131+import Database.PostgreSQL.Simple.Cursor
119−import Database.PostgreSQL.Simple.Result (ResultError(..))
132+import Database.PostgreSQL.Simple.FromField (ResultError(..))
133+import Database.PostgreSQL.Simple.FromRow (FromRow(..))
120−import Database.PostgreSQL.Simple.QueryResults (QueryResults(..))
134+import Database.PostgreSQL.Simple.ToField (Action(..))
135+import Database.PostgreSQL.Simple.ToRow (ToRow(..))
121−import Database.PostgreSQL.Simple.Types (Binary(..), In(..), Only(..), Query(..))
136+import Database.PostgreSQL.Simple.Types
137+ ( Binary(..), In(..), Only(..), Query(..), (:.)(..) )
122−import Database.PostgreSQL.Simple.Internal as Base
138+import Database.PostgreSQL.Simple.Internal as Base
139+import Database.PostgreSQL.Simple.Internal.PQResultUtils
140+import Database.PostgreSQL.Simple.Transaction
123import qualified Database.PostgreSQL.LibPQ as PQ
141import qualified Database.PostgreSQL.LibPQ as PQ
124−import Text.Regex.PCRE.Light (compile, caseless, match)
125import qualified Data.ByteString.Char8 as B
142import qualified Data.ByteString.Char8 as B
127−-- | Exception thrown if a 'Query' could not be formatted correctly.
128−-- This may occur if the number of \'@?@\' characters in the query
129−-- string does not match the number of parameters provided.
130−data FormatError = FormatError {
131− fmtMessage :: String
133− , fmtParams :: [ByteString]
134− } deriving (Eq, Show, Typeable)
136−instance Exception FormatError
138−-- | Exception thrown if 'query' is used to perform an @INSERT@-like
139−-- operation, or 'execute' is used to perform a @SELECT@-like operation.
140−data QueryError = QueryError {
143− } deriving (Eq, Show, Typeable)
145−instance Exception QueryError
147-- | Format a query string.
145-- | Format a query string.
@@ -154,11 +152,11 @@ instance Exception QueryError
155-- Throws 'FormatError' if the query string could not be formatted
153-- Throws 'FormatError' if the query string could not be formatted
156-- correctly.
154-- correctly.
157−formatQuery :: QueryParams q => Connection -> Query -> q -> IO ByteString
155+formatQuery :: ToRow q => Connection -> Query -> q -> IO ByteString
158formatQuery conn q@(Query template) qs
156formatQuery conn q@(Query template) qs
159 | null xs && '?' `B.notElem` template = return template
157 | null xs && '?' `B.notElem` template = return template
160 | otherwise = toByteString <$> buildQuery conn q template xs
158 | otherwise = toByteString <$> buildQuery conn q template xs
161− where xs = renderParams qs
159+ where xs = toRow qs
163-- | Format a query string with a variable number of rows.
161-- | Format a query string with a variable number of rows.
@@ -173,105 +171,208 @@ formatQuery conn q@(Query template) qs
174-- Throws 'FormatError' if the query string could not be formatted
172-- Throws 'FormatError' if the query string could not be formatted
175-- correctly.
173-- correctly.
176−formatMany :: (QueryParams q) => Connection -> Query -> [q] -> IO ByteString
174+formatMany :: (ToRow q) => Connection -> Query -> [q] -> IO ByteString
177formatMany _ q [] = fmtError "no rows supplied" q []
175formatMany _ q [] = fmtError "no rows supplied" q []
178formatMany conn q@(Query template) qs = do
176formatMany conn q@(Query template) qs = do
179− case match re template [] of
177+ case parseTemplate template of
180− Just [_,before,qbits,after] -> do
178+ Just (before, qbits, after) -> do
181− bs <- mapM (buildQuery conn q qbits . renderParams) qs
179+ bs <- mapM (buildQuery conn q qbits . toRow) qs
182− return . toByteString . mconcat $ fromByteString before :
180+ return . toByteString . mconcat $ byteString before :
183− intersperse (fromChar ',') bs ++
181+ intersperse (char8 ',') bs ++
184− [fromByteString after]
182+ [byteString after]
185− _ -> error "foo"
183+ Nothing -> fmtError "syntax error in multi-row template" q []
185+-- Split the input string into three pieces, @before@, @qbits@, and @after@,
186+-- following this grammar:
188+-- start: ^ before qbits after $
189+-- before: ([^?]* [^?\w])? 'VALUES' \s*
190+-- qbits: '(' \s* '?' \s* (',' \s* '?' \s*)* ')'
194+-- \w: [A-Z] | [a-z] | [\x80-\xFF] | '_' | '$' | [0-9]
196+-- This would be much more concise with some sort of regex engine.
197+-- 'formatMany' used to use pcre-light instead of this hand-written parser,
198+-- but pcre is a hassle to install on Windows.
199+parseTemplate :: ByteString -> Maybe (ByteString, ByteString, ByteString)
200+parseTemplate template =
201+ -- Convert input string to uppercase, to facilitate searching.
202+ search $ B.map toUpper_ascii template
187− re = compile "^([^?]+\\bvalues\\s*)\
204+ -- Search for the next occurrence of "VALUES"
188− \(\\(\\s*[?](?:\\s*,\\s*[?])*\\s*\\))\
205+ search bs =
189− \([^?]*)$"
206+ case B.breakSubstring "VALUES" bs of
190− [caseless]
207+ (x, y)
208+ -- If "VALUES" is not present in the string, or any '?' characters
209+ -- were encountered prior to it, fail.
210+ | B.null y || ('?' `B.elem` x)
213+ -- If "VALUES" is preceded by an identifier character (a.k.a. \w),
214+ -- try the next occurrence.
215+ | not (B.null x) && isIdent (B.last x)
216+ -> search $ B.drop 6 y
218+ -- Otherwise, we have a legitimate "VALUES" token.
220+ -> parseQueryBits $ skipSpace $ B.drop 6 y
222+ -- Parse '(' \s* '?' \s* . If this doesn't match
223+ -- (and we don't consume a '?'), look for another "VALUES".
225+ -- qb points to the open paren (if present), meaning it points to the
226+ -- beginning of the "qbits" production described above. This is why we
227+ -- pass it down to finishQueryBits.
229+ | Just ('(', skipSpace -> bs1) <- B.uncons qb
230+ , Just ('?', skipSpace -> bs2) <- B.uncons bs1
231+ = finishQueryBits qb bs2
235+ -- Parse (',' \s* '?' \s*)* ')' [^?]* .
237+ -- Since we've already consumed at least one '?', there's no turning back.
238+ -- The parse has to succeed here, or the whole thing fails
239+ -- (because we don't allow '?' to appear outside of the VALUES list).
240+ finishQueryBits qb bs0
241+ | Just (')', bs1) <- B.uncons bs0
242+ = if '?' `B.elem` bs1
244+ else Just $ slice3 template qb bs1
245+ | Just (',', skipSpace -> bs1) <- B.uncons bs0
246+ , Just ('?', skipSpace -> bs2) <- B.uncons bs1
247+ = finishQueryBits qb bs2
251+ -- Slice a string into three pieces, given the start offset of the second
252+ -- and third pieces. Each "offset" is actually a tail of the uppercase
253+ -- version of the template string. Its length is used to infer the offset.
255+ -- It is important to note that we only slice the original template.
256+ -- We don't want our all-caps trick messing up the actual query string.
257+ slice3 source p1 p2 =
260+ (s1, source') = B.splitAt (B.length source - B.length p1) source
261+ (s2, source'') = B.splitAt (B.length p1 - B.length p2) source'
263+ toUpper_ascii c | c >= 'a' && c <= 'z' = toEnum (fromEnum c - 32)
266+ -- Based on the definition of {ident_cont} in src/backend/parser/scan.l
267+ -- in the PostgreSQL source. No need to check [a-z], since we converted
268+ -- the whole string to uppercase.
269+ isIdent c = (c >= '0' && c <= '9')
270+ || (c >= 'A' && c <= 'Z')
271+ || (c >= '\x80' && c <= '\xFF')
275+ -- Based on {space} in scan.l
276+ isSpace_ascii c = (c == ' ') || (c >= '\t' && c <= '\r')
278+ skipSpace = B.dropWhile isSpace_ascii
192−escapeStringConn conn s = withConnection conn $ \c -> do
193− PQ.escapeStringConn c s
195buildQuery :: Connection -> Query -> ByteString -> [Action] -> IO Builder
281buildQuery :: Connection -> Query -> ByteString -> [Action] -> IO Builder
196−buildQuery conn q template xs = zipParams (split template) <$> mapM sub xs
282+buildQuery conn q template xs =
197− where quote = inQuotes . fromByteString . maybe undefined id
283+ zipParams (split template) <$> mapM (buildAction conn q xs) xs
198− sub (Plain b) = pure b
284+ where split s =
199− sub (Escape s) = quote <$> escapeStringConn conn s
285+ -- This part escapes double '??'s to make literal '?'s possible
200− sub (Many ys) = mconcat <$> mapM sub ys
286+ -- in PostgreSQL queries using the JSON operators: @?@, @?|@ and @?&@
287+ let (h,t) = breakOnSingleQuestionMark s
201− split s = fromByteString h : if B.null t then [] else split (B.tail t)
291+ else split (B.tail t)
202− where (h,t) = B.break (=='?') s
203− zipParams (t:ts) (p:ps) = t `mappend` p `mappend` zipParams ts ps
292+ zipParams (t:ts) (p:ps) = t <> p <> zipParams ts ps
204 zipParams [t] [] = t
293 zipParams [t] [] = t
205− zipParams _ _ = fmtError (show (B.count '?' template) ++
294+ zipParams _ _ = fmtError (show countSingleQs ++
206− " '?' characters, but " ++
295+ " single '?' characters, but " ++
207 show (length xs) ++ " parameters") q xs
296 show (length xs) ++ " parameters") q xs
297+ countSingleQs = go 0 template
298+ where go i "" = (i :: Int)
299+ go i bs = case qms of
300+ ("?","?") -> go i nextQMBS
301+ ("?",_) -> go (i+1) nextQMBS
303+ where qms = B.splitAt 1 qmBS
304+ (qmBS,nextQMBS) = B.splitAt 2 qmBS'
305+ qmBS' = B.dropWhile (/= '?') bs
209-- | Execute an @INSERT@, @UPDATE@, or other SQL query that is not
307-- | Execute an @INSERT@, @UPDATE@, or other SQL query that is not
210-- expected to return results.
308-- expected to return results.
212-- Returns the number of rows affected.
310-- Returns the number of rows affected.
214−-- Throws 'FormatError' if the query could not be formatted correctly.
312+-- Throws 'FormatError' if the query could not be formatted correctly, or
313+-- a 'SqlError' exception if the backend returns an error.
215−execute :: (QueryParams q) => Connection -> Query -> q -> IO Int64
314+execute :: (ToRow q) => Connection -> Query -> q -> IO Int64
216execute conn template qs = do
315execute conn template qs = do
217 result <- exec conn =<< formatQuery conn template qs
316 result <- exec conn =<< formatQuery conn template qs
218 finishExecute conn template result
317 finishExecute conn template result
220−-- | A version of 'execute' that does not perform query substitution.
221−execute_ :: Connection -> Query -> IO Int64
222−execute_ conn q@(Query stmt) = do
223− result <- exec conn stmt
224− finishExecute conn q result
226-- | Execute a multi-row @INSERT@, @UPDATE@, or other SQL query that is not
319-- | Execute a multi-row @INSERT@, @UPDATE@, or other SQL query that is not
227-- expected to return results.
320-- expected to return results.
229−-- Returns the number of rows affected.
322+-- Returns the number of rows affected. If the list of parameters is empty,
323+-- this function will simply return 0 without issuing the query to the backend.
324+-- If this is not desired, consider using the 'Values' constructor instead.
231−-- Throws 'FormatError' if the query could not be formatted correctly.
326+-- Throws 'FormatError' if the query could not be formatted correctly, or
327+-- a 'SqlError' exception if the backend returns an error.
329+-- For example, here's a command that inserts two rows into a table
333+-- executeMany c [sql|
334+-- INSERT INTO sometable VALUES (?,?)
335+-- |] [(1, \"hello\"),(2, \"world\")]
338+-- Here's an canonical example of a multi-row update command:
341+-- executeMany c [sql|
344+-- FROM (VALUES (?,?)) as upd(x,y)
345+-- WHERE sometable.x = upd.x
346+-- |] [(1, \"hello\"),(2, \"world\")]
232−executeMany :: (QueryParams q) => Connection -> Query -> [q] -> IO Int64
349+executeMany :: (ToRow q) => Connection -> Query -> [q] -> IO Int64
233executeMany _ _ [] = return 0
350executeMany _ _ [] = return 0
234executeMany conn q qs = do
351executeMany conn q qs = do
235 result <- exec conn =<< formatMany conn q qs
352 result <- exec conn =<< formatMany conn q qs
236 finishExecute conn q result
353 finishExecute conn q result
355+-- | Execute @INSERT ... RETURNING@, @UPDATE ... RETURNING@, or other SQL
356+-- query that accepts multi-row input and is expected to return results.
357+-- Note that it is possible to write
358+-- @'query' conn "INSERT ... RETURNING ..." ...@
359+-- in cases where you are only inserting a single row, and do not need
360+-- functionality analogous to 'executeMany'.
362+-- If the list of parameters is empty, this function will simply return @[]@
363+-- without issuing the query to the backend. If this is not desired,
364+-- consider using the 'Values' constructor instead.
366+-- Throws 'FormatError' if the query could not be formatted correctly.
238−finishExecute :: Connection -> Query -> PQ.Result -> IO Int64
367+returning :: (ToRow q, FromRow r) => Connection -> Query -> [q] -> IO [r]
239−finishExecute conn q result = do
368+returning = returningWith fromRow
240− status <- PQ.resultStatus result
243− ncols <- PQ.nfields result
245− then throwIO $ QueryError ("execute resulted in " ++ show ncols ++
248− nstr <- PQ.cmdTuples result
249− return $ case nstr of
250− Nothing -> 0 -- is this appropriate?
251− Just str -> toInteger str
253− ncols <- PQ.nfields result
254− throwIO $ QueryError ("execute resulted in " ++ show ncols ++
256− PQ.CopyIn -> fail "FIXME: postgresql-simple does not currently support COPY IN"
257− PQ.CopyOut -> fail "FIXME: postgresql-simple does not currently support COPY OUT"
259− errormsg <- maybe "" id <$> PQ.resultErrorMessage result
260− statusmsg <- PQ.resStatus status
261− state <- maybe "" id <$> PQ.resultErrorField result PQ.DiagSqlstate
262− throwIO $ SqlError { sqlState = state
263− , sqlNativeError = fromEnum status
264− , sqlErrorMsg = B.concat [ "execute: ", statusmsg
267− toInteger str = B.foldl' delta 0 str
270− if '0' <= c && c <= '9'
271− then 10 * acc + fromIntegral (ord c - ord '0')
272− else error ("finishExecute: not an int: " ++ B.unpack str)
370+-- | A version of 'returning' taking parser as argument
371+returningWith :: (ToRow q) => RowParser r -> Connection -> Query -> [q] -> IO [r]
372+returningWith _ _ _ [] = return []
373+returningWith parser conn q qs = do
374+ result <- exec conn =<< formatMany conn q qs
375+ finishQueryWith parser conn q result
276-- | Perform a @SELECT@ or other SQL query that is expected to return
377-- | Perform a @SELECT@ or other SQL query that is expected to return
277-- results. All results are retrieved and converted before this
378-- results. All results are retrieved and converted before this
@@ -288,17 +389,27 @@ finishExecute conn q result = do
288-- using 'execute' instead of 'query').
389-- using 'execute' instead of 'query').
290-- * 'ResultError': result conversion failed.
391-- * 'ResultError': result conversion failed.
291−query :: (QueryParams q, QueryResults r)
392+--
393+-- * 'SqlError': the postgresql backend returned an error, e.g.
394+-- a syntax or type error, or an incorrect table or column name.
292− => Connection -> Query -> q -> IO [r]
395+query :: (ToRow q, FromRow r) => Connection -> Query -> q -> IO [r]
293−query conn template qs = do
396+query = queryWith fromRow
294− result <- exec conn =<< formatQuery conn template qs
295− finishQuery conn template result
297-- | A version of 'query' that does not perform query substitution.
398-- | A version of 'query' that does not perform query substitution.
298−query_ :: (QueryResults r) => Connection -> Query -> IO [r]
399+query_ :: (FromRow r) => Connection -> Query -> IO [r]
400+query_ = queryWith_ fromRow
402+-- | A version of 'query' taking parser as argument
403+queryWith :: ToRow q => RowParser r -> Connection -> Query -> q -> IO [r]
404+queryWith parser conn template qs = do
405+ result <- exec conn =<< formatQuery conn template qs
406+ finishQueryWith parser conn template result
408+-- | A version of 'query_' taking parser as argument
409+queryWith_ :: RowParser r -> Connection -> Query -> IO [r]
299−query_ conn q@(Query que) = do
410+queryWith_ parser conn q@(Query que) = do
300 result <- exec conn que
411 result <- exec conn que
301− finishQuery conn q result
412+ finishQueryWith parser conn q result
303-- | Perform a @SELECT@ or other SQL query that is expected to return
414-- | Perform a @SELECT@ or other SQL query that is expected to return
304-- results. Results are streamed incrementally from the server, and
415-- results. Results are streamed incrementally from the server, and
@@ -310,6 +421,12 @@ query_ conn q@(Query que) = do
310-- This fold is /not/ strict. The stream consumer is responsible for
421-- This fold is /not/ strict. The stream consumer is responsible for
311-- forcing the evaluation of its result to avoid space leaks.
422-- forcing the evaluation of its result to avoid space leaks.
424+-- This is implemented using a database cursor. As such, this requires
425+-- a transaction. This function will detect whether or not there is a
426+-- transaction in progress, and will create a 'ReadCommitted' 'ReadOnly'
427+-- transaction if needed. The cursor is given a unique temporary name,
428+-- so the consumer may itself call fold.
313-- Exceptions that may be thrown:
430-- Exceptions that may be thrown:
315-- * 'FormatError': the query string could not be formatted correctly.
432-- * 'FormatError': the query string could not be formatted correctly.
@@ -318,8 +435,10 @@ query_ conn q@(Query que) = do
318-- using 'execute' instead of 'query').
435-- using 'execute' instead of 'query').
320-- * 'ResultError': result conversion failed.
437-- * 'ResultError': result conversion failed.
439+-- * 'SqlError': the postgresql backend returned an error, e.g.
440+-- a syntax or type error, or an incorrect table or column name.
322−fold :: ( QueryResults row, QueryParams params )
441+fold :: ( FromRow row, ToRow params )
323 => Connection
442 => Connection
325 -> params
444 -> params
@@ -328,6 +447,20 @@ fold :: ( QueryResults row, QueryParams params )
329fold = foldWithOptions defaultFoldOptions
448fold = foldWithOptions defaultFoldOptions
450+-- | A version of 'fold' taking a parser as an argument
451+foldWith :: ( ToRow params )
457+ -> (a -> row -> IO a)
459+foldWith = foldWithOptionsAndParser defaultFoldOptions
461+-- | Number of rows to fetch at a time. 'Automatic' currently defaults
462+-- to 256 rows, although it might be nice to make this more intelligent
463+-- based on e.g. the average size of the rows.
331data FetchQuantity
464data FetchQuantity
332 = Automatic
465 = Automatic
333 | Fixed !Int
466 | Fixed !Int
@@ -338,12 +471,20 @@ data FoldOptions
338 transactionMode :: !TransactionMode
471 transactionMode :: !TransactionMode
474+-- | defaults to 'Automatic', and 'TransactionMode' 'ReadCommitted' 'ReadOnly'
475+defaultFoldOptions :: FoldOptions
341−defaultFoldOptions = FoldOptions {
476+defaultFoldOptions = FoldOptions {
342 fetchQuantity = Automatic,
477 fetchQuantity = Automatic,
343 transactionMode = TransactionMode ReadCommitted ReadOnly
478 transactionMode = TransactionMode ReadCommitted ReadOnly
481+-- | The same as 'fold', but this provides a bit more control over
482+-- lower-level details. Currently, the number of rows fetched per
483+-- round-trip to the server and the transaction mode may be adjusted
484+-- accordingly. If the connection is already in a transaction,
485+-- then the existing transaction is used and thus the 'transactionMode'
486+-- option is ignored.
346−foldWithOptions :: ( QueryResults row, QueryParams params )
487+foldWithOptions :: ( FromRow row, ToRow params )
347 => FoldOptions
488 => FoldOptions
348 -> Connection
489 -> Connection
@@ -351,12 +492,24 @@ foldWithOptions :: ( QueryResults row, QueryParams params )
352 -> (a -> row -> IO a)
493 -> (a -> row -> IO a)
354−foldWithOptions opts conn template qs a f = do
495+foldWithOptions opts = foldWithOptionsAndParser opts fromRow
497+-- | A version of 'foldWithOptions' taking a parser as an argument
498+foldWithOptionsAndParser :: (ToRow params)
505+ -> (a -> row -> IO a)
507+foldWithOptionsAndParser opts parser conn template qs a f = do
355 q <- formatQuery conn template qs
508 q <- formatQuery conn template qs
356− doFold opts conn template (Query q) a f
509+ doFold opts parser conn template (Query q) a f
358-- | A version of 'fold' that does not perform query substitution.
511-- | A version of 'fold' that does not perform query substitution.
359−fold_ :: (QueryResults r) =>
512+fold_ :: (FromRow r) =>
360 Connection
513 Connection
361 -> Query -- ^ Query.
514 -> Query -- ^ Query.
362 -> a -- ^ Initial state for result consumer.
515 -> a -- ^ Initial state for result consumer.
@@ -364,26 +517,43 @@ fold_ :: (QueryResults r) =>
365fold_ = foldWithOptions_ defaultFoldOptions
518fold_ = foldWithOptions_ defaultFoldOptions
520+-- | A version of 'fold_' taking a parser as an argument
521+foldWith_ :: RowParser r
527+foldWith_ = foldWithOptionsAndParser_ defaultFoldOptions
368−foldWithOptions_ :: (QueryResults r) =>
529+foldWithOptions_ :: (FromRow r) =>
369 FoldOptions
530 FoldOptions
370 -> Connection
531 -> Connection
371 -> Query -- ^ Query.
532 -> Query -- ^ Query.
372 -> a -- ^ Initial state for result consumer.
533 -> a -- ^ Initial state for result consumer.
373 -> (a -> r -> IO a) -- ^ Result consumer.
534 -> (a -> r -> IO a) -- ^ Result consumer.
375−foldWithOptions_ opts conn query a f = doFold opts conn query query a f
536+foldWithOptions_ opts conn query' a f = doFold opts fromRow conn query' query' a f
377−
538+-- | A version of 'foldWithOptions_' taking a parser as an argument
378−doFold :: ( QueryResults row )
539+foldWithOptionsAndParser_ :: FoldOptions
379− => FoldOptions
540+ -> RowParser r
542+ -> Query -- ^ Query.
543+ -> a -- ^ Initial state for result consumer.
544+ -> (a -> r -> IO a) -- ^ Result consumer.
546+foldWithOptionsAndParser_ opts parser conn query' a f = doFold opts parser conn query' query' a f
548+doFold :: FoldOptions
380 -> Connection
550 -> Connection
384 -> (a -> row -> IO a)
554 -> (a -> row -> IO a)
386−doFold FoldOptions{..} conn _template q a f = do
556+doFold FoldOptions{..} parser conn _template q a0 f = do
387 stat <- withConnection conn PQ.transactionStatus
557 stat <- withConnection conn PQ.transactionStatus
388 case stat of
558 case stat of
389 PQ.TransIdle -> withTransactionMode transactionMode conn go
559 PQ.TransIdle -> withTransactionMode transactionMode conn go
@@ -401,11 +571,17 @@ doFold FoldOptions{..} conn _template q a f = do
401 PQ.TransUnknown -> fail "foldWithOpts FIXME: PQ.TransUnknown"
571 PQ.TransUnknown -> fail "foldWithOpts FIXME: PQ.TransUnknown"
402 -- Not sure what this means.
572 -- Not sure what this means.
404− go = do
574+ declare =
405− -- FIXME: what about name clashes with already-declared cursors?
575+ declareCursor conn q
406− _ <- execute_ conn ("DECLARE fold NO SCROLL CURSOR FOR "
576+ fetch cursor a =
407− `mappend` q)
577+ foldForwardWithParser cursor parser chunkSize f a
408− loop a `finally` execute_ conn "CLOSE fold"
578+
579+ go = bracket declare closeCursor $ \cursor ->
580+ let loop a = fetch cursor a >>=
410-- FIXME: choose the Automatic chunkSize more intelligently
586-- FIXME: choose the Automatic chunkSize more intelligently
411-- One possibility is to use the type of the results, although this
587-- One possibility is to use the type of the results, although this
@@ -416,151 +592,45 @@ doFold FoldOptions{..} conn _template q a f = do
416 chunkSize = case fetchQuantity of
592 chunkSize = case fetchQuantity of
417 Automatic -> 256
593 Automatic -> 256
418 Fixed n -> n
594 Fixed n -> n
420− rs <- query conn "FETCH FORWARD ? FROM fold" (Only chunkSize)
421− if null rs then return a else foldM f a rs >>= loop
423-- | A version of 'fold' that does not transform a state value.
596-- | A version of 'fold' that does not transform a state value.
424−forEach :: (QueryParams q, QueryResults r) =>
597+forEach :: (ToRow q, FromRow r) =>
425 Connection
598 Connection
426 -> Query -- ^ Query template.
599 -> Query -- ^ Query template.
427 -> q -- ^ Query parameters.
600 -> q -- ^ Query parameters.
428 -> (r -> IO ()) -- ^ Result consumer.
601 -> (r -> IO ()) -- ^ Result consumer.
430−forEach conn template qs = fold conn template qs () . const
603+forEach = forEachWith fromRow
431{-# INLINE forEach #-}
604{-# INLINE forEach #-}
606+-- | A version of 'forEach' taking a parser as an argument
607+forEachWith :: ( ToRow q )
614+forEachWith parser conn template qs = foldWith parser conn template qs () . const
615+{-# INLINE forEachWith #-}
433-- | A version of 'forEach' that does not perform query substitution.
617-- | A version of 'forEach' that does not perform query substitution.
434−forEach_ :: (QueryResults r) =>
618+forEach_ :: (FromRow r) =>
435 Connection
619 Connection
436 -> Query -- ^ Query template.
620 -> Query -- ^ Query template.
437 -> (r -> IO ()) -- ^ Result consumer.
621 -> (r -> IO ()) -- ^ Result consumer.
439−forEach_ conn template = fold_ conn template () . const
623+forEach_ = forEachWith_ fromRow
440{-# INLINE forEach_ #-}
624{-# INLINE forEach_ #-}
442−forM' :: (Ord n, Num n) => n -> n -> (n -> IO a) -> IO [a]
626+forEachWith_ :: RowParser r
443−forM' lo hi m = loop hi []
627+ -> Connection
445− loop !n !as
629+ -> (r -> IO ())
446− | n < lo = return as
630+ -> IO ()
447− | otherwise = do
631+forEachWith_ parser conn template = foldWith_ parser conn template () . const
448− a <- m n
632+{-# INLINE forEachWith_ #-}
449− loop (n-1) (a:as)
633+
451−finishQuery :: (QueryResults r) => Connection -> Query -> PQ.Result -> IO [r]
452−finishQuery conn q result = do
453− status <- PQ.resultStatus result
456− throwIO $ QueryError "query resulted in a command response" q
458− ncols <- PQ.nfields result
459− fields <- forM' 0 (ncols-1) $ \column -> do
460− type_oid <- PQ.ftype result column
461− typename <- getTypename conn type_oid
463− nrows <- PQ.ntuples result
464− forM' 0 (nrows-1) $ \row -> do
465− values <- forM' 0 (ncols-1) (\col -> PQ.getvalue result row col)
466− case convertResults fields values of
467− Left err -> throwIO err
469− PQ.CopyIn -> fail "FIXME: postgresql-simple does not currently support COPY IN"
470− PQ.CopyOut -> fail "FIXME: postgresql-simple does not currently support COPY OUT"
472− errormsg <- maybe "" id <$> PQ.resultErrorMessage result
473− statusmsg <- PQ.resStatus status
474− state <- maybe "" id <$> PQ.resultErrorField result PQ.DiagSqlstate
475− throwIO $ SqlError { sqlState = state
476− , sqlNativeError = fromEnum status
477− , sqlErrorMsg = B.concat [ "query: ", statusmsg
480−-- | Of the four isolation levels defined by the SQL standard,
481−-- these are the three levels distinguished by PostgreSQL as of version 9.0.
482−-- See <http://www.postgresql.org/docs/9.1/static/transaction-iso.html>
483−-- for more information.
489− deriving (Show, Eq, Ord, Enum, Bounded)
494− deriving (Show, Eq, Ord, Enum, Bounded)
496−data TransactionMode = TransactionMode {
497− isolationLevel :: !IsolationLevel,
498− readWriteMode :: !ReadWriteMode
499− } deriving (Show, Eq, Ord)
501−defaultTransactionMode :: TransactionMode
502−defaultTransactionMode = TransactionMode ReadCommitted ReadWrite
504−-- | Execute an action inside a SQL transaction.
506−-- This function initiates a transaction with a \"@begin
507−-- transaction@\" statement, then executes the supplied action. If
508−-- the action succeeds, the transaction will be completed with
509−-- 'Base.commit' before this function returns.
511−-- If the action throws /any/ kind of exception (not just a
512−-- PostgreSQL-related exception), the transaction will be rolled back using
513−-- 'rollback', then the exception will be rethrown.
514−withTransaction :: Connection -> IO a -> IO a
515−withTransaction = withTransactionMode defaultTransactionMode
517−-- | Execute an action inside a SQL transaction with a given isolation level.
518−withTransactionMode :: TransactionMode -> Connection -> IO a -> IO a
519−withTransactionMode mode conn act = do
521− r <- act `onException` rollback conn
525−-- | Rollback a transaction.
526−rollback :: Connection -> IO ()
527−rollback conn = execute_ conn "ABORT" >> return ()
529−-- | Commit a transaction.
530−commit :: Connection -> IO ()
531−commit conn = execute_ conn "COMMIT" >> return ()
533−-- | Begin a transaction.
534−begin :: Connection -> IO ()
535−begin = beginMode defaultTransactionMode
537−-- | Begin a transaction with a given isolation level
538−beginMode :: TransactionMode -> Connection -> IO ()
539−beginMode mode conn = do
540− execute_ conn $! case mode of
541− TransactionMode ReadCommitted ReadWrite ->
543− TransactionMode ReadCommitted ReadOnly ->
545− TransactionMode RepeatableRead ReadWrite ->
546− "BEGIN ISOLATION LEVEL REPEATABLE READ"
547− TransactionMode RepeatableRead ReadOnly ->
548− "BEGIN ISOLATION LEVEL REPEATABLE READ READ ONLY"
549− TransactionMode Serializable ReadWrite ->
550− "BEGIN ISOLATION LEVEL SERIALIZABLE"
551− TransactionMode Serializable ReadOnly ->
552− "BEGIN ISOLATION LEVEL SERIALIZABLE READ ONLY"
555−fmtError :: String -> Query -> [Action] -> a
556−fmtError msg q xs = throw FormatError {
559− , fmtParams = map twiddle xs
561− where twiddle (Plain b) = toByteString b
562− twiddle (Escape s) = s
563− twiddle (Many ys) = B.concat (map twiddle ys)
@@ -588,9 +658,11 @@ fmtError msg q xs = throw FormatError {
589-- > import Database.PostgreSQL.Simple
659-- > import Database.PostgreSQL.Simple
591-- > hello = do
662-- > hello = do
592−-- > conn <- connect defaultConnectInfo
663+-- > conn <- connectPostgreSQL ""
593−-- > query conn "select 2 + 2"
664+-- > [Only i] <- query_ conn "select 2 + 2"
595-- A 'Query' value does not represent the actual query that will be
667-- A 'Query' value does not represent the actual query that will be
596-- executed, but is a template for constructing the final query.
668-- executed, but is a template for constructing the final query.
@@ -637,7 +709,7 @@ fmtError msg q xs = throw FormatError {
637-- Automated type inference means that you will often be able to avoid
709-- Automated type inference means that you will often be able to avoid
638-- supplying explicit type signatures for the elements of a tuple.
710-- supplying explicit type signatures for the elements of a tuple.
639-- However, sometimes the compiler will not be able to infer your
711-- However, sometimes the compiler will not be able to infer your
640−-- types. Consider a care where you write a numeric literal in a
712+-- types. Consider a case where you write a numeric literal in a
641-- parameter tuple:
713-- parameter tuple:
643-- > query conn "select ? + ?" (40,2)
715-- > query conn "select ? + ?" (40,2)
@@ -651,15 +723,30 @@ fmtError msg q xs = throw FormatError {
651-- The same kind of problem can arise with string literals if you have
723-- The same kind of problem can arise with string literals if you have
652-- the @OverloadedStrings@ language extension enabled. Again, just
724-- the @OverloadedStrings@ language extension enabled. Again, just
653-- use an explicit type signature if this happens.
725-- use an explicit type signature if this happens.
727+-- Finally, remember that the compiler must be able to infer the type
728+-- of a query's /results/ as well as its parameters. We might like
729+-- the following example to work:
731+-- > print =<< query_ conn "select 2 + 2"
733+-- Unfortunately, while a quick glance tells us that the result type
734+-- should be a single row containing a single numeric column, the
735+-- compiler has no way to infer what the types are. We can easily fix
736+-- this by providing an explicit type annotation:
738+-- > xs <- query_ conn "select 2 + 2"
739+-- > print (xs :: [Only Int])
655-- $only_param
741-- $only_param
657-- Haskell lacks a single-element tuple type, so if you have just one
743-- Haskell lacks a single-element tuple type, so if you have just one
658−-- value you want substituted into a query, what should you do?
744+-- value you want substituted into a query or a single-column result,
745+-- what should you do?
660-- The obvious approach would appear to be something like this:
747-- The obvious approach would appear to be something like this:
662−-- > instance (Param a) => QueryParam a where
749+-- > instance (ToField a) => ToRow a where
665-- Unfortunately, this wreaks havoc with type inference, so we take a
752-- Unfortunately, this wreaks havoc with type inference, so we take a
@@ -670,6 +757,9 @@ fmtError msg q xs = throw FormatError {
671-- > execute conn "insert into users (first_name) values (?)"
758-- > execute conn "insert into users (first_name) values (?)"
672-- > ["Nuala"]
759-- > ["Nuala"]
761+-- A row of /n/ query results is represented using an /n/-tuple, so
762+-- you should use 'Only' to represent a single-column result.
@@ -687,7 +777,7 @@ fmtError msg q xs = throw FormatError {
687-- Here's an example:
777-- Here's an example:
689-- > query conn "select * from users where first_name in ?" $
779-- > query conn "select * from users where first_name in ?" $
690−-- > In ["Anna", "Boris", "Carla"]
780+-- > Only $ In ["Anna", "Boris", "Carla"]
692-- If your 'In'-wrapped list is empty, the string @\"(null)\"@ will be
782-- If your 'In'-wrapped list is empty, the string @\"(null)\"@ will be
693-- substituted instead, to ensure that your clause remains
783-- substituted instead, to ensure that your clause remains
@@ -715,7 +805,7 @@ fmtError msg q xs = throw FormatError {
715-- * There must be no other \"@?@\" characters anywhere in your
805-- * There must be no other \"@?@\" characters anywhere in your
716-- template.
806-- template.
718−-- * There must one or more \"@?@\" in the parentheses.
808+-- * There must be one or more \"@?@\" in the parentheses.
720-- * Extra white space is fine.
810-- * Extra white space is fine.
@@ -736,10 +826,26 @@ fmtError msg q xs = throw FormatError {
736-- > insert into users (first_name,last_name) values
826-- > insert into users (first_name,last_name) values
737-- > ('Boris','Karloff'),('Ed','Wood')
827-- > ('Boris','Karloff'),('Ed','Wood')
831+-- PostgreSQL supports returning values from data manipulation statements
832+-- such as @INSERT@ and @UPDATE@. You can use these statements by
833+-- using 'query' instead of 'execute'. For multi-tuple inserts,
834+-- use 'returning' instead of 'executeMany'.
836+-- For example, were there an auto-incrementing @id@ column and
837+-- timestamp column @t@ that defaulted to the present time for the
838+-- @sales@ table, then the following query would insert two new
839+-- sales records and also return their new @id@s and timestamps.
841+-- > let q = "insert into sales (amount, label) values (?,?) returning id, t"
842+-- > xs :: [(Int, UTCTime)] <- query conn q (15,"Sawdust")
843+-- > ys :: [(Int, UTCTime)] <- returning conn q [(20,"Chips"),(300,"Wood")]
739-- $result
845-- $result
741-- The 'query' and 'query_' functions return a list of values in the
847-- The 'query' and 'query_' functions return a list of values in the
742−-- 'QueryResults' typeclass. This class performs automatic extraction
848+-- 'FromRow' typeclass. This class performs automatic extraction
743-- and type conversion of rows from a query result.
849-- and type conversion of rows from a query result.
745-- Here is a simple example of how to extract results:
851-- Here is a simple example of how to extract results:
@@ -770,7 +876,7 @@ fmtError msg q xs = throw FormatError {
771-- Although SQL can accommodate @NULL@ as a value for any of these
877-- Although SQL can accommodate @NULL@ as a value for any of these
772-- types, Haskell cannot. If your result contains columns that may be
878-- types, Haskell cannot. If your result contains columns that may be
773−-- @NULL@, be sure that you use 'Maybe' in those positions of of your
879+-- @NULL@, be sure that you use 'Maybe' in those positions of your
776-- > (Text, Maybe Int, Int)
882-- > (Text, Maybe Int, Int)
@@ -796,7 +902,7 @@ fmtError msg q xs = throw FormatError {
796-- all values of the given PostgreSQL type is considered \"compatible\".
902-- all values of the given PostgreSQL type is considered \"compatible\".
797-- For instance, you can always extract a PostgreSQL 16-bit @SMALLINT@
903-- For instance, you can always extract a PostgreSQL 16-bit @SMALLINT@
798-- column to a Haskell 'Int'. The Haskell 'Float' type can accurately
904-- column to a Haskell 'Int'. The Haskell 'Float' type can accurately
799−-- represent a @SMALLINT@, so it is considered compatble with those types.
905+-- represent a @SMALLINT@, so it is considered compatible with those types.
801-- * A numeric compatibility check is based only on the type of a
907-- * A numeric compatibility check is based only on the type of a
802-- column, /not/ on its values. For instance, a PostgreSQL 64-bit
908-- column, /not/ on its values. For instance, a PostgreSQL 64-bit
@@ -810,25 +916,3 @@ fmtError msg q xs = throw FormatError {
810-- UTF-8. If you use some other encoding, decoding may fail or give
916-- UTF-8. If you use some other encoding, decoding may fail or give
811-- wrong results. In such cases, write a @newtype@ wrapper and a
917-- wrong results. In such cases, write a @newtype@ wrapper and a
812-- custom 'Result' instance to handle your encoding.
918-- custom 'Result' instance to handle your encoding.
814−getTypename :: Connection -> PQ.Oid -> IO ByteString
815−getTypename conn@Connection{..} oid =
816− case oid2builtin oid of
817− Just builtin -> return $! builtin2typname builtin
818− Nothing -> modifyMVar connectionObjects $ \oidmap -> do
819− case IntMap.lookup (oid2int oid) oidmap of
820− Just name -> return (oidmap, name)
822− names <- query conn "SELECT typname FROM pg_type WHERE oid=?"
824− name <- case names of
825− [] -> return $ throw SqlError {
826− sqlNativeError = -1,
827− sqlErrorMsg = "invalid type oid",
830− [Only x] -> return x
831− _ -> fail "typename query returned more than one result"
832− -- oid is a primary key, so the query should
833− -- never return more than one result
834− return (IntMap.insert (oid2int oid) name oidmap, name)