sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes

pull/1841/head
zadam 2020-03-11 21:30:33 +07:00
parent d937c754fb
commit 90688a9b59
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compare.js
Unescape Escape View File

@ -25,6 +25,14 @@ function checkMissing(table, name, ids1, ids2) {
}
}
function handleBuffer(obj) {
if (obj && Buffer.isBuffer(obj.content)) {
obj.content = obj.content.toString();
}
return obj;
}
function compareRows(table, rsLeft, rsRight, column) {
const leftIds = Object.keys(rsLeft);
const rightIds = Object.keys(rsRight);
@ -37,8 +45,8 @@ function compareRows(table, rsLeft, rsRight, column) {
const commonIds = leftIds.filter(item => rightIds.includes(item));
for (const id of commonIds) {
const valueLeft = Buffer.isBuffer(rsLeft[id]) ? rsLeft[id].toString() : rsLeft[id];
const valueRight = Buffer.isBuffer(rsRight[id]) ? rsRight[id].toString() : rsRight[id];
const valueLeft = handleBuffer(rsLeft[id]);
const valueRight = handleBuffer(rsRight[id]);
const left = JSON.stringify(valueLeft, null, 2);
const right = JSON.stringify(valueRight, null, 2);