From 95f3c3dba6dcfa3c63a0436e5d952dcf0e458b07 Mon Sep 17 00:00:00 2001
From: mattjegan <matthewj.egan@hotmail.com>
Date: Thu, 6 Oct 2016 20:38:34 +1100
Subject: [PATCH 1/5] Added db backends to travis.yml and altered settings to
 match

---
 .travis.yml                 | 28 ++++++++++++++++++++++++----
 project/project/settings.py |  6 ++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f3f93f98..5f073f21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,23 @@ python:
     - "3.4"
     - "3.5"
 env:
-    - DJANGO="Django>=1.7.0,<1.8.0"
-    - DJANGO="Django>=1.8.0,<1.9.0"
-    - DJANGO="Django>=1.9.0,<1.10.0"
-    - DJANGO="Django>=1.10b1,<1.11.0"
+    # PostgreSQL
+    - DJANGO="Django>=1.7.0,<1.8.0"   DB=postgresql DB_NAME=travis_ci_test
+    - DJANGO="Django>=1.8.0,<1.9.0"   DB=postgresql DB_NAME=travis_ci_test
+    - DJANGO="Django>=1.9.0,<1.10.0"  DB=postgresql DB_NAME=travis_ci_test
+    - DJANGO="Django>=1.10b1,<1.11.0" DB=postgresql DB_NAME=travis_ci_test
+
+    # SQLite3
+    - DJANGO="Django>=1.7.0,<1.8.0"   DB=sqlite3 DB_NAME=db.sqlite3
+    - DJANGO="Django>=1.8.0,<1.9.0"   DB=sqlite3 DB_NAME=db.sqlite3
+    - DJANGO="Django>=1.9.0,<1.10.0"  DB=sqlite3 DB_NAME=db.sqlite3
+    - DJANGO="Django>=1.10b1,<1.11.0" DB=sqlite3 DB_NAME=db.sqlite3
+
+    # MySQL
+    - DJANGO="Django>=1.7.0,<1.8.0"   DB=mysql DB_NAME=mysql_db
+    - DJANGO="Django>=1.8.0,<1.9.0"   DB=mysql DB_NAME=mysql_db
+    - DJANGO="Django>=1.9.0,<1.10.0"  DB=mysql DB_NAME=mysql_db
+    - DJANGO="Django>=1.10b1,<1.11.0" DB=mysql DB_NAME=mysql_db
 
 matrix:
   allow_failures:
@@ -24,6 +37,13 @@ matrix:
 install:
     - pip install -q $DJANGO
     - pip install -r requirements.txt
+    
+    # Handle PostgreSQL
+    - if [[ "$DB" = "postgresql" ]]; then pip install psycopg2; fi
+    - if [[ "$DB" = "postgresql" ]]; then psql -c 'create database travis_ci_test;' -U postgres; fi
+
+    # Handle MySQL
+    - if [[ "$DB" = "mysql" ]]; then mysql -e 'create database mysql_db;'; fi
 
 script:
     - cd project
diff --git a/project/project/settings.py b/project/project/settings.py
index a775d902..f652c185 100644
--- a/project/project/settings.py
+++ b/project/project/settings.py
@@ -34,12 +34,10 @@
 
 WSGI_APPLICATION = 'wsgi.application'
 
-DB_NAME = os.path.join(BASE_DIR, 'db.sqlite3')
-
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': DB_NAME
+        'ENGINE': 'django.db.backends.' + os.environ['DB'],
+        'NAME': os.environ['DB_NAME']
     }
 }
 

From ebdc793d8787c3f543a712bfa3c6ecc10c87bfeb Mon Sep 17 00:00:00 2001
From: mattjegan <matthewj.egan@hotmail.com>
Date: Thu, 6 Oct 2016 20:42:58 +1100
Subject: [PATCH 2/5] Fixed settings for postgres tests

---
 project/project/settings.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/project/project/settings.py b/project/project/settings.py
index f652c185..d15976cd 100644
--- a/project/project/settings.py
+++ b/project/project/settings.py
@@ -34,9 +34,13 @@
 
 WSGI_APPLICATION = 'wsgi.application'
 
+DB = os.environ['DB']
+if DB == 'postgres':
+    DB = 'postgresql_psycopg2'
+
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.' + os.environ['DB'],
+        'ENGINE': 'django.db.backends.' + DB,
         'NAME': os.environ['DB_NAME']
     }
 }

From e857cd546bbde99effc7970159a97032cfdbbc91 Mon Sep 17 00:00:00 2001
From: mattjegan <matthewj.egan@hotmail.com>
Date: Thu, 6 Oct 2016 20:51:34 +1100
Subject: [PATCH 3/5] Spelling mistake

---
 project/project/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/project/settings.py b/project/project/settings.py
index d15976cd..d329fd3f 100644
--- a/project/project/settings.py
+++ b/project/project/settings.py
@@ -35,7 +35,7 @@
 WSGI_APPLICATION = 'wsgi.application'
 
 DB = os.environ['DB']
-if DB == 'postgres':
+if DB == 'postgresql':
     DB = 'postgresql_psycopg2'
 
 DATABASES = {

From c48f35e54521839daf2ba39dc1cba381f61f0c64 Mon Sep 17 00:00:00 2001
From: mattjegan <matthewj.egan@hotmail.com>
Date: Thu, 6 Oct 2016 20:58:11 +1100
Subject: [PATCH 4/5] Added mysql dep in travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 5f073f21..93d0c2ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,7 @@ install:
     - if [[ "$DB" = "postgresql" ]]; then psql -c 'create database travis_ci_test;' -U postgres; fi
 
     # Handle MySQL
+    - if [[ "$DB" = "mysql" ]]; then pip install mysql-python; fi
     - if [[ "$DB" = "mysql" ]]; then mysql -e 'create database mysql_db;'; fi
 
 script:

From 3184897e71575d6cbd33a4f6643d0b0225e89b4f Mon Sep 17 00:00:00 2001
From: mattjegan <matthewj.egan@hotmail.com>
Date: Thu, 6 Oct 2016 21:13:45 +1100
Subject: [PATCH 5/5] Changed mysql install

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 93d0c2ee..0f5dcef2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ install:
     - if [[ "$DB" = "postgresql" ]]; then psql -c 'create database travis_ci_test;' -U postgres; fi
 
     # Handle MySQL
-    - if [[ "$DB" = "mysql" ]]; then pip install mysql-python; fi
+    - if [[ "$DB" = "mysql" ]]; then pip install mysqlclient; fi
     - if [[ "$DB" = "mysql" ]]; then mysql -e 'create database mysql_db;'; fi
 
 script: