e4819c6 · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

Merge pull request #129 from zalora/travis

Make sure that tests run without further setup + add travis-ci config

commite4819c6174fbd24b955acdf290fd9cbdb092ef88 authorLeon P Smith <leon.p.smith+github@gmail.com> dateMon 24 Nov 2014, 18:03 (12 years ago) parent73f97b5 f57d872

6 files changed+27−5

compare with master

unifiedsplit

.ghci+16−2 .travis.yml+7 src/Database/PostgreSQL/Simple/Arrays.hs+1−1 src/Database/PostgreSQL/Simple/Errors.hs+1−1 src/Database/PostgreSQL/Simple/Time/Implementation.hs+1−1 test/Main.hs+1

.ghci+16−2

@@ -1,2 +1,16 @@

1−:set -isrc

2−:set Wall

1+:set -isrc -itest -optP-includedist/build/autogen/cabal_macros.h

2+:set -Wall -fno-warn-name-shadowing

4+:set -XDoAndIfThenElse

5+:set -XOverloadedStrings

6+:set -XBangPatterns

7+:set -XViewPatterns

8+:set -XTypeOperators

10+-- for tests

11+:set -XNamedFieldPuns

12+:set -XRank2Types

13+:set -XRecordWildCards

14+:set -XPatternGuards

15+:set -XScopedTypeVariables

16+:set -fno-warn-unused-do-bind

.travis.ymlnew file+7

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

1+language: haskell

3+addons:

4+ postgresql: "9.3"

6+before_install:

7+ - createdb `whoami`

src/Database/PostgreSQL/Simple/Arrays.hs+1−1

@@ -17,7 +17,7 @@ import Control.Applicative (Applicative(..), Alternative(..), (<$>))

1717import Data.ByteString.Char8 (ByteString)

1818import qualified Data.ByteString.Char8 as B

1919import Data.Monoid

20−import Data.Attoparsec.Char8

20+import Data.Attoparsec.ByteString.Char8

2121

2222

2323-- | Parse one of three primitive field formats: array, quoted and plain.

src/Database/PostgreSQL/Simple/Errors.hs+1−1

@@ -28,7 +28,7 @@ module Database.PostgreSQL.Simple.Errors

2828import Control.Applicative

2929import Control.Exception as E

3030

31−import Data.Attoparsec.Char8

31+import Data.Attoparsec.ByteString.Char8

3232import Data.ByteString (ByteString)

3333import Data.Typeable

3434

src/Database/PostgreSQL/Simple/Time/Implementation.hs+1−1

@@ -25,7 +25,7 @@ import Data.ByteString.Internal (c2w, w2c)

2525import Data.Time hiding (getTimeZone, getZonedTime)

2626import Data.Typeable

2727import Data.Word(Word8)

28−import qualified Data.Attoparsec.Char8 as A

28+import qualified Data.Attoparsec.ByteString.Char8 as A

2929import Data.Monoid(Monoid(..))

3030import Data.Fixed (Pico)

3131import Unsafe.Coerce

test/Main.hs+1

@@ -167,6 +167,7 @@ testArray TestEnv{..} = TestCase $ do

167167

168168testHStore :: TestEnv -> Test

169169testHStore TestEnv{..} = TestCase $ do

170+ execute_ conn "CREATE EXTENSION IF NOT EXISTS hstore"

170171 roundTrip []

171172 roundTrip [("foo","bar"),("bar","baz"),("baz","hello")]

172173 roundTrip [("fo\"o","bar"),("b\\ar","baz"),("baz","\"value\\with\"escapes")]