master..2c2463a · typeable/postgresql-simple

.github/workflows/haskell-ci.yml+53−41

@@ -8,9 +8,9 @@

88#

99# For more information, see https://github.com/haskell-CI/haskell-ci

1010#

11−# version: 0.17.20231110

11+# version: 0.15.20221009

1212#

13−# REGENDATA ("0.17.20231110",["github","cabal.project"])

13+# REGENDATA ("0.15.20221009",["github","cabal.project"])

1414#

1515name: Haskell-CI

1616on:

@@ -38,24 +38,14 @@ jobs:

3838 strategy:

3939 matrix:

4040 include:

41− - compiler: ghc-9.8.1

41+ - compiler: ghc-9.4.2

4242 compilerKind: ghc

43− compilerVersion: 9.8.1

43+ compilerVersion: 9.4.2

4444 setup-method: ghcup

4545 allow-failure: false

46− - compiler: ghc-9.6.3

46+ - compiler: ghc-9.2.4

4747 compilerKind: ghc

48− compilerVersion: 9.6.3

49− setup-method: ghcup

50− allow-failure: false

51− - compiler: ghc-9.4.8

52− compilerKind: ghc

53− compilerVersion: 9.4.8

54− setup-method: ghcup

55− allow-failure: false

56− - compiler: ghc-9.2.8

57− compilerKind: ghc

58− compilerVersion: 9.2.8

48+ compilerVersion: 9.2.4

5949 setup-method: ghcup

6050 allow-failure: false

6151 - compiler: ghc-9.0.2

@@ -78,6 +68,36 @@ jobs:

7868 compilerVersion: 8.6.5

7969 setup-method: hvr-ppa

8070 allow-failure: false

71+ - compiler: ghc-8.4.4

72+ compilerKind: ghc

73+ compilerVersion: 8.4.4

74+ setup-method: hvr-ppa

75+ allow-failure: false

76+ - compiler: ghc-8.2.2

77+ compilerKind: ghc

78+ compilerVersion: 8.2.2

79+ setup-method: hvr-ppa

80+ allow-failure: false

81+ - compiler: ghc-8.0.2

82+ compilerKind: ghc

83+ compilerVersion: 8.0.2

84+ setup-method: hvr-ppa

85+ allow-failure: false

86+ - compiler: ghc-7.10.3

87+ compilerKind: ghc

88+ compilerVersion: 7.10.3

89+ setup-method: hvr-ppa

90+ allow-failure: false

91+ - compiler: ghc-7.8.4

92+ compilerKind: ghc

93+ compilerVersion: 7.8.4

94+ setup-method: hvr-ppa

95+ allow-failure: false

96+ - compiler: ghc-7.6.3

97+ compilerKind: ghc

98+ compilerVersion: 7.6.3

99+ setup-method: hvr-ppa

100+ allow-failure: false

81101 fail-fast: false

82102 steps:

83103 - name: apt

@@ -86,18 +106,18 @@ jobs:

86106 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5

87107 if [ "${{ matrix.setup-method }}" = ghcup ]; then

88108 mkdir -p "$HOME/.ghcup/bin"

89− curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"

109+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"

90110 chmod a+x "$HOME/.ghcup/bin/ghcup"

91111 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)

92− "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

112+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

93113 else

94114 apt-add-repository -y 'ppa:hvr/ghc'

95115 apt-get update

96116 apt-get install -y "$HCNAME"

97117 mkdir -p "$HOME/.ghcup/bin"

98− curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"

118+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"

99119 chmod a+x "$HOME/.ghcup/bin/ghcup"

100− "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

120+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

101121 fi

102122 env:

103123 HCKIND: ${{ matrix.compilerKind }}

@@ -111,19 +131,17 @@ jobs:

111131 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

112132 HCDIR=/opt/$HCKIND/$HCVER

113133 if [ "${{ matrix.setup-method }}" = ghcup ]; then

114− HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")

115− HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')

116− HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')

134+ HC=$HOME/.ghcup/bin/$HCKIND-$HCVER

117135 echo "HC=$HC" >> "$GITHUB_ENV"

118− echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"

119− echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"

120− echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

136+ echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"

137+ echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"

138+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

121139 else

