2c2463a..master · typeable/postgresql-simple

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

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

88#

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

1010#

11−# version: 0.15.20221009

11+# version: 0.17.20231110

1212#

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

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

1414#

1515name: Haskell-CI

1616on:

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

3838 strategy:

3939 matrix:

4040 include:

41− - compiler: ghc-9.4.2

41+ - compiler: ghc-9.8.1

4242 compilerKind: ghc

43− compilerVersion: 9.4.2

43+ compilerVersion: 9.8.1

4444 setup-method: ghcup

4545 allow-failure: false

46− - compiler: ghc-9.2.4

46+ - compiler: ghc-9.6.3

4747 compilerKind: ghc

48− compilerVersion: 9.2.4

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

4959 setup-method: ghcup

5060 allow-failure: false

5161 - compiler: ghc-9.0.2

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

6878 compilerVersion: 8.6.5

6979 setup-method: hvr-ppa

7080 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

10181 fail-fast: false

10282 steps:

10383 - name: apt

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

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

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

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

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

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

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

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

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

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

11393 else

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

11595 apt-get update

11696 apt-get install -y "$HCNAME"

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

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

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

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

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

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

121101 fi

122102 env:

123103 HCKIND: ${{ matrix.compilerKind }}

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

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

132112 HCDIR=/opt/$HCKIND/$HCVER

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

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

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#')

135117 echo "HC=$HC" >> "$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"

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"

139121 else

140122 HC=$HCDIR/bin/$HCKIND

141123 echo "HC=$HC" >> "$GITHUB_ENV"

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

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

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

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

145127 fi

146128

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

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

193175 - name: install cabal-plan

194176 run: |

195177 mkdir -p $HOME/.cabal/bin

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 -

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 -

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

199181 rm -f cabal-plan.xz

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

201183 cabal-plan --version

202184 - name: checkout

203− uses: actions/checkout@v2

185+ uses: actions/checkout@v3

204186 with:

205187 path: source

206188 - name: initial cabal.project for sdist

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

224206 touch cabal.project

225207 touch cabal.project.local

226208 echo "packages: ${PKGDIR_postgresql_simple}" >> 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

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

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

229211 cat >> cabal.project <<EOF

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

231213 EOF

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

236218 run: |

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

238220 cabal-plan

239− - name: cache

240− uses: actions/cache@v2

221+ - name: restore cache

222+ uses: actions/cache/restore@v3

241223 with:

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

243225 path: ~/.cabal/store

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

261243 ${CABAL} -vnormal check

262244 - name: haddock

263245 run: |

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

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

265247 - name: unconstrained build

266248 run: |

267249 rm -f cabal.project.local

268250 $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.2']

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

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@v1

29+ uses: haskell/actions/setup@v2

3030 with:

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

32− cabal-version: '3.8.1.0'

32+ cabal-version: '3.10.2.0'

3333

3434 - name: Set up PostgreSQL

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

CHANGES.md+18

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

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+

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

220

321 * Add foldCopyData helper function

postgresql-simple.cabal+24−47

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

11cabal-version: 1.12

22name: postgresql-simple

3−version: 0.6.4

4−x-revision: 9

3+version: 0.7.0.0

4+x-revision: 1

55synopsis: Mid-Level PostgreSQL client library

66description:

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

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

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

2525

2626tested-with:

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

27+ GHC ==8.6.5

3428 || ==8.8.4

3529 || ==8.10.7

3630 || ==9.0.2

37− || ==9.2.4

38− || ==9.4.2

31+ || ==9.2.8

32+ || ==9.4.8

33+ || ==9.6.3

34+ || ==9.8.1

3935

4036library

4137 default-language: Haskell2010

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

8177

8278 -- GHC bundled libs

8379 build-depends:

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

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

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

90− , transformers >=0.3.0.0 && <0.7

86+ , transformers >=0.5.6.2 && <0.7

9187

9288 -- Other dependencies

9389 build-depends:

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

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

11299

113100 default-extensions:

114101 BangPatterns

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

123110 type: git

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

125112

126−source-repository this

127− type: git

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

