hapiest-mysql
Advanced tools
Comparing version 0.0.10 to 0.0.11-n
@@ -13,4 +13,3 @@ 'use strict'; | ||
this._mysqlService = args.mysqlService; | ||
this._tableName = args.tableName; | ||
this._queryHelper = new MysqlDaoQueryHelper(args.tableName, args.mysqlService.clean.bind(args.mysqlService)); | ||
this._queryHelper = new MysqlDaoQueryHelper(this.tableName, args.mysqlService.clean.bind(args.mysqlService)); | ||
this._createVoFromDbRow = args.createVoFromDbRowFunction; | ||
@@ -21,2 +20,7 @@ this._logger = args.logger; | ||
/** | ||
* @returns {string} | ||
*/ | ||
get tableName() { throw new Error('Extending class must override tableName() with actual table') } | ||
/** | ||
* @param {object} createArgs | ||
@@ -31,3 +35,3 @@ * @returns {Promise.<int,Error>} - ID of last inserted item | ||
this._logger.error(err.message, {createArgs:createArgs, err:err}); | ||
throw new Error(`MysqlDao.create() for ${this._tableName} failed`); | ||
throw new Error(`MysqlDao.create() for ${this.tableName} failed`); | ||
}); | ||
@@ -46,3 +50,3 @@ } | ||
this._logger.error(err.message, {createArgsArr:createArgsArr, err:err}); | ||
throw new Error(`MysqlDao.createBulk() for ${this._tableName} failed`); | ||
throw new Error(`MysqlDao.createBulk() for ${this.tableName} failed`); | ||
}); | ||
@@ -49,0 +53,0 @@ } |
@@ -10,3 +10,2 @@ 'use strict'; | ||
* @param {MysqlService} obj.mysqlService | ||
* @param {string} obj.tableName | ||
* @param {function} obj.createVoFromDbRowFunction | ||
@@ -28,9 +27,2 @@ * @param {Logger} obj.logger | ||
/** | ||
* @returns {string} | ||
*/ | ||
get tableName() { | ||
return this.get('tableName'); | ||
} | ||
/** | ||
* @returns {function} | ||
@@ -37,0 +29,0 @@ */ |
{ | ||
"name": "hapiest-mysql", | ||
"version": "0.0.10", | ||
"version": "0.0.11n", | ||
"description": "A wrapper around mysql that provides a very descriptive way of running queries.", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -63,8 +63,11 @@ 'use strict'; | ||
mysqlService: mysqlService, | ||
tableName: 'users', | ||
createVoFromDbRowFunction: createUserFromDbRow, | ||
logger: logger | ||
}); | ||
const mysqlDao = new MysqlDao(mysqlDaoArgs); | ||
class UserDao extends MysqlDao { | ||
get tableName() {return 'users';} | ||
} | ||
const userDao = new UserDao(mysqlDaoArgs); | ||
function databaseSetup(done) { | ||
@@ -104,3 +107,3 @@ | ||
it('Should create a single row in the users table', function() { | ||
return mysqlDao.create({firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}) | ||
return userDao.create({firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}) | ||
.then(id => { | ||
@@ -124,3 +127,3 @@ Should.exist(id); | ||
it('Should create a single row in the users table from a VO', function() { | ||
return mysqlDao.create(new UserCreateArgs({firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'})) | ||
return userDao.create(new UserCreateArgs({firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'})) | ||
.then(id => { | ||
@@ -149,3 +152,3 @@ Should.exist(id); | ||
it('Should create two row in the users table', function() { | ||
return mysqlDao.createBulk([ | ||
return userDao.createBulk([ | ||
{firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}, | ||
@@ -188,10 +191,10 @@ {firstName: 'Jane', lastName: 'Doe', email: 'jane.doe@gmail.com'} | ||
let newId = null; | ||
return mysqlDao.create({firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}) | ||
return userDao.create({firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}) | ||
.then(id => { newId = id}) | ||
.then(() => { | ||
const createPromise = mysqlDao.create({firstName: 'Jane', lastName: 'Doe', email: 'jane.doe@gmail.com'}); // Add this to make sure the ID lookup actually does something | ||
const createPromise = userDao.create({firstName: 'Jane', lastName: 'Doe', email: 'jane.doe@gmail.com'}); // Add this to make sure the ID lookup actually does something | ||
return Promise.all([createPromise]); | ||
}) | ||
.then(() => { | ||
const checkRowPromise = mysqlDao.getOneById(newId) | ||
const checkRowPromise = userDao.getOneById(newId) | ||
.then(user => { | ||
@@ -217,10 +220,10 @@ Should.exist(user); | ||
let newId = null; | ||
return mysqlDao.create({firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}) | ||
return userDao.create({firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}) | ||
.then(id => { newId = id}) | ||
.then(() => { | ||
const createPromise = mysqlDao.create({firstName: 'Jane', lastName: 'Doe', email: 'jane.doe@gmail.com'}); // Add this to make sure the ID lookup actually does something | ||
const createPromise = userDao.create({firstName: 'Jane', lastName: 'Doe', email: 'jane.doe@gmail.com'}); // Add this to make sure the ID lookup actually does something | ||
return Promise.all([createPromise]); | ||
}) | ||
.then(() => { | ||
const checkRowPromise = mysqlDao.getOne({firstName: 'Jane', email: 'jane.doe@gmail.com'}) | ||
const checkRowPromise = userDao.getOne({firstName: 'Jane', email: 'jane.doe@gmail.com'}) | ||
.then(user => { | ||
@@ -244,3 +247,3 @@ Should.exist(user); | ||
it('Should return two users', function() { | ||
return mysqlDao.createBulk([ | ||
return userDao.createBulk([ | ||
{firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}, | ||
@@ -251,3 +254,3 @@ {firstName: 'Jane', lastName: 'Doe', email: 'jane.doe@gmail.com'} | ||
const checkRowPromise1 = mysqlDao.getAll({lastName: 'Doe'}) | ||
const checkRowPromise1 = userDao.getAll({lastName: 'Doe'}) | ||
.then(users => { | ||
@@ -268,3 +271,3 @@ Should.exist(users); | ||
it('Should update Jane email address', function() { | ||
return mysqlDao.createBulk([ | ||
return userDao.createBulk([ | ||
{firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}, | ||
@@ -274,7 +277,7 @@ {firstName: 'Jane', lastName: 'Doe', email: 'jane.doe@gmail.com'} | ||
.then((numRows) => { | ||
const getIdPromise = mysqlDao.getOne({email: 'jane.doe@gmail.com'}).then(user => user.id); | ||
const getIdPromise = userDao.getOne({email: 'jane.doe@gmail.com'}).then(user => user.id); | ||
return Promise.all([getIdPromise]).then(results => results[0]); | ||
}) | ||
.then(idToUpdate => { | ||
const updatePromise = mysqlDao.updateById(idToUpdate, {firstName: 'joe', lastName: 'bob'}); | ||
const updatePromise = userDao.updateById(idToUpdate, {firstName: 'joe', lastName: 'bob'}); | ||
return Promise.all([updatePromise]).then(results => results[0]); | ||
@@ -286,3 +289,3 @@ }) | ||
const assertPromise = mysqlDao.getOne({email: 'jane.doe@gmail.com'}) | ||
const assertPromise = userDao.getOne({email: 'jane.doe@gmail.com'}) | ||
.then(user => { | ||
@@ -304,3 +307,3 @@ Should.exist(user); | ||
it('Should update John Doe user', function() { | ||
return mysqlDao.createBulk([ | ||
return userDao.createBulk([ | ||
{firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}, | ||
@@ -310,3 +313,3 @@ {firstName: 'Jane', lastName: 'Doe', email: 'jane.doe@gmail.com'} | ||
.then(() => { | ||
const updatePromise = mysqlDao.updateOne({firstName: 'John'}, {firstName: 'joe', lastName: 'bob'}); | ||
const updatePromise = userDao.updateOne({firstName: 'John'}, {firstName: 'joe', lastName: 'bob'}); | ||
return Promise.all([updatePromise]).then(results => results[0]); | ||
@@ -318,3 +321,3 @@ }) | ||
const assertPromise = mysqlDao.getOne({email: 'john.doe@gmail.com'}) | ||
const assertPromise = userDao.getOne({email: 'john.doe@gmail.com'}) | ||
.then(user => { | ||
@@ -336,3 +339,3 @@ Should.exist(user); | ||
it('Should delete Jane Doe user', function() { | ||
return mysqlDao.createBulk([ | ||
return userDao.createBulk([ | ||
{firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}, | ||
@@ -342,7 +345,7 @@ {firstName: 'Jane', lastName: 'Doe', email: 'jane.doe@gmail.com'} | ||
.then((numRows) => { | ||
const getIdPromise = mysqlDao.getOne({email: 'jane.doe@gmail.com'}).then(user => user.id); | ||
const getIdPromise = userDao.getOne({email: 'jane.doe@gmail.com'}).then(user => user.id); | ||
return Promise.all([getIdPromise]).then(results => results[0]); | ||
}) | ||
.then(idToDelete => { | ||
const deletePromise = mysqlDao.deleteById(idToDelete); | ||
const deletePromise = userDao.deleteById(idToDelete); | ||
return Promise.all([deletePromise]).then(results => results[0]); | ||
@@ -354,3 +357,3 @@ }) | ||
const assertPromise = mysqlDao.getOne({email: 'jane.doe@gmail.com'}) | ||
const assertPromise = userDao.getOne({email: 'jane.doe@gmail.com'}) | ||
.then(user => { | ||
@@ -368,3 +371,3 @@ Should.not.exist(user); | ||
it('Should delete John Doe user', function() { | ||
return mysqlDao.createBulk([ | ||
return userDao.createBulk([ | ||
{firstName: 'John', lastName: 'Doe', email: 'john.doe@gmail.com'}, | ||
@@ -374,3 +377,3 @@ {firstName: 'Jane', lastName: 'Doe', email: 'jane.doe@gmail.com'} | ||
.then(idToDelete => { | ||
const deletePromise = mysqlDao.deleteOne({firstName: 'John'}); | ||
const deletePromise = userDao.deleteOne({firstName: 'John'}); | ||
return Promise.all([deletePromise]).then(results => results[0]); | ||
@@ -382,3 +385,3 @@ }) | ||
const assertPromise = mysqlDao.getOne({email: 'john.doe@gmail.com'}) | ||
const assertPromise = userDao.getOne({email: 'john.doe@gmail.com'}) | ||
.then(user => { | ||
@@ -385,0 +388,0 @@ Should.not.exist(user); |
Manifest confusion
Supply chain riskThis package has inconsistent metadata. This could be malicious or caused by an error when publishing the package.
Found 1 instance in 1 package
110338
2555
1