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

Fix error upgrading old databases after errors 5b9e6497af

Browse source 
Creating missing tables breaks schema update steps that assume those
tables don't exist, so we'll need another solution here. For now,
disable the automatic integrity check and make a couple recent schema
update steps more forgiving for people on the beta who already triggered
this.
This commit is contained in:
Dan Stillman 2020-11-23 23:47:27 -05:00
parent 304a38083c
commit c4cc44528c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2496,7 +2496,8 @@ Zotero.Schema = new function(){
}
if (!options.skipIntegrityCheck) {
yield Zotero.Schema.integrityCheck(true);
// TEMP: Disabled
//yield Zotero.Schema.integrityCheck(true);
}
Zotero.debug('Updating user data tables from version ' + fromVersion + ' to ' + toVersion);
@ -3115,7 +3116,10 @@ Zotero.Schema = new function(){
// what's going on.
yield Zotero.DB.queryAsync("CREATE TABLE IF NOT EXISTS retractedItems (\n itemID INTEGER PRIMARY KEY,\n data TEXT,\n FOREIGN KEY (itemID) REFERENCES items(itemID) ON DELETE CASCADE\n);");
yield Zotero.DB.queryAsync("ALTER TABLE retractedItems ADD COLUMN flag INT DEFAULT 0");
try {
yield Zotero.DB.queryAsync("ALTER TABLE retractedItems ADD COLUMN flag INT DEFAULT 0");
}
catch (e) {}
}
else if (i == 106) {
@ -3145,7 +3149,7 @@ Zotero.Schema = new function(){
}
else if (i == 109) {
yield Zotero.DB.queryAsync("CREATE TABLE dbDebug1 (\n a INTEGER PRIMARY KEY\n)");
yield Zotero.DB.queryAsync("CREATE TABLE IF NOT EXISTS dbDebug1 (\n a INTEGER PRIMARY KEY\n)");
}
else if (i == 110) {