www

commit cf644465e3313defc6ab966b6392aa294a1def20
parent fa2a8bb30ed5e97027a7be202dc4c96818d9f623
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 28 Oct 2008 06:18:11 +0000

Fix a couple more potential upgrade errors with space trimming


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

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
@@ -2059,7 +2059,7 @@ Zotero.Schema = new function(){
 							var trimmed = Zotero.Utilities.prototype.trim(row.value);
 							var valueID = Zotero.DB.valueQuery("SELECT valueID FROM itemDataValues WHERE value=?", trimmed);
 							if (valueID) {
-								Zotero.DB.query("UPDATE itemData SET valueID=? WHERE valueID=?", [valueID, row.valueID]);
+								Zotero.DB.query("UPDATE OR REPLACE itemData SET valueID=? WHERE valueID=?", [valueID, row.valueID]);
 								Zotero.DB.query("DELETE FROM itemDataValues WHERE valueID=?", row.valueID);
 							}
 							else {
@@ -2092,7 +2092,7 @@ Zotero.Schema = new function(){
 							var trimmed = Zotero.Utilities.prototype.trim(row.name);
 							var tagID = Zotero.DB.valueQuery("SELECT tagID FROM tags WHERE name=?", trimmed);
 							if (tagID) {
-								Zotero.DB.query("UPDATE itemTags SET tagID=? WHERE tagID=?", [tagID, row.tagID]);
+								Zotero.DB.query("UPDATE OR REPLACE itemTags SET tagID=? WHERE tagID=?", [tagID, row.tagID]);
 								Zotero.DB.query("DELETE FROM tags WHERE tagID=?", row.tagID);
 							}
 							else {