[PATCH 1/3] travis: test against postgresql 10

[Daniel Black]

Signed-off-by: Daniel Black <daniel at linux.ibm.com>
---
 .travis.yml | 45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6cb983f..d61b255 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,14 +23,55 @@ env:
   global:
     - PW_TEST_DB_PASS=""
 
+matrix:
+  include:
+    - addons:
+        postgresql: "10"
+        apt:
+          packages:
+          - postgresql-10
+          - postgresql-client-10
+      env:
+        - PGPORT=5433
+        - PW_TEST_DB_PORT=5433
+        - PW_TEST_DB_TYPE=postgres
+        - PW_TEST_DB_USER=travis
+        - PW_TEST_DB_PASS=""
+      python: 3.6
+      sudo: true
+      before_install:
+        - sudo -u postgres psql -c "grant ALL on DATABASE postgres to travis WITH GRANT OPTION;"
+    - env:
+        - PGPORT=5432
+        - PW_TEST_DB_PORT=5432
+        - PW_TEST_DB_TYPE=postgres
+        - PW_TEST_DB_USER=travis
+        - PW_TEST_DB_PASS=""
+      python: 3.6
+      addons:
+        postgresql: "9.6"
+        apt:
+          packages:
+          - postgresql-9.6
+          - postgresql-client-9.6
+
+
 before_script:
-  - mysql -e 'create database patchwork character set utf8;'
-  - psql -c "create database patchwork with ENCODING = 'UTF8';" -U postgres
+  - if [[ $PW_TEST_DB_TYPE == mysql ]]; then mysql -e 'create database patchwork character set utf8;'; fi
+  - if [[ $PW_TEST_DB_TYPE == postgres ]]; then psql -c "create database patchwork with ENCODING = 'UTF8';" -U $PW_TEST_DB_USER; fi
 
 install:
   - pip install tox-travis
 
 script:
+  - >
+    if [[ $PW_TEST_DB_TYPE == mysql ]];
+    then
+      mysql -e 'SELECT VERSION(), CURRENT_USER();' -u $PW_TEST_DB_USER patchwork;
+    else
+      psql -c "SELECT VERSION(), CURRENT_USER, current_database()" -U $PW_TEST_DB_USER patchwork;
+      psql -c "SELECT VERSION(), CURRENT_USER, current_database()" -U $PW_TEST_DB_USER postgres;
+    fi
   - tox
   - tox -e coverage
 
-- 
2.17.1