www

commit 04bab1f28f11b1225691595f04da4ccc87c5e6b7
parent 8d38122e9bd94e4c366bbc74e628cce0b3fccabe
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed, 14 Oct 2009 09:25:41 +0000

Fix stupid bug that could cause an upgrade error


Diffstat:
M
chrome/content/zotero/xpcom/schema.js
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
@@ -2476,7 +2476,7 @@ Zotero.Schema = new function(){
 				if (i==64) {
 					Zotero.DB.query("ALTER TABLE syncDeleteLog RENAME TO syncDeleteLogOld");
 					Zotero.DB.query("CREATE TABLE syncDeleteLog (\n    syncObjectTypeID INT NOT NULL,\n    libraryID INT NOT NULL,\n    key TEXT NOT NULL,\n    timestamp INT NOT NULL,\n    UNIQUE (syncObjectTypeID, libraryID, key),\n    FOREIGN KEY (syncObjectTypeID) REFERENCES syncObjectTypes(syncObjectTypeID)\n)");
-					Zotero.DB.query("INSERT INTO syncDeleteLog SELECT * FROM syncDeleteLogOld");
+					Zotero.DB.query("INSERT INTO syncDeleteLog SELECT syncObjectTypeID, IFNULL(libraryID, 0) AS libraryID, key, timestamp FROM syncDeleteLogOld");
 					Zotero.DB.query("DROP TABLE syncDeleteLogOld");
 				}