www

commit 5f099967b234812c8f0d0304b006aa8e04134e94
parent a1eb0e4af74a4fd108f17eba542769584323eb00
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun,  3 Oct 2010 17:44:10 +0000

- Move translatorCache to userdata so that translators aren't reinstalled after a system.sql update
- Delete existing translatorCache via schema update to fix translator filename bug in 2.1b1 build


Diffstat:
M
chrome/content/zotero/xpcom/schema.js
 | 
8
+++++++-
M
system.sql
 | 
8
--------
M
userdata.sql
 | 
13
++++++++++---

3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
@@ -2906,11 +2906,17 @@ Zotero.Schema = new function(){
 					Zotero.DB.query("UPDATE savedSearchConditions SET condition='libraryCatalog' WHERE condition='repository'");
 				}
 				
-				// 2.1
+				// 2.1b1
 				if (i==74) {
 					Zotero.DB.query("CREATE INDEX deletedItems_dateDeleted ON deletedItems(dateDeleted)");
 				}
 				
+				// 2.1b2
+				if (i==75) {
+					Zotero.DB.query("DROP TABLE IF EXISTS translatorCache");
+					Zotero.DB.query("CREATE TABLE translatorCache (\n	leafName TEXT PRIMARY KEY,\n	translatorJSON TEXT,\n	code TEXT,\n	lastModifiedTime INT\n)");
+				}
+				
 				Zotero.wait();
 			}
 			
diff --git a/system.sql b/system.sql
@@ -198,14 +198,6 @@ CREATE TABLE transactionLog (
     FOREIGN KEY (transactionID) REFERENCES transactions(transactionID)
 );
 
-DROP TABLE IF EXISTS translatorCache;
-CREATE TABLE translatorCache (
-	leafName TEXT PRIMARY KEY,
-	translatorJSON TEXT,
-	code TEXT,
-	lastModifiedTime INT
-);
-
 -- unused
 INSERT INTO "fieldFormats" VALUES(1, '.*', 0);
 INSERT INTO "fieldFormats" VALUES(2, '[0-9]*', 1);
diff --git a/userdata.sql b/userdata.sql
@@ -1,4 +1,4 @@
--- 74
+-- 75
 
 -- Copyright (c) 2009 Center for History and New Media
 --                    George Mason University, Fairfax, Virginia, USA
@@ -381,4 +381,11 @@ CREATE TABLE customBaseFieldMappings (
     FOREIGN KEY (customFieldID) REFERENCES fields(customFieldID)
 );
 CREATE INDEX customBaseFieldMappings_baseFieldID ON customBaseFieldMappings(baseFieldID);
-CREATE INDEX customBaseFieldMappings_customFieldID ON customBaseFieldMappings(customFieldID);
-\ No newline at end of file
+CREATE INDEX customBaseFieldMappings_customFieldID ON customBaseFieldMappings(customFieldID);
+
+CREATE TABLE translatorCache (
+	leafName TEXT PRIMARY KEY,
+	translatorJSON TEXT,
+	code TEXT,
+	lastModifiedTime INT
+);
+\ No newline at end of file