129− tag: v0.6.3

130−

131113test-suite inspection

132− if !impl(ghc >=8.0)

133− buildable: False

134−

135114 default-language: Haskell2010

136115 type: exitcode-stdio-1.0

137116 hs-source-dirs: test

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

151130 main-is: Main.hs

152131 other-modules:

153132 Common

133+ Exception

134+ Interval

154135 Notify

155136 Serializable

156137 Time

157− Interval

158138

159139 ghc-options: -threaded

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

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

184164 , time-compat

185165 , vector

186166

187− if !impl(ghc >=7.6)

188− build-depends: ghc-prim

189−

190167benchmark select

191168 default-language: Haskell2010

192169 type: exitcode-stdio-1.0

src/Database/PostgreSQL/Simple.hs+1

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

6464 , Only(..)

6565 , (:.)(..)

6666 -- ** Exceptions

67+ , SomePostgreSqlException(..)

6768 , SqlError(..)

6869 , PQ.ExecStatus(..)

6970 , FormatError(..)

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

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

1212 ) where

1313

1414import qualified Control.Exception as E

15−import Data.Monoid

1615import Data.ByteString (ByteString)

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

1816import Data.ByteString.Lazy (toStrict)

19−#else

20−import qualified Data.ByteString as B

21−import Data.ByteString.Lazy (toChunks)

22−#endif

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

24−

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

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

27−#else

28−import Data.Scientific (scientificBuilder)

29−#endif

30−

31−#if __GLASGOW_HASKELL__ >= 702

3219import System.IO.Unsafe (unsafeDupablePerformIO)

33−#elif __GLASGOW_HASKELL__ >= 611

34−import GHC.IO (unsafeDupablePerformIO)

35−#else

36−import GHC.IOBase (unsafeDupablePerformIO)

37−#endif

38−

3920import Data.Fixed (Pico)

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

4121import Data.Fixed (Fixed(MkFixed))

42−#else

43−import Unsafe.Coerce (unsafeCoerce)

44−#endif

4522

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

4724--

@@ -51,44 +28,14 @@ import Unsafe.Coerce (unsafeCoerce)

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

5229-- don't need that polymorphism.

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

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

5531mask 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

6132{-# INLINE mask #-}

6233

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−

7134toByteString :: Builder -> ByteString

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

7335toByteString 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)

7936

8037toPico :: Integer -> Pico

8138toPico = MkFixed

8239

8340fromPico :: Pico -> Integer

8441fromPico (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,12 +86,8 @@ 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)

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

91−#endif

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

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

94−#endif

9591 PQ.BadResponse -> throwResultError funcName result status

9692 PQ.NonfatalError -> throwResultError funcName result status

9793 PQ.FatalError -> throwResultError funcName result status

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

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

2525 )

2626 where

2727

28−import Control.Applicative

2928import Control.Exception as E

3029

3130import Data.Attoparsec.ByteString.Char8

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

6059 deriving (Show, Eq, Ord, Typeable)

6160

6261-- Default instance should be enough

63−instance Exception ConstraintViolation

62+instance Exception ConstraintViolation where

63+ toException = postgresqlExceptionToException

64+ fromException = postgresqlExceptionFromException

6465

6566

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

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

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

118118

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

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

121−import Control.Exception (Exception)

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

122122import qualified Data.Aeson as JSON

123−import qualified Data.Aeson.Internal as JSON

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

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

126124import Data.ByteString (ByteString)

127125import qualified Data.ByteString.Char8 as B

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

156154import Data.Scientific (Scientific)

157155import GHC.Real (infinity, notANumber)

