16bbb6b · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

on master help sign in

Allow base-4.14 and th-2.16

16bbb6bOleg Grenrus7 years ago

.travis.yml+39−42

compare with master

unifiedsplit

@@ -4,9 +4,11 @@

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

7−# version: 0.5.20190916

7+# version: 0.9.20200326

9+version: ~> 1.0

9language: c

10language: c

11+os: linux

10dist: xenial

12dist: xenial

11git:

13git:

12 # whether to recursively clone submodules

14 # whether to recursively clone submodules

@@ -22,6 +24,7 @@ cache:

22 directories:

24 directories:

23 - $HOME/.cabal/packages

25 - $HOME/.cabal/packages

24 - $HOME/.cabal/store

26 - $HOME/.cabal/store

27+ - $HOME/.hlint

25before_cache:

28before_cache:

26 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log

29 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log

27 # remove files that are regenerated by 'cabal update'

30 # remove files that are regenerated by 'cabal update'

@@ -31,24 +34,32 @@ before_cache:

31 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar

34 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar

32 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx

35 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx

33 - rm -rfv $CABALHOME/packages/head.hackage

36 - rm -rfv $CABALHOME/packages/head.hackage

34−matrix:

37+jobs:

35 include:

38 include:

36 - compiler: ghc-8.8.1

39 - compiler: ghc-8.8.1

37− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}

40+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}}

41+ os: linux

38 - compiler: ghc-8.6.5

42 - compiler: ghc-8.6.5

39− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}

43+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}

44+ os: linux

40 - compiler: ghc-8.4.4

45 - compiler: ghc-8.4.4

41− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}

46+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}}

47+ os: linux

42 - compiler: ghc-8.2.2

48 - compiler: ghc-8.2.2

43− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}

49+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}}

50+ os: linux

44 - compiler: ghc-8.0.2

51 - compiler: ghc-8.0.2

45− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}

52+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}}

53+ os: linux

46 - compiler: ghc-7.10.3

54 - compiler: ghc-7.10.3

47− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-3.0"]}}

55+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.10.3","cabal-install-3.0"]}}

56+ os: linux

48 - compiler: ghc-7.8.4

57 - compiler: ghc-7.8.4

49− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-3.0"]}}

58+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.0"]}}

59+ os: linux

50 - compiler: ghc-7.6.3

60 - compiler: ghc-7.6.3

51− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-3.0"]}}

61+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.6.3","cabal-install-3.0"]}}

62+ os: linux

52before_install:

63before_install:

53 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')

64 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')

54 - WITHCOMPILER="-w $HC"

65 - WITHCOMPILER="-w $HC"

@@ -61,29 +72,8 @@ before_install:

61 - TOP=$(pwd)

72 - TOP=$(pwd)

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

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

63 - echo $HCNUMVER

74 - echo $HCNUMVER

64− - CABAL="$CABAL -vnormal+nowrap+markoutput"

75+ - CABAL="$CABAL -vnormal+nowrap"

65 - set -o pipefail

76 - set -o pipefail

66− - |

67− echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk

68− echo 'BEGIN { state = "output"; }' >> .colorful.awk

69− echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk

70− echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk

71− echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk

72− echo ' if (state == "cabal") {' >> .colorful.awk

73− echo ' print blue($0)' >> .colorful.awk

74− echo ' } else {' >> .colorful.awk

75− echo ' print $0' >> .colorful.awk

76− echo ' }' >> .colorful.awk

77− echo '}' >> .colorful.awk

78− - cat .colorful.awk

79− - |

80− color_cabal_output () {

81− awk -f $TOP/.colorful.awk

82− }

83− - echo text | color_cabal_output

84−install:

85− - ${CABAL} --version

86− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

87 - TEST=--enable-tests

77 - TEST=--enable-tests

88 - BENCH=--enable-benchmarks

78 - BENCH=--enable-benchmarks

89 - HEADHACKAGE=false

79 - HEADHACKAGE=false

@@ -104,6 +94,9 @@ install:

104 echo " prefix: $CABALHOME" >> $CABALHOME/config

94 echo " prefix: $CABALHOME" >> $CABALHOME/config

105 echo "repository hackage.haskell.org" >> $CABALHOME/config