122140 HC=$HCDIR/bin/$HCKIND

123141 echo "HC=$HC" >> "$GITHUB_ENV"

124142 echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"

125143 echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"

126− echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

144+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

127145 fi

128146

129147 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

@@ -175,14 +193,14 @@ jobs:

175193 - name: install cabal-plan

176194 run: |

177195 mkdir -p $HOME/.cabal/bin

178− curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz

179− echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -

196+ curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz

197+ echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -

180198 xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan

181199 rm -f cabal-plan.xz

182200 chmod a+x $HOME/.cabal/bin/cabal-plan

183201 cabal-plan --version

184202 - name: checkout

185− uses: actions/checkout@v3

203+ uses: actions/checkout@v2

186204 with:

187205 path: source

188206 - name: initial cabal.project for sdist

@@ -206,8 +224,8 @@ jobs:

206224 touch cabal.project

207225 touch cabal.project.local

208226 echo "packages: ${PKGDIR_postgresql_simple}" >> cabal.project

209− echo "package postgresql-simple" >> cabal.project

210− echo " ghc-options: -Werror=missing-methods" >> cabal.project

227+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package postgresql-simple" >> cabal.project ; fi

228+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi

211229 cat >> cabal.project <<EOF

212230 allow-newer: cryptohash-md5-0.11.100.1:base

213231 EOF

@@ -218,8 +236,8 @@ jobs:

218236 run: |

219237 $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all

220238 cabal-plan

221− - name: restore cache

222− uses: actions/cache/restore@v3

239+ - name: cache

240+ uses: actions/cache@v2

223241 with:

224242 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

225243 path: ~/.cabal/store

@@ -243,14 +261,8 @@ jobs:

243261 ${CABAL} -vnormal check

244262 - name: haddock

245263 run: |

246− $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

264+ $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

247265 - name: unconstrained build

248266 run: |

249267 rm -f cabal.project.local

250268 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all

251− - name: save cache

252− uses: actions/cache/save@v3

253− if: always()

254− with:

255− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

256− path: ~/.cabal/store

.github/workflows/simple.yml+3−3

@@ -14,7 +14,7 @@ jobs:

1414 strategy:

1515 matrix:

1616 os: [macos-latest, windows-latest]

17− ghc: ['8.10','9.0','9.2','9.4.8','9.6.3','9.8.1']

17+ ghc: ['8.10','9.0','9.2','9.4.2']

1818 fail-fast: false

1919 timeout-minutes:

2020 60

@@ -26,10 +26,10 @@ jobs:

2626

2727 - name: Set up Haskell

2828 id: setup-haskell

29− uses: haskell/actions/setup@v2

29+ uses: haskell/actions/setup@v1

3030 with:

3131 ghc-version: ${{ matrix.ghc }}

32− cabal-version: '3.10.2.0'

32+ cabal-version: '3.8.1.0'

3333

3434 - name: Set up PostgreSQL

3535 uses: ikalnytskyi/action-setup-postgres@v3

CHANGES.md−18

@@ -1,21 +1,3 @@

1−### Version 0.7.0.0 (2023-07-31)

2−

3− * Remove Eq Null instance. (Future `base` may break it, we remove it profilacticly).

4− * Use `postgresql-libpq >=0.10.0.0`. It includes critical fixes,

5− by using `postgresql-simple >=0.7` you won't get older `postgresql-libpq`.

6− * Drop support for GHC prior 8.6

7− * Added a class for `postgresql-simple` exceptions: `SomePostgreSqlException`.

8− This allows to catch all `postgresql-simple` exceptions at once.

