Skip to content

Swat/bug/npm audit fix knex #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sshankar19 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Swat/bug/npm audit fix knex #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3362d3
adding fixes
sshankar19 Oct 18, 2019
d4ae5bf
adding fixes
sshankar19 Oct 18, 2019
9f40f4b
adding more fixes
sshankar19 Oct 21, 2019
2331a74
Merge branch 'master' into swat/bug/persistor-3.1.3-stats-fix
sshankar19 Oct 21, 2019
c57535a
Updating History and merging in master
sshankar19 Oct 21, 2019
4f6a2b4
updating for npm audit
sshankar19 Oct 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions HISTORY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 3.1.6
* Updated knex for vulnerability

## 3.1.5
* Fixing a bug where cascadeSave was a becoming async
* Fixed a bug where changeTracking was on by default

## 3.1.4
* Fix bad promise handling in a forEach loop by switching to "for of..."

Expand Down
20 changes: 2 additions & 18 deletions lib/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,22 +714,8 @@ module.exports = function (PersistObjectTemplate, baseClassForPersist) {

// Legacy
template.prototype.cascadeSave = function (txn, logger) {
var time = getTime();

var persistObjectTemplate = this.__objectTemplate__ || self;
var query = Promise.resolve(persistObjectTemplate.setDirty(this, txn || persistObjectTemplate.currentTransaction, true, false, logger));

const name = 'cascadeSave';
return query
.then(result => {
getStats(time, template.__name__, name);
return result;
})
// @TODO: need to handle errors with log
.catch(e => {
getStats(time, template.__name__, name, true);
throw e;
});
persistObjectTemplate.setDirty(this, txn || persistObjectTemplate.currentTransaction, true, false, logger);
};

template.prototype.isStale = // Legacy
Expand Down Expand Up @@ -809,7 +795,6 @@ module.exports = function (PersistObjectTemplate, baseClassForPersist) {
}
var dbType = persistObjectTemplate.getDB(persistObjectTemplate.getDBAlias(this.__template__.__collection__)).type;
var previousDirtyTracking = persistObjectTemplate.__changeTracking__;
persistObjectTemplate.__changeTracking__ = false;
var promise = (dbType == persistObjectTemplate.DB_Mongo) ?
persistObjectTemplate.getTemplateFromMongoPOJO(this, this.__template__, null, null, idMap, cascade, this, properties, isTransient, logger) :
persistObjectTemplate.getTemplateFromKnexPOJO(this, this.__template__, null, idMap, cascade, isTransient, null, this, properties, undefined, undefined, undefined, logger);
Expand Down Expand Up @@ -992,7 +977,7 @@ module.exports = function (PersistObjectTemplate, baseClassForPersist) {
* @returns {object} returns transaction object
*/
PersistObjectTemplate.begin = function (notDefault) {
var txn = { id: new Date().getTime(), dirtyObjects: {}, savedObjects: {}, touchObjects: {}, deletedObjects: {} };
var txn = { id: new Date().getTime(), dirtyObjects: {}, savedObjects: {}, touchObjects: {}, deletedObjects: {}};
if (!notDefault) {
this.currentTransaction = txn;
}
Expand Down Expand Up @@ -1178,7 +1163,6 @@ module.exports = function (PersistObjectTemplate, baseClassForPersist) {
PersistObjectTemplate.commit = async function commit(options) {
var time = getTime();
PersistObjectTemplate._validateParams(options, 'commitSchema');

options = options || {};
var logger = options.logger || PersistObjectTemplate.logger;

Expand Down
Loading