Fix some code-style issues and fix jenkins build

API.md

@@ -15,8 +15,10 @@ Create a query builder object
 **Parameters**
 
 -   `driverType` **String** The name of the database type, eg. mysql or pg
--   `connObject` **Object** A connection object from the database library you are connecting with
+-   `connObject` **Object** A connection object from the database library
--   `connLib` **[String]** The name of the db connection library you are using, eg. mysql or mysql2. Optional if the same as driverType
+    you are connecting with
+-   `connLib` **[String]** The name of the db connection library you are
+    using, eg. mysql or mysql2. Optional if the same as driverType
 
 Returns **QueryBuilder** The Query Builder object
 

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 3.2.0
 * Added public `query` method for making arbitrary sql calls
-* Added back tests for `node-query` adapter. Using this adapter with promises is not currently supported.
+* Added back tests for `node-firebird` adapter. Using this adapter with promises is not currently supported.
 
 ## 3.1.0
 * Added support for promises on query execution methods

docs/index.html

@@ -305,14 +305,16 @@
                     <li><code><a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a></code> <strong>connObject</strong>
                       :
                       <div class='force-inline'>
-                        <p>A connection object from the database library you are connecting with</p>
+                        <p>A connection object from the database library
+            you are connecting with</p>
             
                       </div>
                     </li>
                     <li><code>[<code><a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a></code>]</code> <strong>connLib</strong>
                       :
                       <div class='force-inline'>
-                        <p>The name of the db connection library you are using, eg. mysql or mysql2. Optional if the same as driverType</p>
+                        <p>The name of the db connection library you are
+            using, eg. mysql or mysql2. Optional if the same as driverType</p>
             
                       </div>
                     </li>

lib/Driver.js

