git.iko.soy/typeable/postgresql-simple
on master help sign in
Delete Trailing Whitespace
23a4328Leon P Smith
src/Database/PostgreSQL/Simple.hs+2−2
compare with master
unifiedsplit
@@ -482,11 +482,11 @@ doFold FoldOptions{..} conn _template q a0 f = do
482 where
482 where
483 declare = do
483 declare = do
484 name <- newTempName conn
484 name <- newTempName conn
485− _ <- execute_ conn $ mconcat
485+ _ <- execute_ conn $ mconcat
486 [ "DECLARE ", name, " NO SCROLL CURSOR FOR ", q ]
486 [ "DECLARE ", name, " NO SCROLL CURSOR FOR ", q ]
487 return name
487 return name
488 fetch (Query name) = query_ conn $
488 fetch (Query name) = query_ conn $
489− Query (toByteString (fromByteString "FETCH FORWARD "
489+ Query (toByteString (fromByteString "FETCH FORWARD "
490 <> integral chunkSize
490 <> integral chunkSize
491 <> fromByteString " FROM "
491 <> fromByteString " FROM "
492 <> fromByteString name
492 <> fromByteString name
src/Database/PostgreSQL/Simple/Arrays.hs−1
@@ -90,4 +90,3 @@ esc = B.concatMap f
90 f '\\' = "\\\\"
90 f '\\' = "\\\\"
91 f c = B.singleton c
91 f c = B.singleton c
92 -- TODO: Implement easy performance improvements with unfoldr.
92 -- TODO: Implement easy performance improvements with unfoldr.
93−
src/Database/PostgreSQL/Simple/Copy.hs+7−7
@@ -16,7 +16,7 @@
16-- or @COPY TO STDOUT@ query as documented in the link above. Then
16-- or @COPY TO STDOUT@ query as documented in the link above. Then
17-- call @getCopyData@ repeatedly until it returns 'CopyOutDone' in
17-- call @getCopyData@ repeatedly until it returns 'CopyOutDone' in
18-- the former case, or in the latter, call @putCopyData@ repeatedly
18-- the former case, or in the latter, call @putCopyData@ repeatedly
19−-- and then finish by calling either @putCopyEnd@ to proceed or
19+-- and then finish by calling either @putCopyEnd@ to proceed or
20-- @putCopyError@ to abort.
20-- @putCopyError@ to abort.
21--
21--
22-- You cannot issue another query on the same connection while a copy
22-- You cannot issue another query on the same connection while a copy
@@ -50,7 +50,7 @@ import Database.PostgreSQL.Simple
50import Database.PostgreSQL.Simple.Types
50import Database.PostgreSQL.Simple.Types
51import Database.PostgreSQL.Simple.Internal
51import Database.PostgreSQL.Simple.Internal
52
52
53−-- | Issue a query that changes a connection's state to @CopyIn@
53+-- | Issue a query that changes a connection's state to @CopyIn@
54-- (via a @COPY FROM STDIN@ query) or @CopyOut@ (via @COPY TO STDOUT@)
54-- (via a @COPY FROM STDIN@ query) or @CopyOut@ (via @COPY TO STDOUT@)
55-- query. Performs parameter subsitution.
55-- query. Performs parameter subsitution.
56
56
@@ -59,7 +59,7 @@ copy conn template qs = do
59 q <- formatQuery conn template qs
59 q <- formatQuery conn template qs
60 doCopy "Database.PostgreSQL.Simple.Copy.copy" conn template q
60 doCopy "Database.PostgreSQL.Simple.Copy.copy" conn template q
61
61
62−-- | Issue a query that changes a connection's state to @CopyIn@
62+-- | Issue a query that changes a connection's state to @CopyIn@
63-- (via a @COPY FROM STDIN@ query) or @CopyOut@ (via @COPY TO STDOUT@)
63-- (via a @COPY FROM STDIN@ query) or @CopyOut@ (via @COPY TO STDOUT@)
64-- query. Does not perform parameter subsitution.
64-- query. Does not perform parameter subsitution.
65
65
@@ -85,7 +85,7 @@ doCopy funcName conn template q = do
85 PQ.FatalError -> throwResultError funcName result status
85 PQ.FatalError -> throwResultError funcName result status
86
86
87data CopyOutResult
87data CopyOutResult
88− = CopyOutRow !B.ByteString -- ^ Data representing either exactly
88+ = CopyOutRow !B.ByteString -- ^ Data representing either exactly
89 -- one row of the result, or header
89 -- one row of the result, or header
90 -- or footer data depending on format.
90 -- or footer data depending on format.
91 | CopyOutDone {-# UNPACK #-} !Int64 -- ^ No more rows, and a count of the
91 | CopyOutDone {-# UNPACK #-} !Int64 -- ^ No more rows, and a count of the
@@ -93,7 +93,7 @@ data CopyOutResult
93 deriving (Eq, Typeable, Show)
93 deriving (Eq, Typeable, Show)
94
94
95-- | A connection must be in the @CopyOut@ state in order to call this
95-- | A connection must be in the @CopyOut@ state in order to call this
96−-- function, via a @COPY TO STDOUT@ query. If this returns a 'CopyOutRow',
96+-- function, via a @COPY TO STDOUT@ query. If this returns a 'CopyOutRow',
97-- the connection remains in the @CopyOut@ state, if it returns 'CopyOutDone',
97-- the connection remains in the @CopyOut@ state, if it returns 'CopyOutDone',
98-- then the connection has reverted to the ready state.
98-- then the connection has reverted to the ready state.
99
99
@@ -135,9 +135,9 @@ getCopyData conn = withConnection conn loop
135
135
136-- | A connection must be in the @CopyIn@ state in order to call this
136-- | A connection must be in the @CopyIn@ state in order to call this
137-- function, via a @COPY FROM STDIN@ query. The connection remains
137-- function, via a @COPY FROM STDIN@ query. The connection remains
138−-- in a @CopyIn@ state after this function is called. Note that
138+-- in a @CopyIn@ state after this function is called. Note that
139-- the data does not need to represent a single row, or even an
139-- the data does not need to represent a single row, or even an
140−-- integral number of rows. The net result of
140+-- integral number of rows. The net result of
141-- @putCopyData conn a >> putCopyData conn b@
141-- @putCopyData conn a >> putCopyData conn b@
142-- is the same as @putCopyData conn c@ whenever @c == BS.append a b@.
142-- is the same as @putCopyData conn c@ whenever @c == BS.append a b@.
143
143
src/Database/PostgreSQL/Simple/FromRow.hs+1−1
@@ -70,7 +70,7 @@ nfields :: PQ.Result -> PQ.Column
70nfields result = unsafeDupablePerformIO (PQ.nfields result)
70nfields result = unsafeDupablePerformIO (PQ.nfields result)
71
71
72getTypeInfoByCol :: Row -> PQ.Column -> Conversion TypeInfo
72getTypeInfoByCol :: Row -> PQ.Column -> Conversion TypeInfo
73−getTypeInfoByCol Row{..} col =
73+getTypeInfoByCol Row{..} col =
74 Conversion $ \conn -> do
74 Conversion $ \conn -> do
75 oid <- PQ.ftype rowresult col
75 oid <- PQ.ftype rowresult col
76 Ok <$> getTypeInfo conn oid
76 Ok <$> getTypeInfo conn oid