travis config fixup

Author: zohl

.travis.yml

@@ -1,18 +1,9 @@
 language: c
 
-sudo: false
-
-services:
-  - postgresql
-addons:
-  postgresql: "9.4"
+sudo: required
 
 matrix:
   include:
-    - env: CABALVER=1.18 GHCVER=7.8.4
-      addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
-    - env: CABALVER=1.22 GHCVER=7.10.3
-      addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
     - env: CABALVER=1.24 GHCVER=8.0.1
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
     - env: CABALVER=head GHCVER=head
@@ -23,12 +14,26 @@ matrix:
 
 before_install:
   - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+  - sudo /etc/init.d/postgresql stop
+  - sudo apt-get -y remove --purge postgresql-9.1
+  - sudo apt-get -y remove --purge postgresql-9.2
+  - sudo apt-get -y remove --purge postgresql-9.3
+  - sudo apt-get -y remove --purge postgresql-9.4
+  - sudo apt-get -y autoremove
+  - sudo apt-key adv --keyserver keys.gnupg.net --recv-keys 7FCC7D46ACCC4CF8
+  - sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main 9.5" >> /etc/apt/sources.list.d/postgresql.list'
+  - sudo apt-get update
+  - sudo apt-get -y install postgresql-9.5
+  - sudo sh -c 'echo "local all postgres trust" > /etc/postgresql/9.5/main/pg_hba.conf'
+  - sudo sh -c 'echo -n "host all all 127.0.0.1/32 trust" >> /etc/postgresql/9.5/main/pg_hba.conf'
+  - sudo /etc/init.d/postgresql restart
 
 install:
+  - psql --version
   - cabal --version
   - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
   - travis_retry cabal update
-  - cabal install --only-dependencies --enable-tests
+  - cabal install -v --only-dependencies --enable-tests
 
 before_script:
   - psql -U postgres -c 'create database test_db;'
@@ -44,7 +49,12 @@ script:
   - cabal sdist
   - cabal haddock | grep "100%" | wc -l | grep "5"
 
+branches:
+  only:
+  - master
+
 notifications:
   email:
     recipients:
       - zohl@fmap.me
+

postgresql-simple-bind.cabal

@@ -22,7 +22,7 @@ source-repository head
   location: https://github.com/zohl/postgresql-simple-bind.git
 
 library
-  build-depends: base >= 4.8 && < 5.0
+  build-depends: base >= 4.7 && < 5.0
                , attoparsec >= 0.13.0 && < 0.14
                , bytestring >= 0.10.8 && < 0.11
                , heredoc >= 0.2.0 && < 0.3
@@ -57,7 +57,7 @@ test-suite tests
 
   ghc-options: -Wall
 
-  build-depends: base >= 4.8 && < 5.0
+  build-depends: base >= 4.7 && < 5.0
                , bytestring >= 0.10.8 && < 0.11
                , HUnit
                , postgresql-simple >= 0.5.2 && < 0.6
@@ -80,7 +80,7 @@ test-suite examples
 
   ghc-options: -Wall
 
-  build-depends: base >= 4.8 && < 5.0
+  build-depends: base >= 4.7 && < 5.0
                , attoparsec >= 0.13.0 && < 0.14
                , bytestring >= 0.10.8 && < 0.11
                , case-conversion

src/Database/PostgreSQL/Simple/Bind/Implementation.hs

@@ -61,7 +61,7 @@ instance ToField Argument where
 
 formatArgument :: Argument -> String
 formatArgument (MandatoryArg _name _) = "?"
-formatArgument (OptionalArg name (Just _)) = name ++ " => ?"
+formatArgument (OptionalArg name (Just _)) = name ++ " := ?"
 formatArgument (OptionalArg _ Nothing) = error "TODO"