timw4mail/node-query
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Completely promisify firebird driver

Browse Source
This commit is contained in:
Timothy Warren 2016-11-14 20:23:27 -05:00
parent 5dd42e07a7
commit 0ee092abd9
2 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/adapters/Firebird.js
View File

@ -1,7 +1,6 @@
'use strict'; 'use strict';
const Adapter = require('../Adapter'); const Adapter = require('../Adapter');
const getArgs = require('getargs');
const fb = require('node-firebird'); const fb = require('node-firebird');
class Firebird extends Adapter { class Firebird extends Adapter {
@ -29,7 +28,7 @@ class Firebird extends Adapter {
execute (sql, params) { execute (sql, params) {
return this.instance.then(conn => { return this.instance.then(conn => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
conn.query(args.sql. args.params, (err, result) => { conn.query(sql, params, (err, result) => {
if (err) { if (err) {
return reject(err); return reject(err);
} }

38
test/adapters/node-firebird_test.js
View File

@ -1,28 +1,27 @@
'use strict'; 'use strict';
(() => { // Load the test base
// Load the test base const path = require('path');
const path = require('path'); const reload = require('require-reload')(require);
const reload = require('require-reload')(require); const testBase = reload('../base');
const testBase = reload('../base'); const expect = testBase.expect;
const expect = reload('chai').expect; const testRunner = testBase.promiseTestRunner;
const testRunner = testBase.promiseTestRunner;
// Skip on CI // Skip on CI
if (process.env.CI || process.env.TRAVIS) { if (process.env.CI || process.env.TRAVIS) {
return; return;
} }
// 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.connection.database = path.join(__dirname, config.connection.database); config.connection.database = path.join(__dirname, config.connection.database);
let nodeQuery = reload('../../lib/NodeQuery')(config); let nodeQuery = reload('../../lib/NodeQuery')(config);
let qb = nodeQuery.getQuery(); let qb = nodeQuery.getQuery();
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);
@ -38,5 +37,4 @@
suiteTeardown(() => { suiteTeardown(() => {
qb.end(); qb.end();
}); });
}); });
})();