mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't delete all annotations when updating attachment item

Browse source
This commit is contained in:
Dan Stillman 2021-01-22 00:18:51 -05:00
parent 857b413df1
commit 88f886cb30
2 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
chrome/content/zotero/xpcom/data/item.js
View file

@ -1725,11 +1725,20 @@ Zotero.Item.prototype._saveData = Zotero.Promise.coroutine(function* (env) {
}
}
if (this._changed.attachmentData) {
let sql = "REPLACE INTO itemAttachments "
+ "(itemID, parentItemID, linkMode, contentType, charsetID, path, "
+ "syncState, storageModTime, storageHash, "
+ "lastProcessedModificationTime, pageIndex) "
+ "VALUES (?,?,?,?,?,?,?,?,?,?,?)";
let sql = "";
let cols = [
'parentItemID', 'linkMode', 'contentType', 'charsetID', 'path', 'syncState',
'storageModTime', 'storageHash', 'lastProcessedModificationTime', 'pageIndex'
];
// TODO: Replace with UPSERT after SQLite 3.24.0
if (isNew) {
sql = "INSERT INTO itemAttachments "
+ "(itemID, " + cols.join(", ") + ") "
+ "VALUES (?,?,?,?,?,?,?,?,?,?,?)";
}
else {
sql = "UPDATE itemAttachments SET " + cols.join("=?, ") + "=? WHERE itemID=?";
}
let linkMode = this.attachmentLinkMode;
let contentType = this.attachmentContentType;
let charsetID = this.attachmentCharset
@ -1747,7 +1756,6 @@ Zotero.Item.prototype._saveData = Zotero.Promise.coroutine(function* (env) {
}
let params = [
itemID,
parentItemID,
{ int: linkMode },
contentType ? { string: contentType } : null,
@ -1759,6 +1767,12 @@ Zotero.Item.prototype._saveData = Zotero.Promise.coroutine(function* (env) {
lastProcessedModificationTime || null,
typeof pageIndex === 'number' ? pageIndex : null
];
if (isNew) {
params.unshift(itemID);
}
else {
params.push(itemID);
}
yield Zotero.DB.queryAsync(sql, params);
// Clear cached child attachments of the parent

19
test/tests/itemTest.js
View file

@ -1501,6 +1501,25 @@ describe("Zotero.Item", function () {
assert.lengthOf(item.getAttachments(), 1);
assert.lengthOf(item.getNotes(), 1);
});
// Make sure we're updating annotations rather than replacing and triggering ON DELETE CASCADE
it("should update attachment without deleting child annotations", async function () {
var attachment = await importFileAttachment('test.pdf');
var annotation = await createAnnotation('highlight', attachment);
var annotationIDs = await Zotero.DB.columnQueryAsync(
"SELECT itemID FROM itemAnnotations WHERE parentItemID=?", attachment.id
);
assert.lengthOf(annotationIDs, 1);
attachment.attachmentLastProcessedModificationTime = Date.now();
await attachment.saveTx();
annotationIDs = await Zotero.DB.columnQueryAsync(
"SELECT itemID FROM itemAnnotations WHERE parentItemID=?", attachment.id
);
assert.lengthOf(annotationIDs, 1);
});
})