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

Don't orphan embedded-image attachments in schema integrity check!

Browse source
This commit is contained in:
Dan Stillman 2021-02-19 05:19:51 -05:00
parent d0bdc45b9f
commit 8b57d0000b
2 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

28
chrome/content/zotero/xpcom/schema.js
View file

@ -1799,6 +1799,9 @@ Zotero.Schema = new function(){
var noteID = parseInt(yield Zotero.DB.valueQueryAsync( var noteID = parseInt(yield Zotero.DB.valueQueryAsync(
"SELECT itemTypeID FROM itemTypes WHERE typeName='note'" "SELECT itemTypeID FROM itemTypes WHERE typeName='note'"
)); ));
var annotationID = parseInt(yield Zotero.DB.valueQueryAsync(
"SELECT itemTypeID FROM itemTypes WHERE typeName='annotation'"
));
// The first position is for testing and the second is for repairing. Can be either SQL // The first position is for testing and the second is for repairing. Can be either SQL
// statements or promise-returning functions. For statements, the repair entry can be either // statements or promise-returning functions. For statements, the repair entry can be either
@ -1924,16 +1927,29 @@ Zotero.Schema = new function(){
`SELECT COUNT(*) > 0 FROM items WHERE itemTypeID=${attachmentID} AND itemID NOT IN (SELECT itemID FROM itemAttachments)`, `SELECT COUNT(*) > 0 FROM items WHERE itemTypeID=${attachmentID} AND itemID NOT IN (SELECT itemID FROM itemAttachments)`,
`INSERT INTO itemAttachments (itemID, linkMode) SELECT itemID, 0 FROM items WHERE itemTypeID=${attachmentID} AND itemID NOT IN (SELECT itemID FROM itemAttachments)`, `INSERT INTO itemAttachments (itemID, linkMode) SELECT itemID, 0 FROM items WHERE itemTypeID=${attachmentID} AND itemID NOT IN (SELECT itemID FROM itemAttachments)`,
], ],
// Note/child parents // Attachments with note parents, unless they're embedded-image attachments
[ [
`SELECT COUNT(*) > 0 FROM itemAttachments WHERE parentItemID IN (SELECT itemID FROM items WHERE itemTypeID IN (${noteID}, ${attachmentID}))`, `SELECT COUNT(*) > 0 FROM itemAttachments `
`UPDATE itemAttachments SET parentItemID=NULL WHERE parentItemID IN (SELECT itemID FROM items WHERE itemTypeID IN (${noteID}, ${attachmentID}))`, + `WHERE parentItemID IN (SELECT itemID FROM items WHERE itemTypeID=${noteID}) `
+ `AND linkMode != ${Zotero.Attachments.LINK_MODE_EMBEDDED_IMAGE}`,
`UPDATE itemAttachments SET parentItemID=NULL `
+ `WHERE parentItemID IN (SELECT itemID FROM items WHERE itemTypeID=${noteID}) `
+ `AND linkMode != ${Zotero.Attachments.LINK_MODE_EMBEDDED_IMAGE}`,
], ],
// Attachments with attachment or annotation parents
[ [
`SELECT COUNT(*) > 0 FROM itemNotes WHERE parentItemID IN (SELECT itemID FROM items WHERE itemTypeID IN (${noteID}, ${attachmentID}))`, `SELECT COUNT(*) > 0 FROM itemAttachments `
`UPDATE itemNotes SET parentItemID=NULL WHERE parentItemID IN (SELECT itemID FROM items WHERE itemTypeID IN (${noteID}, ${attachmentID}))`, + `WHERE parentItemID IN (SELECT itemID FROM items WHERE itemTypeID IN (${attachmentID}, ${annotationID}))`,
`UPDATE itemAttachments SET parentItemID=NULL `
+ `WHERE parentItemID IN (SELECT itemID FROM items WHERE itemTypeID IN (${attachmentID}, ${annotationID}))`,
],
// Notes with note/attachment/annotation parents
[
`SELECT COUNT(*) > 0 FROM itemNotes `
+ `WHERE parentItemID IN (SELECT itemID FROM items WHERE itemTypeID IN (${noteID}, ${attachmentID}, ${annotationID}))`,
`UPDATE itemNotes SET parentItemID=NULL `
+ `WHERE parentItemID IN (SELECT itemID FROM items WHERE itemTypeID IN (${noteID}, ${attachmentID}, ${annotationID}))`,
], ],
// Delete empty creators // Delete empty creators
// This may cause itemCreator gaps, but that's better than empty creators // This may cause itemCreator gaps, but that's better than empty creators
[ [

6
test/tests/schemaTest.js
View file

@ -296,5 +296,11 @@ describe("Zotero.Schema", function() {
await assert.isTrue(await Zotero.Schema.integrityCheck(true)); await assert.isTrue(await Zotero.Schema.integrityCheck(true));
await assert.isTrue(await Zotero.Schema.integrityCheck()); await assert.isTrue(await Zotero.Schema.integrityCheck());
}); });
it("should allow embedded-image attachments under notes", async function () {
var item = await createDataObject('item', { itemType: 'note' });
await createEmbeddedImage(item);
await assert.isTrue(await Zotero.Schema.integrityCheck());
});
}) })
}) })