Fix dependencies in package.json

lib/query-parser.js

@@ -129,7 +129,6 @@ var QueryParser = function(driver) {
 
 		var outputMap = [];
 		var outputValues = [];
-		var that = this;
 
 		Object.keys(whereMap).forEach(function(key) {
 			// Combine fields, operators, functions and values into a full clause
@@ -137,7 +136,7 @@ var QueryParser = function(driver) {
 			var fullClause = '';
 
 			// Add an explicit = sign where one is inferred
-			if ( ! that.hasOperator(key))
+			if ( ! this.hasOperator(key))
 			{
 				fullClause = key + ' = ' + whereMap[key];
 			}
@@ -151,7 +150,7 @@ var QueryParser = function(driver) {
 			}
 
 			// Separate the clause into separate pieces
-			var parts = that.parseJoin(fullClause);
+			var parts = this.parseJoin(fullClause);
 
 			// Filter explicit literals from lists of matches
 			if (whereValues.indexOf(whereMap[key]) !== -1)
@@ -246,7 +245,7 @@ var QueryParser = function(driver) {
 			}
 
 			outputMap.push(parts.combined.join(' '));
-		});
+		}, this);
 
 		state.rawWhereValues = [];
 		state.whereValues = state.whereValues.concat(outputValues);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-node-query",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A query builder for node based on the one in CodeIgniter",
   "author": "Timothy J Warren <tim@timshomepage.net>",
   "engines": {
@@ -36,27 +36,25 @@
     "getargs"
   ],
   "devDependencies": {
-    "dblite": "^0.6.1",
+    "nodeunit": "^0.9.0"
-    "grunt": "^0.4.5",
-    "grunt-cli": "",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-nodeunit": "^0.4.1",
-    "grunt-istanbul": "^0.3.0",
-    "grunt-jsdoc": ">=0.6.1",
-    "jsdoc": "^3.3.0-alpha9",
-    "mysql": "^2.5.2",
-    "mysql2": "^0.12.5",
-    "node-firebird": "^0.2.4",
-    "nodeunit": "^0.9.0",
-    "pg": "^3.6.2",
-    "sqlite3": "^3.0.2"
-  },
-  "peerDependencies": {
-    "mysql": "",
-    "mysql2": "",
-    "pg": "",
-    "dblite": ""
   },
+  "bundledDependencies": [
+	"getargs",
+    "es6-shim",
+	"dblite",
+    "grunt",
+    "grunt-cli",
+    "grunt-contrib-clean",
+    "grunt-contrib-nodeunit",
+    "grunt-istanbul",
+    "grunt-jsdoc",
+    "jsdoc",
+    "mysql",
+    "mysql2",
+    "node-firebird",
+    "pg",
+    "sqlite3"
+  ],
   "license": "MIT",
   "scripts": {
     "test": "grunt tests"

tests/base_test.js

@@ -5,6 +5,7 @@ var modules = {
 	driver: require('../lib/driver'),
 	qb: require('../lib/query-builder'),
 	'node-query': require('../lib/node-query'),
+	'state': require('../lib/state'),
 	'drivers/pg': require('../lib/drivers/pg'),
 	'drivers/mysql': require('../lib/drivers/mysql'),
 	'drivers/sqlite': require('../lib/drivers/sqlite'),