Remove mysql adapter, use mysql2 instead

lib/adapters/mysql.js

@@ -1,25 +0,0 @@
-'use strict';
-
-let Adapter = require('../Adapter'),
-	getArgs = require('getargs'),
-	promisify = require('../promisify');
-
-module.exports = class mysql extends Adapter {
-	/**
-	 * Run the sql query as a prepared statement
-	 *
-	 * @param {String} sql - The sql with placeholders
-	 * @param {Array} params - The values to insert into the query
-	 * @param {Function} [callback] - Callback to run when a response is recieved
-	 * @return {void|Promise} - Returns a promise if no callback is provided
-	 */
-	execute(sql, params, callback) {
-		let args = getArgs('sql:string, [params]:array, [callback]:function', arguments);
-
-		if (! args.callback) {
-			return promisify(this.instance.query)(args.sql, args.params);
-		}
-
-		return this.instance.query(args.sql, args.params, args.callback);
-	}
-};

test/adapters/mysql-base.js

@@ -1,42 +0,0 @@
-'use strict';
-
-module.exports = function mysqlBase(qb, nodeQuery, expect, testRunner, promiseTestRunner) {
-	test('nodeQuery.getQuery = nodeQuery.init', () => {
-		expect(nodeQuery.getQuery())
-			.to.be.deep.equal(qb);
-	});
-
-	/*---------------------------------------------------------------------------
-	Callback Tests
-	---------------------------------------------------------------------------*/
-	testRunner(qb, (err, done) => {
-		expect(err).is.not.ok;
-		done();
-	});
-	test('Callback - Select with function and argument in WHERE clause', done => {
-		qb.select('id')
-			.from('create_test')
-			.where('id', 'CEILING(SQRT(88))')
-			.get((err, rows) => {
-				expect(err).is.not.ok;
-				return done();
-			});
-	});
-
-	/*---------------------------------------------------------------------------
-	Promise Tests
-	---------------------------------------------------------------------------*/
-	promiseTestRunner(qb);
-	test('Promise - Select with function and argument in WHERE clause', () => {
-		let promise = qb.select('id')
-			.from('create_test')
-			.where('id', 'CEILING(SQRT(88))')
-			.get();
-
-		expect(promise).to.be.fulfilled;
-	});
-
-	suiteTeardown(() => {
-		qb.end();
-	});
-};

test/adapters/mysql2_test.js

@@ -26,7 +26,44 @@ let qb = nodeQuery.init('mysql', connection, adapterName);
 qb.query(qb.driver.truncate('create_test')).then(() => {
 	suite('Mysql2 adapter tests -', () => {
 
-		require('./mysql-base')(qb, nodeQuery, expect, testRunner, promiseTestRunner);
+		test('nodeQuery.getQuery = nodeQuery.init', () => {
+			expect(nodeQuery.getQuery())
+				.to.be.deep.equal(qb);
+		});
+
+		/*---------------------------------------------------------------------------
+		Callback Tests
+		---------------------------------------------------------------------------*/
+		testRunner(qb, (err, done) => {
+			expect(err).is.not.ok;
+			done();
+		});
+		test('Callback - Select with function and argument in WHERE clause', done => {
+			qb.select('id')
+				.from('create_test')
+				.where('id', 'CEILING(SQRT(88))')
+				.get((err, rows) => {
+					expect(err).is.not.ok;
+					return done();
+				});
+		});
+
+		/*---------------------------------------------------------------------------
+		Promise Tests
+		---------------------------------------------------------------------------*/
+		promiseTestRunner(qb);
+		test('Promise - Select with function and argument in WHERE clause', () => {
+			let promise = qb.select('id')
+				.from('create_test')
+				.where('id', 'CEILING(SQRT(88))')
+				.get();
+
+			expect(promise).to.be.fulfilled;
+		});
+
+		suiteTeardown(() => {
+			qb.end();
+		});
 
 		test('Test Insert Batch', done => {
 			let data = [

test/adapters/mysql_test.js

@@ -1,55 +0,0 @@
-'use strict';
-
-const configFile = (process.env.TRAVIS) ? '../config-travis.json' : '../config.json';
-
-// Load the test base
-const reload = require('require-reload')(require);
-reload.emptyCache();
-const testBase = reload('../base');
-const expect =  testBase.expect,
-	promiseTestRunner = testBase.promiseTestRunner,
-	testRunner = testBase.testRunner;
-
-let getArgs = reload('getargs');
-
-// Load the test config file
-let adapterName = 'mysql';
-let config = reload(configFile)[adapterName];
-
-// Set up the connection
-let mysql = reload(adapterName);
-let connection = mysql.createConnection(config.conn);
-
-// Set up the query builder object
-let nodeQuery = reload('../../lib/NodeQuery');
-let qb = nodeQuery.init('mysql', connection);
-
-qb.query(qb.driver.truncate('create_test')).then(() => {
-	suite('Mysql adapter tests -', () => {
-
-		require('./mysql-base')(qb, nodeQuery, expect, testRunner, promiseTestRunner);
-
-		test('Test Insert Batch', done => {
-			let data = [
-				{
-					id: 544,
-					key: 3,
-					val: new Buffer('7'),
-				}, {
-					id: 89,
-					key: 34,
-					val: new Buffer('10 o\'clock'),
-				}, {
-					id: 48,
-					key: 403,
-					val: new Buffer('97'),
-				},
-			];
-
-			qb.insertBatch('create_test', data, (err, rows) => {
-				expect(err).is.not.ok;
-				return done();
-			});
-		});
-	});
-});