From d9edf2965affd799353539f8ad70cf1c9a34bb0e Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 2 Dec 2019 12:22:46 -0700 Subject: [PATCH] Add IF EXISTS to DROP statements in schema update steps https://forums.zotero.org/discussion/80291/zotero-standalone-wont-open-database-upgrade-error --- chrome/content/zotero/xpcom/schema.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js index 3b4143e287..c431a88ffc 100644 --- a/chrome/content/zotero/xpcom/schema.js +++ b/chrome/content/zotero/xpcom/schema.js @@ -2880,16 +2880,16 @@ Zotero.Schema = new function(){ else if (i == 106) { yield _updateCompatibility(6); - yield Zotero.DB.queryAsync("DROP TRIGGER insert_date_field"); - yield Zotero.DB.queryAsync("DROP TRIGGER update_date_field"); - yield Zotero.DB.queryAsync("DROP TRIGGER fki_itemAttachments"); - yield Zotero.DB.queryAsync("DROP TRIGGER fku_itemAttachments"); - yield Zotero.DB.queryAsync("DROP TRIGGER fki_itemNotes"); - yield Zotero.DB.queryAsync("DROP TRIGGER fku_itemNotes"); + yield Zotero.DB.queryAsync("DROP TRIGGER IF EXISTS insert_date_field"); + yield Zotero.DB.queryAsync("DROP TRIGGER IF EXISTS update_date_field"); + yield Zotero.DB.queryAsync("DROP TRIGGER IF EXISTS fki_itemAttachments"); + yield Zotero.DB.queryAsync("DROP TRIGGER IF EXISTS fku_itemAttachments"); + yield Zotero.DB.queryAsync("DROP TRIGGER IF EXISTS fki_itemNotes"); + yield Zotero.DB.queryAsync("DROP TRIGGER IF EXISTS fku_itemNotes"); - yield Zotero.DB.queryAsync("DROP TABLE transactionSets"); - yield Zotero.DB.queryAsync("DROP TABLE transactions"); - yield Zotero.DB.queryAsync("DROP TABLE transactionLog"); + yield Zotero.DB.queryAsync("DROP TABLE IF EXISTS transactionSets"); + yield Zotero.DB.queryAsync("DROP TABLE IF EXISTS transactions"); + yield Zotero.DB.queryAsync("DROP TABLE IF EXISTS transactionLog"); } // If breaking compatibility or doing anything dangerous, clear minorUpdateFrom