158156

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,7 +182,9 @@ data ResultError = Incompatible { errSQLType :: String

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

183183 deriving (Eq, Show, Typeable)

184184

185−instance Exception ResultError

185+instance Exception ResultError where

186+ toException = postgresqlExceptionToException

187+ fromException = postgresqlExceptionFromException

186188

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

188190left = conversionError

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

574576-- | json, jsonb

575577instance FromField JSON.Value where

576578 fromField f mbs = parseBS =<< fromFieldJSONByteString f mbs

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

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

578580 Left err -> returnError ConversionFailed f err

579581 Right val -> pure val

580582

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

@@ -22,9 +22,6 @@ 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

2825import Data.Map(Map)

2926import qualified Data.Map as Map

3027import Data.Text(Text)

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

6966

7067instance Monoid HStoreBuilder where

7168 mempty = Empty

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

73− mappend = (<>)

74−#endif

7569

7670class ToHStoreText a where

7771 toHStoreText :: a -> HStoreText

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

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

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

22{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}

33{-# LANGUAGE GeneralizedNewtypeDeriving #-}

4+{-# LANGUAGE ExistentialQuantification #-}

5+{-# LANGUAGE InstanceSigs #-}

46

57------------------------------------------------------------------------------

68-- |

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

3436import qualified Data.IntMap as IntMap

3537import Data.IORef

3638import Data.Maybe(fromMaybe)

37−import Data.Monoid

3839import Data.String

3940import qualified Data.Text as T

4041import qualified Data.Text.Encoding as TE

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

8283instance Eq Connection where

8384 x == y = connectionHandle x == connectionHandle y

8485

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+

85105data SqlError = SqlError {

86106 sqlState :: ByteString

87107 , sqlExecStatus :: ExecStatus

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

93113fatalError :: ByteString -> SqlError

94114fatalError msg = SqlError "" FatalError msg "" ""

95115

96−instance Exception SqlError

116+instance Exception SqlError where

117+ toException = postgresqlExceptionToException

118+ fromException = postgresqlExceptionFromException

119+

97120

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

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

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

102125 , qeQuery :: Query

103126 } deriving (Eq, Show, Typeable)

104127

105−instance Exception QueryError

128+instance Exception QueryError where

129+ toException = postgresqlExceptionToException

130+ fromException = postgresqlExceptionFromException

106131

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

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

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

113138 , fmtParams :: [ByteString]

114139 } deriving (Eq, Show, Typeable)

115140

116−instance Exception FormatError

141+instance Exception FormatError where

142+ toException = postgresqlExceptionToException

143+ fromException = postgresqlExceptionFromException

117144

118145data ConnectInfo = ConnectInfo {

119146 connectHost :: String

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

156183connect = connectPostgreSQL . postgreSQLConnectionString

157184

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

186+--

187+-- @since 0.6.5

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

160189withConnect connInfo = bracket (connect connInfo) close

161190

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

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

489518

490519instance Monad Conversion where

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

492− return = pure

493−#endif

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

495521 oka <- runConversion m conn

496522 case oka of

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

@@ -76,12 +76,8 @@ 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)

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

81−#endif

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

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

84−#endif

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

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

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

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

@@ -47,8 +47,6 @@ 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 )

5250#else

5351import GHC.Conc ( atomically )

5452import Control.Concurrent ( threadWaitReadSTM )

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

9492 -- with async exceptions, whereas threadDelay can.

9593 Just _fd -> do

9694 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

11295#else

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

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

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

@@ -72,10 +72,6 @@ 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−

7975 Errors es >>= _ = Errors es

8076 Ok a >>= f = f a

8177

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

@@ -59,11 +59,7 @@ 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)

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

64−#else

65−import Data.Scientific (scientificBuilder)

66−#endif

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

6864

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

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

@@ -50,10 +50,6 @@ 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−

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

5854data Default = Default

5955 deriving (Read, Show, Typeable)

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

9793

9894instance Monoid Query where

9995 mempty = Query B.empty

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

101− mappend = (<>)

102−#endif

10396

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

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

test/Exception.hsnew file+70

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

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,6 +55,7 @@ import Notify

5555import Serializable

5656import Time

5757import Interval

58+import Exception (testExceptions)

5859

5960tests :: TestEnv -> TestTree

6061tests env = testGroup "tests"

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

8485 , testCase "2-ary generic" . testGeneric2

8586 , testCase "3-ary generic" . testGeneric3

8687 , testCase "Timeout" . testTimeout

88+ , testCase "Exceptions" . testExceptions

8789 ]

8890

8991testBytea :: TestEnv -> TestTree