From 6e6e8b5d69cfc09b5b8b8a52181a9aa19454e98a Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 13 Apr 2007 21:15:20 +0000
Subject: [PATCH] Fixes #615, report item type should not have "date enacted"
 field (should be "date")

---
 chrome/content/zotero/xpcom/schema.js | 4 ++++
 chrome/locale/en-US/zotero/zotero.dtd | 2 +-
 system.sql                            | 5 +++--
 userdata.sql                          | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index 5c9a9a3d3..0c9bc50a9 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -1039,6 +1039,10 @@ Zotero.Schema = new function(){
 				if (i==29) {
 					Zotero.DB.query("CREATE TABLE IF NOT EXISTS settings (\n    setting TEXT,\n    key TEXT,\n    value,\n    PRIMARY KEY (setting, key)\n);");
 				}
+				
+				if (i==31) {
+					Zotero.DB.query("UPDATE itemData SET fieldID=14 WHERE itemID IN (SELECT itemID FROM items WHERE itemTypeID=15) AND fieldID=100");
+				}
 			}
 			
 			_updateSchema('userdata');
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 832ed1609..f5d6f6621 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -11,7 +11,7 @@
 <!ENTITY zotero.upgrade.newVersionInstalled				"You have installed a new version of Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired					"Your Zotero database must be upgraded to work with the new version.">
 <!ENTITY zotero.upgrade.autoBackup							"Your existing database will be backed up automatically before any changes are made.">
-<!ENTITY zotero.upgrade.upgradeInProgress					"Please wait for the upgrade process to finish.">
+<!ENTITY zotero.upgrade.upgradeInProgress					"Please wait for the upgrade process to finish. This may take a few minutes.">
 <!ENTITY zotero.upgrade.upgradeSucceeded					"Your Zotero database has been successfully upgraded.">
 <!ENTITY zotero.upgrade.changeLogBeforeLink				"Please see">
 <!ENTITY zotero.upgrade.changeLogLink						"the changelog">
diff --git a/system.sql b/system.sql
index 1b10bf1d5..9851f0a9f 100644
--- a/system.sql
+++ b/system.sql
@@ -1,4 +1,4 @@
--- 19
+-- 20
 
 -- This file creates system tables that can be safely wiped and reinitialized
 -- at any time, as long as existing ids are preserved.
@@ -473,7 +473,7 @@ INSERT INTO itemTypeFields VALUES (15, 32, NULL, 4);
 INSERT INTO itemTypeFields VALUES (15, 28, NULL, 5);
 INSERT INTO itemTypeFields VALUES (15, 7, NULL, 6);
 INSERT INTO itemTypeFields VALUES (15, 31, NULL, 7);
-INSERT INTO itemTypeFields VALUES (15, 100, NULL, 8);
+INSERT INTO itemTypeFields VALUES (15, 14, NULL, 8);
 INSERT INTO itemTypeFields VALUES (15, 10, NULL, 9);
 INSERT INTO itemTypeFields VALUES (15, 87, NULL, 10);
 INSERT INTO itemTypeFields VALUES (15, 116, NULL, 11);
@@ -822,6 +822,7 @@ INSERT INTO itemTypeFields VALUES (36, 62, NULL, 20);
 INSERT INTO itemTypeFields VALUES (36, 2, NULL, 21);
 INSERT INTO itemTypeFields VALUES (36, 22, NULL, 22);
 
+
 INSERT INTO baseFieldMappings VALUES (16, 4, 94); -- bill/volume/codeVolume
 INSERT INTO baseFieldMappings VALUES (17, 4, 97); -- case/volume/reporterVolume
 INSERT INTO baseFieldMappings VALUES (19, 7, 102); -- patent/place/country
diff --git a/userdata.sql b/userdata.sql
index ac61e730c..f70c14ea3 100644
--- a/userdata.sql
+++ b/userdata.sql
@@ -1,4 +1,4 @@
--- 30
+-- 31
 
 -- This file creates tables containing user-specific data -- any changes
 -- to existing tables made here must be mirrored in transition steps in