From d2de91d872396dbfb0a9ceba7cd8afe9cdcff92c Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 31 Mar 2007 06:59:44 +0000
Subject: [PATCH] Revert r1364 fix, since that just postponed the error the
 user was experiencing

---
 chrome/content/zotero/xpcom/schema.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index e8d44d1a1..7403d42fb 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -741,7 +741,7 @@ Zotero.Schema = new function(){
 				if (i==16) {
 					Zotero.DB.query("CREATE TABLE tagsTemp (tagID INT, tag TEXT, PRIMARY KEY (tagID))");
 					if (Zotero.DB.tableExists("tags")) {
-						Zotero.DB.query("INSERT INTO tagsTemp SELECT tagID, tag FROM tags");
+						Zotero.DB.query("INSERT INTO tagsTemp SELECT * FROM tags");
 						Zotero.DB.query("DROP TABLE tags");
 					}
 					Zotero.DB.query("CREATE TABLE tags (\n    tagID INT,\n    tag TEXT,\n    tagType INT,\n    PRIMARY KEY (tagID),\n    UNIQUE (tag, tagType)\n);");
@@ -871,6 +871,8 @@ Zotero.Schema = new function(){
 					Zotero.DB.query("UPDATE itemData SET fieldID=115 WHERE itemID IN (SELECT itemID FROM items WHERE itemTypeID=3) AND fieldID=12");
 				}
 				
+				// 1.0.0b4.r1
+				
 				if (i==28) {
 					var childNotes = Zotero.DB.query("SELECT * FROM itemNotes WHERE itemID IN (SELECT itemID FROM items) AND sourceItemID IS NOT NULL");
 					for (var j=0; j<childNotes.length; j++) {
@@ -893,6 +895,8 @@ Zotero.Schema = new function(){
 						Zotero.DB.query("DELETE FROM itemNotes WHERE note=? AND sourceItemID=?", [childNotes[j].itemID, childNotes[j].sourceItemID]);
 					}
 				}
+				
+				// 1.0.0b4.r2
 			}
 			
 			_updateSchema('userdata');