From dae1d11530bf03b5832eff75620604ce7f01bef1 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Mon, 27 Oct 2014 16:07:07 -0400
Subject: [PATCH] First attempt at getting travis ci working

---
 .travis.yml                   | 13 +++++++++++++
 package.json                  |  1 +
 tests/adapters/mysql2_test.js |  4 +++-
 tests/adapters/mysql_test.js  |  4 +++-
 tests/adapters/pg_test.js     |  4 +++-
 tests/config-travis.json      | 24 ++++++++++++++++++++++++
 6 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 .travis.yml
 create mode 100644 tests/config-travis.json

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..6989c3c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: node_js
+
+node_js:
+  - "0.11"
+  - "0.10"
+  - "0.8"
+
+before_script:
+  - psql -c 'DROP DATABASE IF EXISTS test;' -U postgres
+  - psql -c 'create database test;' -U postgres
+  - mysql -e 'create database IF NOT EXISTS test;'
+  - mysql -Uroot test < ./tests/sql/mysql.sql
+  - psql -f ./tests/sql/pgsql.sql
\ No newline at end of file
diff --git a/package.json b/package.json
index 6d6f2e9..208c2b6 100755
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "grunt-contrib-nodeunit": "^0.4.1",
     "grunt-istanbul": "^0.3.0",
     "grunt-jsdoc": ">=0.6.1",
+    "grunt-cli":"",
     "jsdoc": "^3.3.0-alpha9",
     "mysql": "^2.5.2",
     "mysql2": "^0.12.5",
diff --git a/tests/adapters/mysql2_test.js b/tests/adapters/mysql2_test.js
index 711691c..d0d1aab 100644
--- a/tests/adapters/mysql2_test.js
+++ b/tests/adapters/mysql2_test.js
@@ -1,5 +1,7 @@
 'use strict';
 
+var configFile = (process.env.CI) ? '../config-travis.json' : '../config.json';
+
 // Load a fresh version of the test base
 delete require.cache[require.resolve('../query-builder-base')];
 var testBase = require('../query-builder-base');
@@ -7,7 +9,7 @@ var tests = testBase.tests;
 
 // Load the test config file
 var adapterName = 'mysql2';
-var config = require('../config.json')[adapterName];
+var config = require(configFile)[adapterName];
 
 // Set up the connection
 var mysql2 = require(adapterName);
diff --git a/tests/adapters/mysql_test.js b/tests/adapters/mysql_test.js
index 0fa44b8..a4c317b 100644
--- a/tests/adapters/mysql_test.js
+++ b/tests/adapters/mysql_test.js
@@ -1,5 +1,7 @@
 'use strict';
 
+var configFile = (process.env.CI) ? '../config-travis.json' : '../config.json';
+
 // Load the test base
 delete require.cache[require.resolve('../query-builder-base')];
 var testBase = require('../query-builder-base');
@@ -7,7 +9,7 @@ var tests = testBase.tests;
 
 // Load the test config file
 var adapterName = 'mysql';
-var config = require('../config.json')[adapterName];
+var config = require(configFile)[adapterName];
 
 // Set up the connection
 var mysql = require(adapterName);
diff --git a/tests/adapters/pg_test.js b/tests/adapters/pg_test.js
index 2e7a341..1b32d64 100644
--- a/tests/adapters/pg_test.js
+++ b/tests/adapters/pg_test.js
@@ -1,5 +1,7 @@
 'use strict';
 
+var configFile = (process.env.CI) ? '../config-travis.json' : '../config.json';
+
 // Load the test base
 delete require.cache[require.resolve('../query-builder-base')];
 var testBase = require('../query-builder-base');
@@ -7,7 +9,7 @@ var tests = testBase.tests;
 
 // Load the test config file
 var adapterName = 'pg';
-var config = require('../config.json')[adapterName];
+var config = require(configFile)[adapterName];
 
 // Set up the connection
 var pg = require(adapterName);
diff --git a/tests/config-travis.json b/tests/config-travis.json
new file mode 100644
index 0000000..11d9002
--- /dev/null
+++ b/tests/config-travis.json
@@ -0,0 +1,24 @@
+{
+	"mysql": {
+		"driver": "mysql",
+		"conn": {
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test"
+		}
+	},
+	"mysql2": {
+		"driver": "mysql",
+		"conn": {
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test"
+		}
+	},
+	"pg": {
+		"driver": "pg",
+		"conn": "postgres://postgres@localhost/test"
+	}
+}
\ No newline at end of file