95 echo "repository hackage.haskell.org" >> $CABALHOME/config

106 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config

96 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config

97+install:

98+ - ${CABAL} --version

99+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

107 - |

100 - |

108 echo "program-default-options" >> $CABALHOME/config

101 echo "program-default-options" >> $CABALHOME/config

109 echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config

102 echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config

@@ -115,20 +108,22 @@ install:

115 - touch cabal.project

108 - touch cabal.project

116 - |

109 - |

117 echo "packages: ." >> cabal.project

110 echo "packages: ." >> cabal.project

111+ - if [ $HCNUMVER -ge 80000 ] ; then echo 'package postgresql-simple' >> cabal.project ; fi

112+ - "if [ $HCNUMVER -ge 80000 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"

118 - |

113 - |

119 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(postgresql-simple)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

114 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(postgresql-simple)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

120 - cat cabal.project || true

115 - cat cabal.project || true

121 - cat cabal.project.local || true

116 - cat cabal.project.local || true

122 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi

117 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi

123− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output

118+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}

124 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"

119 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"

125 - rm cabal.project.freeze

120 - rm cabal.project.freeze

126− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output

121+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all

127− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output

122+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all

128script:

123script:

129 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

124 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

130 # Packaging...

125 # Packaging...

131− - ${CABAL} v2-sdist all | color_cabal_output

126+ - ${CABAL} v2-sdist all

132 # Unpacking...

127 # Unpacking...

133 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/

128 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/

134 - cd ${DISTDIR} || false

129 - cd ${DISTDIR} || false

@@ -140,25 +135,27 @@ script:

140 - touch cabal.project

135 - touch cabal.project

141 - |

136 - |

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

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

138+ - if [ $HCNUMVER -ge 80000 ] ; then echo 'package postgresql-simple' >> cabal.project ; fi

139+ - "if [ $HCNUMVER -ge 80000 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"

143 - |

140 - |

144 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(postgresql-simple)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

141 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(postgresql-simple)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

145 - cat cabal.project || true

142 - cat cabal.project || true

146 - cat cabal.project.local || true

143 - cat cabal.project.local || true

147 # Building...

144 # Building...

148 # this builds all libraries and executables (without tests/benchmarks)

145 # this builds all libraries and executables (without tests/benchmarks)

149− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output

146+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

150 # Building with tests and benchmarks...

147 # Building with tests and benchmarks...

151 # build & run tests, build benchmarks

148 # build & run tests, build benchmarks

152− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output

149+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all

153 # Testing...

150 # Testing...

154− - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output

151+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all

155 # cabal check...

152 # cabal check...

156 - (cd ${PKGDIR_postgresql_simple} && ${CABAL} -vnormal check)

153 - (cd ${PKGDIR_postgresql_simple} && ${CABAL} -vnormal check)

157 # haddock...

154 # haddock...

158− - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output

155+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all

159 # Building without installed constraints for packages in global-db...

156 # Building without installed constraints for packages in global-db...

160 - rm -f cabal.project.local

157 - rm -f cabal.project.local

161− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output

158+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

162

159

163−# REGENDATA ["--config","cabal.haskell-ci","--output",".travis.yml","postgresql-simple.cabal"]

160+# REGENDATA ("0.9.20200326",["--config","cabal.haskell-ci","--output",".travis.yml","postgresql-simple.cabal"])

164# EOF

161# EOF

CONTRIBUTING.md+1

@@ -7,6 +7,7 @@ Patches welcome!

