From 26e3bdbf502f4c1405b61a2b29180247f4b617d9 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Thu, 10 Mar 2016 14:41:37 -0500 Subject: [PATCH] Remove mysql adapter, use mysql2 instead --- lib/adapters/mysql.js | 25 ---------------- test/adapters/mysql-base.js | 42 --------------------------- test/adapters/mysql2_test.js | 39 ++++++++++++++++++++++++- test/adapters/mysql_test.js | 55 ------------------------------------ 4 files changed, 38 insertions(+), 123 deletions(-) delete mode 100644 lib/adapters/mysql.js delete mode 100644 test/adapters/mysql-base.js delete mode 100644 test/adapters/mysql_test.js diff --git a/lib/adapters/mysql.js b/lib/adapters/mysql.js deleted file mode 100644 index cdbe571..0000000 --- a/lib/adapters/mysql.js +++ /dev/null @@ -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); - } -}; \ No newline at end of file diff --git a/test/adapters/mysql-base.js b/test/adapters/mysql-base.js deleted file mode 100644 index 504ecd7..0000000 --- a/test/adapters/mysql-base.js +++ /dev/null @@ -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(); - }); -}; \ No newline at end of file diff --git a/test/adapters/mysql2_test.js b/test/adapters/mysql2_test.js index 791702b..cb8ed4b 100644 --- a/test/adapters/mysql2_test.js +++ b/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 = [ diff --git a/test/adapters/mysql_test.js b/test/adapters/mysql_test.js deleted file mode 100644 index b1d95d5..0000000 --- a/test/adapters/mysql_test.js +++ /dev/null @@ -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(); - }); - }); - }); -}); \ No newline at end of file