suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed user.js to userdata.js

Browse Source
This commit is contained in:
Dan Stillman 2006-10-04 23:37:15 +00:00
parent 088027d640
commit 74dbdec49b
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
chrome/content/zotero/xpcom/schema.js
View File

@ -33,26 +33,38 @@ Zotero.Schema = new function(){
* Checks if the DB schema exists and is up-to-date, updating if necessary * Checks if the DB schema exists and is up-to-date, updating if necessary
*/ */
function updateSchema(){ function updateSchema(){
var dbVersion = _getDBVersion('user'); var dbVersion = _getDBVersion('userdata');
// 'schema' check is for old (<= 1.0b1) schema system // 'schema' check is for old (<= 1.0b1) schema system,
if (!dbVersion && !_getDBVersion('schema')){ // 'user' is for pre-1.0b2 'user' table
if (!dbVersion && !_getDBVersion('schema') && !_getDBVersion('user')){
Zotero.debug('Database does not exist -- creating\n'); Zotero.debug('Database does not exist -- creating\n');
_initializeSchema(); _initializeSchema();
return; return;
} }
// Old schema system var schemaVersion = _getSchemaSQLVersion('userdata');
if (!dbVersion){
dbVersion = 0;
}
var schemaVersion = _getSchemaSQLVersion('user');
Zotero.DB.beginTransaction(); Zotero.DB.beginTransaction();
try { try {
_migrateUserSchema(dbVersion); // Old schema system
if (!dbVersion){
// Check for pre-1.0b2 'user' table
var user = _getDBVersion('user');
if (user)
{
dbVersion = user;
var sql = "UPDATE version SET schema=? WHERE schema=?";
Zotero.DB.query(sql, ['userdata', 'user']);
}
else
{
dbVersion = 0;
}
}
_migrateUserDataSchema(dbVersion);
_updateSchema('system'); _updateSchema('system');
_updateSchema('scrapers'); _updateSchema('scrapers');
@ -299,8 +311,8 @@ Zotero.Schema = new function(){
function _initializeSchema(){ function _initializeSchema(){
Zotero.DB.beginTransaction(); Zotero.DB.beginTransaction();
try { try {
Zotero.DB.query(_getSchemaSQL('user')); Zotero.DB.query(_getSchemaSQL('userdata'));
_updateDBVersion('user', _getSchemaSQLVersion('user')); _updateDBVersion('userdata', _getSchemaSQLVersion('userdata'));
Zotero.DB.query(_getSchemaSQL('system')); Zotero.DB.query(_getSchemaSQL('system'));
_updateDBVersion('system', _getSchemaSQLVersion('system')); _updateDBVersion('system', _getSchemaSQLVersion('system'));
@ -478,20 +490,20 @@ Zotero.Schema = new function(){
/* /*
* Migrate user schema from an older version, preserving data * Migrate user data schema from an older version, preserving data
*/ */
function _migrateUserSchema(fromVersion){ function _migrateUserDataSchema(fromVersion){
toVersion = _getSchemaSQLVersion('user'); toVersion = _getSchemaSQLVersion('userdata');
if (fromVersion==toVersion){ if (fromVersion==toVersion){
return false; return false;
} }
if (fromVersion > toVersion){ if (fromVersion > toVersion){
throw("Zotero user DB version is newer than SQL file"); throw("Zotero user data DB version is newer than SQL file");
} }
Zotero.debug('Updating user tables from version ' + fromVersion + ' to ' + toVersion); Zotero.debug('Updating user data tables from version ' + fromVersion + ' to ' + toVersion);
Zotero.DB.beginTransaction(); Zotero.DB.beginTransaction();
@ -515,7 +527,7 @@ Zotero.Schema = new function(){
} }
} }
_updateSchema('user'); _updateSchema('userdata');
Zotero.DB.commitTransaction(); Zotero.DB.commitTransaction();
} }
catch(e){ catch(e){

0
user.sql → userdata.sql
View File