7 - Regenerate `.travis.yml` with `haskell-ci regenerate` (get the latest from [GitHub haskell-ci/haskell-ci](https://github.com/haskell-ci/haskell-ci))

9- Don't edit `CHANGELOG.md`, rather include a copyable entry in your pull request description. I often process pull requests in bulk, and everyone editing the `CHANGELOG.md` causes unnecessary conflicts.

10+- For the same reason, do not edit `version` or `x-revision`

11- I use [`stylish-haskell`](https://github.com/jaspervdj/stylish-haskell) to format imports. I encourage you to use it too, when contributing.

12- I use [`stylish-haskell`](https://github.com/jaspervdj/stylish-haskell) to format imports. I encourage you to use it too, when contributing.

12- General code style is 4 spaces, just look around how it looks, it's not so strict.

13- General code style is 4 spaces, just look around how it looks, it's not so strict.

postgresql-simple.cabal+10−9

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

1cabal-version: 1.12

2name: postgresql-simple

3version: 0.6.2

4−x-revision: 2

4+x-revision: 3

5synopsis: Mid-Level PostgreSQL client library

6description:

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

@@ -41,13 +41,11 @@ library

41 Database.PostgreSQL.Simple.Arrays

42 Database.PostgreSQL.Simple.Copy

43 Database.PostgreSQL.Simple.Cursor

44− Database.PostgreSQL.Simple.Errors

45 Database.PostgreSQL.Simple.FromField

44 Database.PostgreSQL.Simple.FromField

46 Database.PostgreSQL.Simple.FromRow

45 Database.PostgreSQL.Simple.FromRow

46+ Database.PostgreSQL.Simple.LargeObjects

47 Database.PostgreSQL.Simple.HStore

48 Database.PostgreSQL.Simple.HStore.Internal

49− Database.PostgreSQL.Simple.Internal

50− Database.PostgreSQL.Simple.LargeObjects

51 Database.PostgreSQL.Simple.Notification

49 Database.PostgreSQL.Simple.Notification

52 Database.PostgreSQL.Simple.Ok

50 Database.PostgreSQL.Simple.Ok

53 Database.PostgreSQL.Simple.Range

51 Database.PostgreSQL.Simple.Range

@@ -61,9 +59,12 @@ library

61 Database.PostgreSQL.Simple.TypeInfo.Macro

59 Database.PostgreSQL.Simple.TypeInfo.Macro

62 Database.PostgreSQL.Simple.TypeInfo.Static

60 Database.PostgreSQL.Simple.TypeInfo.Static

63 Database.PostgreSQL.Simple.Types

61 Database.PostgreSQL.Simple.Types

62+ Database.PostgreSQL.Simple.Errors

64 Database.PostgreSQL.Simple.Vector

63 Database.PostgreSQL.Simple.Vector

65 Database.PostgreSQL.Simple.Vector.Unboxed

64 Database.PostgreSQL.Simple.Vector.Unboxed

66+ Database.PostgreSQL.Simple.Internal

67+

67 -- Other-modules:

68 -- Other-modules:

68 other-modules:

69 other-modules:

69 Database.PostgreSQL.Simple.Compat

70 Database.PostgreSQL.Simple.Compat

@@ -76,10 +77,10 @@ library

77 -- GHC bundled libs

78 -- GHC bundled libs

78 build-depends:

79 build-depends:

79− base >=4.6.0.0 && <4.14

80+ base >=4.6.0.0 && <4.15

80 , bytestring >=0.10.0.0 && <0.11

81 , bytestring >=0.10.0.0 && <0.11

81 , containers >=0.5.0.0 && <0.7

82 , containers >=0.5.0.0 && <0.7

82− , template-haskell >=2.8.0.0 && <2.16

83+ , template-haskell >=2.8.0.0 && <2.17

83 , text >=1.2.3.0 && <1.3

84 , text >=1.2.3.0 && <1.3

84 , time >=1.4.0.1 && <1.10

85 , time >=1.4.0.1 && <1.10

85 , transformers >=0.3.0.0 && <0.6

86 , transformers >=0.3.0.0 && <0.6

@@ -106,11 +107,11 @@ library

106 build-depends: ghc-prim

107 build-depends: ghc-prim

107

108

108 default-extensions:

109 default-extensions:

109− BangPatterns

110 DoAndIfThenElse

111 OverloadedStrings

112− TypeOperators

112+ BangPatterns

113 ViewPatterns

114+ TypeOperators

114

115

115 ghc-options: -Wall -fno-warn-name-shadowing

116 ghc-options: -Wall -fno-warn-name-shadowing

116

117

@@ -154,9 +155,9 @@ test-suite test

154 default-extensions:

155 default-extensions:

155 NamedFieldPuns

156 NamedFieldPuns

156 OverloadedStrings

157 OverloadedStrings

157− PatternGuards

158 Rank2Types

159 RecordWildCards

160+ PatternGuards

160 ScopedTypeVariables

161 ScopedTypeVariables

161

162

162 build-depends:

163 build-depends: