40n8.me/Prototyper
1
0
Fork 0
mirror of /repos/Prototyper.git synced 2025-12-30 06:31:32 +01:00
Code Issues Releases Wiki Activity

correct error name

Browse Source
This commit is contained in:
Aiko Mastboom 2020-03-26 23:31:45 +01:00
parent 485834a8be
commit aaf07c2802
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/rethinkData.js
View File

@ -43,20 +43,20 @@ module.exports = function (config, r, connection) {
}
return cursor.next(function first_item(err, result) {
if (err) {
if ((err.name === 'RqlDriverError') && (err.message === 'No more rows in the cursor.')) {
return callback && callback(new Error('Data not found ' + options.collection + '/' + JSON.stringify(options.query)), null);
if ((err.name === 'ReqlDriverError') && (err.message === 'No more rows in the cursor.')) {
return callback && callback(new Error('Data not found ' + options.collection + ' / ' + JSON.stringify(options.query)), null);
}
config.error && config.error('ERR4 getRethinkContent', err);
return callback && callback(err);
}
if (!result) {
return callback && callback(new Error('Data not found ' + options.collection + '/' + JSON.stringify(options.query)), null);
return callback && callback(new Error('Data not found ' + options.collection + ' / ' + JSON.stringify(options.query)), null);
}
return callback && callback(null, result, options.collection);
});
});
} else {
return callback && callback(new Error('Data not found ' + options.collection + '/' + JSON.stringify(options.query)), null);
return callback && callback(new Error('Data not found ' + options.collection + ' / ' + JSON.stringify(options.query)), null);
}
});
}
@ -123,7 +123,10 @@ module.exports = function (config, r, connection) {
function saveData(collection, data, callback) {
config.debug && config.debug('saveData saving', data.id, data.guid, collection);
r.table(collection).insert(data, {conflict: 'replace'})
r.table(collection)
.insert(data, {
conflict: 'replace'
})
.run(connection, function inserted(err, status) {
if (err) {
config.error && config.error('ERR saveData', err);
@ -158,7 +161,9 @@ module.exports = function (config, r, connection) {
return callback && callback(null, result, col);
};
return r.table(collection).get(data.id).run(connection, function foundOne(err, result) {
return r.table(collection)
.get(data.id)
.run(connection, function foundOne(err, result) {
if (err) {
config.error && config.error('ERR updateData', err);
return callback && callback(err);
@ -214,7 +219,7 @@ module.exports = function (config, r, connection) {
}
return cursor.next(function first_item(err, result) {
if (err) {
if (!((err.name === 'RqlDriverError') && (err.message === 'No more rows in the cursor.'))) {
if (!((err.name === 'ReqlDriverError') && (err.message === 'No more rows in the cursor.'))) {
config.error && config.error('ERR4 getRethinkContent', err);
return callback && callback(err);
}