Update dependencies to latest versions

.travis.yml

@@ -12,7 +12,6 @@ node_js:
 
 before_script:
   - npm install -g gulp codeclimate-test-reporter
-  - npm install -g codeclimate-test-reporter
   - psql -c 'DROP DATABASE IF EXISTS test;' -U postgres
   - psql -c 'create database test;' -U postgres
   - mysql -e 'create database IF NOT EXISTS test;'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-node-query",
-  "version": "3.2.0",
+  "version": "4.0.0-pre",
   "description": "A query builder for node based on the one in CodeIgniter",
   "author": "Timothy J Warren <tim@timshomepage.net>",
   "engines": {
@@ -22,14 +22,12 @@
   "keywords": [
     "codeigniter",
     "mysql2",
-    "mysql",
     "query builder",
     "pg",
     "postgres",
+    "sqlite3",
     "sqlite",
-    "dblite",
+    "dblite"
-    "firebird",
-    "node-firebird"
   ],
   "bugs": {
     "url": "https://git.timshomepage.net/timw4mail/node-query/issues"
@@ -38,29 +36,28 @@
   "dependencies": {
     "dblite": "~0.7.6",
     "getargs": "~0.0.8",
-    "mysql": "~2.10.2",
+    "glob": "^7.0.3",
-    "mysql2": "~0.15.8",
+    "mysql2": "^1.0.0-rc.1",
-    "node-firebird": "~0.7.2",
+    "pg": "^4.5.1",
-    "pg": "~4.4.3",
     "require-reload": "~0.2.2",
     "xregexp": "^3.0.0"
   },
   "devDependencies": {
-    "chai": "~3.4.1",
+    "chai": "^3.5.0",
     "chai-as-promised": "^5.2.0",
     "documentation": "",
-    "eslint": "~1.10.3",
+    "eslint": "^2.4.0",
     "glob": "~6.0.4",
     "gulp": "~3.9.0",
-    "gulp-documentation": "~2.1.0",
+    "gulp-documentation": "^2.2.0",
-    "gulp-eslint": "~1.1.1",
+    "gulp-eslint": "^2.0.0",
     "gulp-istanbul": "^0.10.3",
     "gulp-jscs": "^3.0.2",
     "gulp-mocha": "^2.2.0",
     "gulp-pipe": "^1.0.4",
     "gulp-sloc": "~1.0.4",
     "istanbul": "~0.4.2",
-    "mocha": ""
+    "mocha": "^2.4.5"
   },
   "license": "MIT",
   "scripts": {

test/adapters/dblite_test.js

@@ -3,6 +3,7 @@
 // Load the test base
 const reload = require('require-reload')(require);
 reload.emptyCache();
+const fs = require('fs');
 const testBase = reload('../base');
 const expect =  testBase.expect;
 const promiseTestRunner = testBase.promiseTestRunner;
@@ -20,10 +21,13 @@ let qb = nodeQuery.getQuery();
 suite('Dblite adapter tests -', () => {
 	suiteSetup(done => {
 		// Set up the sqlite database
-		let sql = `CREATE TABLE IF NOT EXISTS "create_test" ("id" INTEGER PRIMARY KEY, "key" TEXT, "val" TEXT);
+		fs.readFile(`${__dirname}/../sql/sqlite.sql`, 'utf8', (err, data) => {
-CREATE TABLE IF NOT EXISTS "create_join" ("id" INTEGER PRIMARY KEY, "key" TEXT, "val" TEXT);`;
+			if (err) {
+				return done(err);
+			}
 
-		qb.query(sql, () => done());
+			qb.query(data, () => done());
+		});
 	});
 
 	/*---------------------------------------------------------------------------

test/sql/sqlite.sql

@@ -1,3 +1,3 @@
 -- sample data to test SQLite
 CREATE TABLE IF NOT EXISTS "create_test" ("id" INTEGER PRIMARY KEY, "key" TEXT, "val" TEXT);
-CREATE TABLE IF NOT EXISTS "create_join" ("id" INTEGER PRIMARY KEY, "key" TEXT, "val" TEXT);
+CREATE TABLE IF NOT EXISTS "create_join" ("id" INTEGER PRIMARY KEY, "key" TEXT, "val" TEXT);