9− (c.f. `AsyncException` in `base).

10−

11−### Version 0.6.5.1 (2023-07-09)

12−

13− * Support `aeson-2.2.0.0`

14−

15−### Version 0.6.5 (2022-10-30)

16−

17− * Add `withConnect`

18−

191### Version 0.6.4 (2021-01-06)

202

213 * Add foldCopyData helper function

postgresql-simple.cabal+47−24

@@ -1,7 +1,7 @@

11cabal-version: 1.12

22name: postgresql-simple

3−version: 0.7.0.0

4−x-revision: 1

3+version: 0.6.4

4+x-revision: 9

55synopsis: Mid-Level PostgreSQL client library

66description:

77 Mid-Level PostgreSQL client library, forked from mysql-simple.

@@ -24,14 +24,18 @@ extra-source-files:

2424 test/results/unique-constraint-violation.expected

2525

2626tested-with:

27− GHC ==8.6.5

27+ GHC ==7.6.3

28+ || ==7.8.4

29+ || ==7.10.3

30+ || ==8.0.2

31+ || ==8.2.2

32+ || ==8.4.4

33+ || ==8.6.5

2834 || ==8.8.4

2935 || ==8.10.7

3036 || ==9.0.2

31− || ==9.2.8

32− || ==9.4.8

33− || ==9.6.3

34− || ==9.8.1

37+ || ==9.2.4

38+ || ==9.4.2

3539

3640library

3741 default-language: Haskell2010

@@ -77,25 +81,34 @@ library

7781

7882 -- GHC bundled libs

7983 build-depends:

80− base >=4.12.0.0 && <4.20

81− , bytestring >=0.10.8.2 && <0.13

82− , containers >=0.6.0.1 && <0.7

83− , template-haskell >=2.14.0.0 && <2.22

84− , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2

84+ base >=4.6.0.0 && <4.18

85+ , bytestring >=0.10.0.0 && <0.12

86+ , containers >=0.5.0.0 && <0.7

87+ , template-haskell >=2.8.0.0 && <2.20

88+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1

8589 , time-compat >=1.9.5 && <1.12

86− , transformers >=0.5.6.2 && <0.7

90+ , transformers >=0.3.0.0 && <0.7

8791

8892 -- Other dependencies

8993 build-depends:

90− aeson >=2.1.2.1 && <2.3

91− , attoparsec >=0.14.4 && <0.15

92− , case-insensitive >=1.2.1.0 && <1.3

93− , hashable >=1.4.3.0 && <1.5

94− , Only >=0.1 && <0.1.1

95− , postgresql-libpq >=0.10.0.0 && <0.11

96− , scientific >=0.3.7.0 && <0.4

97− , uuid-types >=1.0.5 && <1.1

98− , vector >=0.13.0.0 && <0.14

94+ aeson >=1.4.1.0 && <1.6 || >=2.0.0.0 && <2.2

95+ , attoparsec >=0.13.2.2 && <0.15

96+ , bytestring-builder >=0.10.8.1.0 && <0.11

97+ , case-insensitive >=1.2.0.11 && <1.3

98+ , hashable >=1.2.7.0 && <1.5

99+ , Only >=0.1 && <0.1.1

100+ , postgresql-libpq >=0.9.4.3 && <0.10

101+ , scientific >=0.3.6.2 && <0.4

102+ , uuid-types >=1.0.3 && <1.1

103+ , vector >=0.12.0.1 && <0.14

104+

105+ if !impl(ghc >=8.0)

106+ build-depends:

107+ fail >=4.9.0.0 && <4.10

108+ , semigroups >=0.18.5 && <0.21

109+

110+ if !impl(ghc >=7.6)

111+ build-depends: ghc-prim

99112

100113 default-extensions:

101114 BangPatterns

@@ -110,7 +123,15 @@ source-repository head

110123 type: git

111124 location: http://github.com/haskellari/postgresql-simple

112125

126+source-repository this

127+ type: git

128+ location: http://github.com/haskellari/postgresql-simple

129+ tag: v0.6.3

130+

113131test-suite inspection

132+ if !impl(ghc >=8.0)

133+ buildable: False

134+

114135 default-language: Haskell2010

115136 type: exitcode-stdio-1.0

116137 hs-source-dirs: test

@@ -130,11 +151,10 @@ test-suite test

130151 main-is: Main.hs

131152 other-modules:

132153 Common

133− Exception

134− Interval

135154 Notify

136155 Serializable

137156 Time

157+ Interval

138158

139159 ghc-options: -threaded

140160 ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-unused-do-bind

@@ -164,6 +184,9 @@ test-suite test

164184 , time-compat

165185 , vector

166186

187+ if !impl(ghc >=7.6)

188+ build-depends: ghc-prim

189+

167190benchmark select

168191 default-language: Haskell2010

169192 type: exitcode-stdio-1.0

src/Database/PostgreSQL/Simple.hs−1

@@ -64,7 +64,6 @@ module Database.PostgreSQL.Simple

6464 , Only(..)

6565 , (:.)(..)

6666 -- ** Exceptions

67− , SomePostgreSqlException(..)

6867 , SqlError(..)

6968 , PQ.ExecStatus(..)

7069 , FormatError(..)

src/Database/PostgreSQL/Simple/Compat.hs+53

@@ -12,13 +12,36 @@ module Database.PostgreSQL.Simple.Compat

1212 ) where

1313

1414import qualified Control.Exception as E

15+import Data.Monoid

1516import Data.ByteString (ByteString)

17+#if MIN_VERSION_bytestring(0,10,0)

1618import Data.ByteString.Lazy (toStrict)

19+#else

20+import qualified Data.ByteString as B

21+import Data.ByteString.Lazy (toChunks)

22+#endif

1723import Data.ByteString.Builder (Builder, toLazyByteString)

24+

25+#if MIN_VERSION_scientific(0,3,0)

1826import Data.Text.Lazy.Builder.Scientific (scientificBuilder)

27+#else

28+import Data.Scientific (scientificBuilder)

29+#endif

30+

31+#if __GLASGOW_HASKELL__ >= 702

1932import System.IO.Unsafe (unsafeDupablePerformIO)

33+#elif __GLASGOW_HASKELL__ >= 611

34+import GHC.IO (unsafeDupablePerformIO)

35+#else

36+import GHC.IOBase (unsafeDupablePerformIO)

37+#endif

38+

2039import Data.Fixed (Pico)

40+#if MIN_VERSION_base(4,7,0)

2141import Data.Fixed (Fixed(MkFixed))

42+#else

43+import Unsafe.Coerce (unsafeCoerce)

44+#endif

2245

2346-- | Like 'E.mask', but backported to base before version 4.3.0.

2447--

@@ -28,14 +51,44 @@ import Data.Fixed (Fixed(MkFixed))

2851-- 'withTransactionMode' function calls the restore callback only once, so we

2952-- don't need that polymorphism.

3053mask :: ((IO a -> IO a) -> IO b) -> IO b

54+#if MIN_VERSION_base(4,3,0)

3155mask io = E.mask $ \restore -> io restore

56+#else

57+mask io = do

58+ b <- E.blocked

59+ E.block $ io $ \m -> if b then m else E.unblock m

60+#endif

3261{-# INLINE mask #-}

3362

63+#if !MIN_VERSION_base(4,5,0)

64+infixr 6 <>

65+

66+(<>) :: Monoid m => m -> m -> m

67+(<>) = mappend

68+{-# INLINE (<>) #-}

69+#endif

70+

3471toByteString :: Builder -> ByteString

72+#if MIN_VERSION_bytestring(0,10,0)

3573toByteString x = toStrict (toLazyByteString x)

74+#else

75+toByteString x = B.concat (toChunks (toLazyByteString x))

76+#endif

77+

78+#if MIN_VERSION_base(4,7,0)

3679

3780toPico :: Integer -> Pico

3881toPico = MkFixed

3982

4083fromPico :: Pico -> Integer

4184fromPico (MkFixed i) = i

85+

86+#else

87+

88+toPico :: Integer -> Pico

89+toPico = unsafeCoerce

90+

91+fromPico :: Pico -> Integer

92+fromPico = unsafeCoerce

93+

94+#endif

src/Database/PostgreSQL/Simple/Copy.hs+4

@@ -86,8 +86,12 @@ doCopy funcName conn template q = do

8686 PQ.TuplesOk -> err

8787 PQ.CopyOut -> return ()

8888 PQ.CopyIn -> return ()

89+#if MIN_VERSION_postgresql_libpq(0,9,3)

8990 PQ.CopyBoth -> errMsg "COPY BOTH is not supported"

91+#endif

92+#if MIN_VERSION_postgresql_libpq(0,9,2)

9093 PQ.SingleTuple -> errMsg "single-row mode is not supported"

94+#endif

9195 PQ.BadResponse -> throwResultError funcName result status

9296 PQ.NonfatalError -> throwResultError funcName result status

9397 PQ.FatalError -> throwResultError funcName result status

src/Database/PostgreSQL/Simple/Errors.hs+2−3

@@ -25,6 +25,7 @@ module Database.PostgreSQL.Simple.Errors

2525 )

2626 where

2727

28+import Control.Applicative

2829import Control.Exception as E

2930

3031import Data.Attoparsec.ByteString.Char8

@@ -59,9 +60,7 @@ data ConstraintViolation

5960 deriving (Show, Eq, Ord, Typeable)

6061

6162-- Default instance should be enough

62−instance Exception ConstraintViolation where

63− toException = postgresqlExceptionToException

64− fromException = postgresqlExceptionFromException

63+instance Exception ConstraintViolation

6564

6665

6766-- | Tries to convert 'SqlError' to 'ConstrainViolation', checks sqlState and

src/Database/PostgreSQL/Simple/FromField.hs+5−7

@@ -118,8 +118,10 @@ module Database.PostgreSQL.Simple.FromField

118118

119119import Control.Applicative ( Const(Const), (<|>), (<$>), pure, (*>), (<*) )

120120import Control.Concurrent.MVar (MVar, newMVar)

121−import Control.Exception (Exception (toException, fromException))

121+import Control.Exception (Exception)

122122import qualified Data.Aeson as JSON

123+import qualified Data.Aeson.Internal as JSON

124+import qualified Data.Aeson.Parser as JSON (value')

123125import Data.Attoparsec.ByteString.Char8 hiding (Result)

124126import Data.ByteString (ByteString)

125127import qualified Data.ByteString.Char8 as B

@@ -154,8 +156,6 @@ import qualified Data.UUID.Types as UUID

154156import Data.Scientific (Scientific)

155157import GHC.Real (infinity, notANumber)

156158

157−import qualified Data.Aeson.Types as JSON

158−

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

160160-- value fails.

161161data ResultError = Incompatible { errSQLType :: String

@@ -182,9 +182,7 @@ data ResultError = Incompatible { errSQLType :: String

182182 -- between metadata and actual data in a row).

183183 deriving (Eq, Show, Typeable)

184184

185−instance Exception ResultError where

186− toException = postgresqlExceptionToException

187− fromException = postgresqlExceptionFromException

185+instance Exception ResultError

188186

189187left :: Exception a => a -> Conversion b

190188left = conversionError

@@ -576,7 +574,7 @@ instance FromField UUID where

576574-- | json, jsonb

577575instance FromField JSON.Value where

578576 fromField f mbs = parseBS =<< fromFieldJSONByteString f mbs

579− where parseBS bs = case JSON.eitherDecodeStrict' bs of

577+ where parseBS bs = case parseOnly (JSON.value' <* endOfInput) bs of

580578 Left err -> returnError ConversionFailed f err

581579 Right val -> pure val

582580

src/Database/PostgreSQL/Simple/HStore/Implementation.hs+6

@@ -22,6 +22,9 @@ import Data.ByteString.Builder (Builder, byteString, char8)

2222import qualified Data.ByteString.Builder as BU

2323import Data.ByteString.Internal (c2w, w2c)

2424import qualified Data.ByteString.Lazy as BL

25+#if !MIN_VERSION_bytestring(0,10,0)

26+import qualified Data.ByteString.Lazy.Internal as BL (foldrChunks)

27+#endif

2528import Data.Map(Map)

2629import qualified Data.Map as Map

2730import Data.Text(Text)

@@ -66,6 +69,9 @@ instance Semigroup HStoreBuilder where

6669

6770instance Monoid HStoreBuilder where

6871 mempty = Empty

72+#if !(MIN_VERSION_base(4,11,0))

73+ mappend = (<>)

74+#endif

6975

7076class ToHStoreText a where

7177 toHStoreText :: a -> HStoreText

src/Database/PostgreSQL/Simple/Internal.hs+7−33

@@ -1,8 +1,6 @@

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

22{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}

33{-# LANGUAGE GeneralizedNewtypeDeriving #-}

4−{-# LANGUAGE ExistentialQuantification #-}

5−{-# LANGUAGE InstanceSigs #-}

64

75------------------------------------------------------------------------------

86-- |

@@ -36,6 +34,7 @@ import Data.Int (Int64)

3634import qualified Data.IntMap as IntMap

3735import Data.IORef

3836import Data.Maybe(fromMaybe)

37+import Data.Monoid

3938import Data.String

4039import qualified Data.Text as T

4140import qualified Data.Text.Encoding as TE

@@ -83,25 +82,6 @@ data Connection = Connection {

8382instance Eq Connection where

8483 x == y = connectionHandle x == connectionHandle y

8584

86−-- | Superclass for postgresql exceptions

87−data SomePostgreSqlException = forall e. Exception e => SomePostgreSqlException e

88− deriving Typeable

89−

90−postgresqlExceptionToException :: Exception e => e -> SomeException

91−postgresqlExceptionToException = toException . SomePostgreSqlException

92−

93−postgresqlExceptionFromException :: Exception e => SomeException -> Maybe e

94−postgresqlExceptionFromException x = do

95− SomePostgreSqlException a <- fromException x

96− cast a

97−

98−instance Show SomePostgreSqlException where

99− showsPrec :: Int -> SomePostgreSqlException -> ShowS

100− showsPrec p (SomePostgreSqlException e) = showsPrec p e

101−

102−instance Exception SomePostgreSqlException where

103− displayException (SomePostgreSqlException e) = displayException e

104−

10585data SqlError = SqlError {

10686 sqlState :: ByteString

10787 , sqlExecStatus :: ExecStatus

@@ -113,10 +93,7 @@ data SqlError = SqlError {

11393fatalError :: ByteString -> SqlError

11494fatalError msg = SqlError "" FatalError msg "" ""

11595

116−instance Exception SqlError where

117− toException = postgresqlExceptionToException

118− fromException = postgresqlExceptionFromException

119−

96+instance Exception SqlError

12097

12198-- | Exception thrown if 'query' is used to perform an @INSERT@-like

12299-- operation, or 'execute' is used to perform a @SELECT@-like operation.

@@ -125,9 +102,7 @@ data QueryError = QueryError {

125102 , qeQuery :: Query

126103 } deriving (Eq, Show, Typeable)

127104

128−instance Exception QueryError where

129− toException = postgresqlExceptionToException

130− fromException = postgresqlExceptionFromException

105+instance Exception QueryError

131106

132107-- | Exception thrown if a 'Query' could not be formatted correctly.

133108-- This may occur if the number of \'@?@\' characters in the query

@@ -138,9 +113,7 @@ data FormatError = FormatError {

138113 , fmtParams :: [ByteString]

139114 } deriving (Eq, Show, Typeable)

140115

141−instance Exception FormatError where

142− toException = postgresqlExceptionToException

143− fromException = postgresqlExceptionFromException

116+instance Exception FormatError

144117

145118data ConnectInfo = ConnectInfo {

146119 connectHost :: String

@@ -183,8 +156,6 @@ connect :: ConnectInfo -> IO Connection

183156connect = connectPostgreSQL . postgreSQLConnectionString

184157

185158-- | Memory bracket around 'connect' and 'close'.

186−--

187−-- @since 0.6.5

188159withConnect :: ConnectInfo -> (Connection -> IO c) -> IO c

189160withConnect connInfo = bracket (connect connInfo) close

190161

@@ -517,6 +488,9 @@ instance Alternative Conversion where

517488 Errors _ -> (oka <|>) <$> runConversion mb conn

518489

519490instance Monad Conversion where

491+#if !(MIN_VERSION_base(4,8,0))

492+ return = pure

493+#endif

520494 m >>= f = Conversion $ \conn -> do

521495 oka <- runConversion m conn

522496 case oka of

src/Database/PostgreSQL/Simple/Internal/PQResultUtils.hs+4

@@ -76,8 +76,12 @@ finishQueryWith' q result k = do

7676 PQ.CommandOk -> queryErr "query resulted in a command response (did you mean to use `execute` or forget a RETURNING?)"

7777 PQ.CopyOut -> queryErr "query: COPY TO is not supported"

7878 PQ.CopyIn -> queryErr "query: COPY FROM is not supported"

79+#if MIN_VERSION_postgresql_libpq(0,9,3)

7980 PQ.CopyBoth -> queryErr "query: COPY BOTH is not supported"

81+#endif

82+#if MIN_VERSION_postgresql_libpq(0,9,2)

8083 PQ.SingleTuple -> queryErr "query: single-row mode is not supported"

84+#endif

8185 PQ.BadResponse -> throwResultError "query" result status

8286 PQ.NonfatalError -> throwResultError "query" result status

8387 PQ.FatalError -> throwResultError "query" result status

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

@@ -47,6 +47,8 @@ import GHC.IO.Exception ( ioe_location )

4747

4848#if defined(mingw32_HOST_OS)

4949import Control.Concurrent ( threadDelay )

50+#elif !MIN_VERSION_base(4,7,0)

51+import Control.Concurrent ( threadWaitRead )

5052#else

5153import GHC.Conc ( atomically )

5254import Control.Concurrent ( threadWaitReadSTM )

@@ -92,6 +94,21 @@ getNotification conn = join $ withConnection conn fetch

9294 -- with async exceptions, whereas threadDelay can.

9395 Just _fd -> do

9496 return (threadDelay 1000000 >> loop)

97+#elif !MIN_VERSION_base(4,7,0)

98+ -- Technically there's a race condition that is usually benign.

99+ -- If the connection is closed or reset after we drop the

100+ -- lock, and then the fd index is reallocated to a new

101+ -- descriptor before we call threadWaitRead, then

102+ -- we could end up waiting on the wrong descriptor.

103+ --

104+ -- Now, if the descriptor becomes readable promptly, then

105+ -- it's no big deal as we'll wake up and notice the change

106+ -- on the next iteration of the loop. But if are very

107+ -- unlucky, then we could end up waiting a long time.

108+ Just fd -> do

109+ return $ do

110+ threadWaitRead fd `catch` (throwIO . setIOErrorLocation)

111+ loop

95112#else

96113 -- This case fixes the race condition above. By registering

97114 -- our interest in the descriptor before we drop the lock,

src/Database/PostgreSQL/Simple/Ok.hs+4

@@ -72,6 +72,10 @@ instance MonadPlus Ok where

7272 mplus = (<|>)

7373

7474instance Monad Ok where

75+#if !(MIN_VERSION_base(4,8,0))

76+ return = pure

77+#endif

78+

7579 Errors es >>= _ = Errors es

7680 Ok a >>= f = f a

7781

src/Database/PostgreSQL/Simple/ToField.hs+4

@@ -59,7 +59,11 @@ import qualified Data.Vector as V

5959import qualified Database.PostgreSQL.LibPQ as PQ

6060import Database.PostgreSQL.Simple.Time

6161import Data.Scientific (Scientific)

62+#if MIN_VERSION_scientific(0,3,0)

6263import Data.Text.Lazy.Builder.Scientific (scientificBuilder)

64+#else

65+import Data.Scientific (scientificBuilder)

66+#endif

6367import Foreign.C.Types (CUInt(..))

6468

6569-- | How to render an element when substituting it into a query.

src/Database/PostgreSQL/Simple/Types.hs+7

@@ -50,6 +50,10 @@ import Database.PostgreSQL.Simple.Compat (toByteString)

5050data Null = Null

5151 deriving (Read, Show, Typeable)

5252

53+instance Eq Null where

54+ _ == _ = False

55+ _ /= _ = False

56+

5357-- | A placeholder for the PostgreSQL @DEFAULT@ value.

5458data Default = Default

5559 deriving (Read, Show, Typeable)

@@ -93,6 +97,9 @@ instance Semigroup Query where

9397

9498instance Monoid Query where

9599 mempty = Query B.empty

100+#if !(MIN_VERSION_base(4,11,0))

101+ mappend = (<>)

102+#endif

96103

97104-- | Wrap a list of values for use in an @IN@ clause. Replaces a

98105-- single \"@?@\" character with a parenthesized list of rendered

test/Exception.hsdeleted−70

@@ -1,70 +0,0 @@

1−{-# LANGUAGE CPP #-}

2−{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE ScopedTypeVariables #-}

4−

5−module Exception (testExceptions) where

6−

7−import Database.PostgreSQL.Simple

8−import Test.Tasty.HUnit (Assertion, assertBool)

9−import Common (TestEnv)

10−import Control.Exception (Exception (..), SomeException)

11−import Data.Maybe (isJust)

12−import Data.Either (isLeft)

13−import Control.Exception (throwIO, try)

14−

15−testExceptions :: TestEnv -> Assertion

16−testExceptions _ = do

17− let sqlError = SqlError

18− { sqlState = ""

19− , sqlExecStatus = FatalError

20− , sqlErrorMsg = ""

21− , sqlErrorDetail = ""

22− , sqlErrorHint = ""

23− }

24− let sqlEx :: SomeException = toException sqlError

25− assertBool "SqlError is SomePostgreSqlException" $ isJust (fromException sqlEx :: Maybe SomePostgreSqlException)

26− assertBool "SqlError is SqlError" $ isJust (fromException sqlEx :: Maybe SqlError)

27− eSqlError :: Either SqlError () <- try $ throwIO sqlEx

28− assertBool "Can catch SqlError" $ isLeft eSqlError

29− eSqlPostgreSqlEx :: Either SomePostgreSqlException () <- try $ throwIO sqlEx

30− assertBool "Can catch SomePostgreSqlException from SqlError" $ isLeft eSqlPostgreSqlEx

31−

32− let formatError = FormatError

33− { fmtMessage = ""

34− , fmtQuery = ""

35− , fmtParams = []

36− }

37− let formatEx :: SomeException = toException formatError

38− assertBool "FormatError is SomePostgreSqlException" $ isJust (fromException formatEx :: Maybe SomePostgreSqlException)

39− assertBool "FormatError is FormatError" $ isJust (fromException formatEx :: Maybe FormatError)

40− eFormatError :: Either FormatError () <- try $ throwIO formatEx

41− assertBool "Can catch FormatError" $ isLeft eFormatError

42− eFormatPostreSqlEx :: Either SomePostgreSqlException () <- try $ throwIO formatEx

43− assertBool "Can catch SomePostgreSqlException from FormatError" $ isLeft eFormatPostreSqlEx

44−

45− let queryError = QueryError

46− { qeMessage = ""

47− , qeQuery = ""

48− }

49− let queryEx :: SomeException = toException queryError

50− assertBool "QueryError is SomePostgreSqlException" $ isJust (fromException queryEx :: Maybe SomePostgreSqlException)

51− assertBool "QueryError is QueryError" $ isJust (fromException queryEx :: Maybe QueryError)

52− eQueryError :: Either QueryError () <- try $ throwIO queryEx

53− assertBool "Can catch QueryError" $ isLeft eQueryError

54− eQueryPostgreSqlEx :: Either SomePostgreSqlException () <- try $ throwIO queryEx

55− assertBool "Can catch SomePostgreSqlException from QueryError" $ isLeft eQueryPostgreSqlEx

56−

57− let resultError = Incompatible

58− { errSQLType = ""

59− , errSQLTableOid = Nothing

60− , errSQLField = ""

61− , errHaskellType = ""

62− , errMessage = ""

63− }

64− let resultEx :: SomeException = toException resultError

65− assertBool "ResultError is SomePostgreSqlException" $ isJust (fromException resultEx :: Maybe SomePostgreSqlException)

66− assertBool "ResultError is ResultError" $ isJust (fromException resultEx :: Maybe ResultError)

67− eResultEx :: Either ResultError () <- try $ throwIO resultEx

68− assertBool "Can catch ResultError" $ isLeft eResultEx

69− eResultPostgreSqlEx :: Either SomePostgreSqlException () <- try $ throwIO resultEx

70− assertBool "Can catch SomePostgreSqlException from ResultError" $ isLeft eResultPostgreSqlEx

test/Main.hs−2

@@ -55,7 +55,6 @@ import Notify

5555import Serializable

5656import Time

5757import Interval

58−import Exception (testExceptions)

5958

6059tests :: TestEnv -> TestTree

6160tests env = testGroup "tests"

@@ -85,7 +84,6 @@ tests env = testGroup "tests"

8584 , testCase "2-ary generic" . testGeneric2

8685 , testCase "3-ary generic" . testGeneric3

8786 , testCase "Timeout" . testTimeout

88− , testCase "Exceptions" . testExceptions

8987 ]

9088

9189testBytea :: TestEnv -> TestTree