@@ -21,7 +21,9 @@ let Driver = {
 	 * @private
 	 */
 	_quote(str) {
-		return (helpers.isString(str) && ! (str.startsWith(Driver.identifierStartChar) || str.endsWith(Driver.identifierEndChar)))
+		return (helpers.isString(str)
+			&& ! (str.startsWith(Driver.identifierStartChar) || str.endsWith(Driver.identifierEndChar))
+		)
 			? `${Driver.identifierStartChar}${str}${Driver.identifierEndChar}`
 			: str;
 	},

lib/NodeQuery.js

@@ -23,8 +23,10 @@ class NodeQuery {
 	 * Create a query builder object
 	 *
 	 * @param {String} driverType - The name of the database type, eg. mysql or pg
-	 * @param {Object} connObject - A connection object from the database library you are connecting with
+	 * @param {Object} connObject - A connection object from the database library
-	 * @param {String} [connLib] - The name of the db connection library you are using, eg. mysql or mysql2. Optional if the same as driverType
+	 * you are connecting with
+	 * @param {String} [connLib] - The name of the db connection library you are
+	 * using, eg. mysql or mysql2. Optional if the same as driverType
 	 * @return {QueryBuilder} - The Query Builder object
 	 */
 	init(driverType, connObject, connLib) {

lib/QueryBuilder.js

@@ -131,7 +131,8 @@ class QueryBuilderBase {
 	 * @return {Array} - modified state array
 	 */
 	_mixedSet(/* $letName, $valType, $key, [$val] */) {
-		let args = getArgs('$letName:string, $valType:string, $key:object|string|number, [$val]', arguments);
+		const argPattern = '$letName:string, $valType:string, $key:object|string|number, [$val]';
+		let args = getArgs(argPattern, arguments);
 
 		let obj = {};
 
@@ -784,7 +785,8 @@ class QueryBuilder extends QueryBuilderBase {
 	 * @return {void|Promise} - If no callback is passed, a promise is returned
 	 */
 	get(/* [table], [limit], [offset], [callback] */) {
-		let args = getArgs('[table]:string, [limit]:number, [offset]:number, [callback]:function', arguments);
+		const argPattern = '[table]:string, [limit]:number, [offset]:number, [callback]:function';
+		let args = getArgs(argPattern, arguments);
 
 		if (args.table) {
 			this.from(args.table);

lib/helpers.js

@@ -127,7 +127,8 @@ types.forEach(t => {
 	 * Determine whether a variable is of the type specified in the
 	 * function name, eg isNumber
 	 *
-	 * Types available are Null, Undefined, Object, Array, String, Number, Boolean, Function, RegExp, NaN and Infinite
+	 * Types available are Null, Undefined, Object, Array, String, Number,
+	 * Boolean, Function, RegExp, NaN and Infinite
 	 *
 	 * @private
 	 * @param {mixed} o - The object to check its type

test/adapters/mysql2_test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const configFile = (process.env.CI) ? '../config-travis.json' : '../config.json';
+const configFile = (process.env.TRAVIS) ? '../config-travis.json' : '../config.json';
 
 // Load the test base
 const reload = require('require-reload')(require);

test/adapters/mysql_test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const configFile = (process.env.CI) ? '../config-travis.json' : '../config.json';
+const configFile = (process.env.TRAVIS) ? '../config-travis.json' : '../config.json';
 
 // Load the test base
 const reload = require('require-reload')(require);

test/adapters/node-firebird_test.js

@@ -1,59 +1,61 @@
 'use strict';
 
-// Load the test base
+(() => {
-const path = require('path');
+	// Load the test base
-const reload = require('require-reload')(require);
+	const path = require('path');
-const testBase = reload('../base');
+	const reload = require('require-reload')(require);
-const promisify = require('../../lib/promisify');
+	const testBase = reload('../base');
-const expect = reload('chai').expect;
+	const promisify = require('../../lib/promisify');
-const testRunner = testBase.testRunner;
+	const expect = reload('chai').expect;
-const promiseTestRunner = testBase.promiseTestRunner;
+	const testRunner = testBase.testRunner;
+	const promiseTestRunner = testBase.promiseTestRunner;
 
-// Load the test config file
+	// Load the test config file
-let adapterName = 'node-firebird';
+	let adapterName = 'node-firebird';
-let Firebird = reload(adapterName);
+	let Firebird = reload(adapterName);
-const config = reload('../config.json')[adapterName];
+	const config = reload('../config.json')[adapterName];
-config.conn.database = path.join(__dirname, config.conn.database);
+	config.conn.database = path.join(__dirname, config.conn.database);
-let nodeQuery = reload('../../lib/NodeQuery');
+	let nodeQuery = reload('../../lib/NodeQuery');
 
-let qb = null;
+	let qb = null;
 
-// Skip on TravisCi
+	// Skip on TravisCi
-if (process.env.CI || process.env.JENKINS_HOME) {
+	if (process.env.CI) {
-	return;
+		return;
-}
+	}
 
-// Promisifying the connection seems to be the only way to get
+	// Promisifying the connection seems to be the only way to get
-// this test suite to run consistently.
+	// this test suite to run consistently.
-promisify(Firebird.attach)(config.conn).then(db => {
+	promisify(Firebird.attach)(config.conn).then(db => {
-	qb = nodeQuery.init('firebird', db, adapterName);
+		qb = nodeQuery.init('firebird', db, adapterName);
-	suite('Firebird adapter tests -', () => {
+		suite('Firebird adapter tests -', () => {
-		test('nodeQuery.getQuery = nodeQuery.init', () => {
+			test('nodeQuery.getQuery = nodeQuery.init', () => {
-			expect(nodeQuery.getQuery())
+				expect(nodeQuery.getQuery())
-				.to.be.deep.equal(qb);
+					.to.be.deep.equal(qb);
-		});
+			});
-		test('insertBatch throws error', () => {
+			test('insertBatch throws error', () => {
-			expect(() => {
+				expect(() => {
-				qb.driver.insertBatch('create_test', []);
+					qb.driver.insertBatch('create_test', []);
-			}).to.throw(Error, "Not Implemented");
+				}).to.throw(Error, 'Not Implemented');
-		});
+			});
-		/*---------------------------------------------------------------------------
+			/*---------------------------------------------------------------------------
-		Callback Tests
+			Callback Tests
-		---------------------------------------------------------------------------*/
+			---------------------------------------------------------------------------*/
-		testRunner(qb, (err, done) => {
+			testRunner(qb, (err, done) => {
-			expect(err).is.not.ok;
+				expect(err).is.not.ok;
-			done();
+				done();
-		});
+			});
-		/*---------------------------------------------------------------------------
+			/*---------------------------------------------------------------------------
-		Promise Tests
+			Promise Tests
-		---------------------------------------------------------------------------*/
+			---------------------------------------------------------------------------*/
-		/*qb.adapter.execute(qb.driver.truncate('create_test')).then(() => {
+			/*qb.adapter.execute(qb.driver.truncate('create_test')).then(() => {
-			promiseTestRunner(qb);
+				promiseTestRunner(qb);
-		});*/
+			});*/
-		suiteTeardown(() => {
+			suiteTeardown(() => {
-			qb.end();
+				qb.end();
+			});
 		});
+	}).catch(err => {
+		throw new Error(err);
 	});
-}).catch(err => {
+})();
-	throw new Error(err);
-});

test/base/adapterCallbackTestRunner.js

@@ -1,5 +1,6 @@
 'use strict';
 
+// jscs:disable
 // Load the test base
 const chai = require('chai');
 const chaiAsPromised = require('chai-as-promised');

test/base/adapterPromiseTestRunner.js

@@ -1,5 +1,6 @@
 'use strict';
 
+// jscs:disable
 // Load the test base
 const chai = require('chai');
 const chaiAsPromised = require('chai-as-promised');

test/base/tests.js

@@ -1,5 +1,6 @@
 'use strict';
 
+// jscs:disable
 module.exports = {
 	'Get tests -': {
 		'Get with function': {

test/query-parser_test.js

@@ -15,7 +15,8 @@ let State = require('../lib/State');
 let state = new State();
 
 let mixedSet = function mixedSet(/* $letName, $valType, $key, [$val] */) {
-	let args = getArgs('$letName:string, $valType:string, $key:object|string|number, [$val]', arguments);
+	const argPattern = '$letName:string, $valType:string, $key:object|string|number, [$val]';
+	let args = getArgs(argPattern, arguments);
 
 	let obj = {};