Ticket #1278: 07-db-schema.patch

File 07-db-schema.patch, 9.9 KB (added by fbennett, 8 years ago)

  • chrome/content/zotero/xpcom/schema.js 

    diff -r -u zotero-trunk.orig/chrome/content/zotero/xpcom/schema.js zotero-trunk/chrome/content/zotero/xpcom/schema.js
    old new  
    4141                var dbVersion = _getDBVersion('userdata'); 
    4242                var schemaVersion = _getSchemaSQLVersion('userdata'); 
    4343                 
     44                var lexMods = Zotero.DB.valueQuery("SELECT version FROM version WHERE schema='lexmods'"); 
     45                if ( ! lexMods && dbVersion > 46) { 
     46                        // if ( true ) { 
     47                        alert("Zotero LeX\nMaking additional fields available for\nnewspaper, journal, book and chapter types"); 
     48 
     49                        Zotero.DB.beginTransaction(); 
     50 
     51                        // add "sponsor" creator field to books and chapters 
     52                        Zotero.DB.query("DELETE from itemTypeCreatorTypes WHERE itemTypeID=2 AND creatorTypeID=12"); 
     53                        Zotero.DB.query("INSERT INTO itemTypeCreatorTypes VALUES(2,12,0)"); 
     54                        Zotero.DB.query("DELETE from itemTypeCreatorTypes WHERE itemTypeID=3 AND creatorTypeID=12"); 
     55                        Zotero.DB.query("INSERT INTO itemTypeCreatorTypes VALUES(3,12,0)"); 
     56 
     57                        // add type field (i.e. Comment, Book Review) to journal article type 
     58                        Zotero.DB.query("DELETE from itemTypeFields WHERE itemTypeID=4"); 
     59                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 110, NULL, 1)"); 
     60                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 69, NULL, 2)"); 
     61                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 90, NULL, 3)"); 
     62                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 12, NULL, 4)"); 
     63                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 4, NULL, 5)"); 
     64                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 5, NULL, 6)"); 
     65                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 10, NULL, 7)"); 
     66                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 14, NULL, 8)"); 
     67                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 3, NULL, 9)"); 
     68                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 28, NULL, 10)"); 
     69                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 29, NULL, 11)"); 
     70                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 25, NULL, 12)"); 
     71                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 87, NULL, 13)"); 
     72                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 26, NULL, 14)"); 
     73                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 13, NULL, 15)"); 
     74                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 116, NULL, 16)"); 
     75                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 1, NULL, 17)"); 
     76                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 27, NULL, 18)"); 
     77                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 18, NULL, 19)"); 
     78                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 19, NULL, 20)"); 
     79                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 62, NULL, 21)"); 
     80                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 2, NULL, 22)"); 
     81                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (4, 22, NULL, 23)"); 
     82 
     83                        // add place of publication field to newspaper type 
     84                        Zotero.DB.query("DELETE from itemTypeFields WHERE itemTypeID=6"); 
     85                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 110, NULL, 1)"); 
     86                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 90, NULL, 2)"); 
     87                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 12, NULL, 3)"); 
     88                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 6, NULL, 4)"); 
     89                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 7, NULL, 5)"); 
     90                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 14, NULL, 6)"); 
     91                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 15, NULL, 7)"); 
     92                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 10, NULL, 8)"); 
     93                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 87, NULL, 9)"); 
     94                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 116, NULL, 10)"); 
     95                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 13, NULL, 11)"); 
     96                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 1, NULL, 12)"); 
     97                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 27, NULL, 13)"); 
     98                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 18, NULL, 14)"); 
     99                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 19, NULL, 15)"); 
     100                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 62, NULL, 16)"); 
     101                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 2, NULL, 17)"); 
     102                        Zotero.DB.query("INSERT INTO itemTypeFields VALUES (6, 22, NULL, 18)"); 
     103 
     104                        Zotero.DB.query("DELETE from version WHERE schema='lexmods'"); 
     105                        Zotero.DB.query("INSERT INTO version VALUES ('lexmods', 1)"); 
     106 
     107                        Zotero.DB.commitTransaction(); 
     108                } 
     109 
    44110                return dbVersion && (dbVersion < schemaVersion); 
    45111        } 
    46112         

  • zotero-trunk 

    diff -r -u zotero-trunk.orig/system.sql zotero-trunk/system.sql
    old new  
    319319INSERT INTO itemTypeFields VALUES (3, 2, NULL, 21); 
    320320INSERT INTO itemTypeFields VALUES (3, 22, NULL, 22); 
    321321INSERT INTO itemTypeFields VALUES (4, 110, NULL, 1); 
    322 INSERT INTO itemTypeFields VALUES (4, 90, NULL, 2); 
    323 INSERT INTO itemTypeFields VALUES (4, 12, NULL, 3); 
    324 INSERT INTO itemTypeFields VALUES (4, 4, NULL, 4); 
    325 INSERT INTO itemTypeFields VALUES (4, 5, NULL, 5); 
    326 INSERT INTO itemTypeFields VALUES (4, 10, NULL, 6); 
    327 INSERT INTO itemTypeFields VALUES (4, 14, NULL, 7); 
    328 INSERT INTO itemTypeFields VALUES (4, 3, NULL, 8); 
    329 INSERT INTO itemTypeFields VALUES (4, 28, NULL, 9); 
    330 INSERT INTO itemTypeFields VALUES (4, 29, NULL, 10); 
    331 INSERT INTO itemTypeFields VALUES (4, 25, NULL, 11); 
    332 INSERT INTO itemTypeFields VALUES (4, 87, NULL, 12); 
    333 INSERT INTO itemTypeFields VALUES (4, 26, NULL, 13); 
    334 INSERT INTO itemTypeFields VALUES (4, 13, NULL, 14); 
    335 INSERT INTO itemTypeFields VALUES (4, 116, NULL, 15); 
    336 INSERT INTO itemTypeFields VALUES (4, 1, NULL, 16); 
    337 INSERT INTO itemTypeFields VALUES (4, 27, NULL, 17); 
    338 INSERT INTO itemTypeFields VALUES (4, 18, NULL, 18); 
    339 INSERT INTO itemTypeFields VALUES (4, 19, NULL, 19); 
    340 INSERT INTO itemTypeFields VALUES (4, 62, NULL, 20); 
    341 INSERT INTO itemTypeFields VALUES (4, 2, NULL, 21); 
    342 INSERT INTO itemTypeFields VALUES (4, 22, NULL, 22); 
     322INSERT INTO itemTypeFields VALUES (4, 69, NULL, 2); 
     323INSERT INTO itemTypeFields VALUES (4, 90, NULL, 3); 
     324INSERT INTO itemTypeFields VALUES (4, 12, NULL, 4); 
     325INSERT INTO itemTypeFields VALUES (4, 4, NULL, 5); 
     326INSERT INTO itemTypeFields VALUES (4, 5, NULL, 6); 
     327INSERT INTO itemTypeFields VALUES (4, 10, NULL, 7); 
     328INSERT INTO itemTypeFields VALUES (4, 14, NULL, 8); 
     329INSERT INTO itemTypeFields VALUES (4, 3, NULL, 9); 
     330INSERT INTO itemTypeFields VALUES (4, 28, NULL, 10); 
     331INSERT INTO itemTypeFields VALUES (4, 29, NULL, 11); 
     332INSERT INTO itemTypeFields VALUES (4, 25, NULL, 12); 
     333INSERT INTO itemTypeFields VALUES (4, 87, NULL, 13); 
     334INSERT INTO itemTypeFields VALUES (4, 26, NULL, 14); 
     335INSERT INTO itemTypeFields VALUES (4, 13, NULL, 15); 
     336INSERT INTO itemTypeFields VALUES (4, 116, NULL, 16); 
     337INSERT INTO itemTypeFields VALUES (4, 1, NULL, 17); 
     338INSERT INTO itemTypeFields VALUES (4, 27, NULL, 18); 
     339INSERT INTO itemTypeFields VALUES (4, 18, NULL, 19); 
     340INSERT INTO itemTypeFields VALUES (4, 19, NULL, 20); 
     341INSERT INTO itemTypeFields VALUES (4, 62, NULL, 21); 
     342INSERT INTO itemTypeFields VALUES (4, 2, NULL, 22); 
     343INSERT INTO itemTypeFields VALUES (4, 22, NULL, 23); 
    343344INSERT INTO itemTypeFields VALUES (5, 110, NULL, 1); 
    344345INSERT INTO itemTypeFields VALUES (5, 90, NULL, 2); 
    345346INSERT INTO itemTypeFields VALUES (5, 12, NULL, 3); 
    … …  
    361362INSERT INTO itemTypeFields VALUES (6, 90, NULL, 2); 
    362363INSERT INTO itemTypeFields VALUES (6, 12, NULL, 3); 
    363364INSERT INTO itemTypeFields VALUES (6, 6, NULL, 4); 
    364 INSERT INTO itemTypeFields VALUES (6, 14, NULL, 5); 
    365 INSERT INTO itemTypeFields VALUES (6, 15, NULL, 6); 
    366 INSERT INTO itemTypeFields VALUES (6, 10, NULL, 7); 
    367 INSERT INTO itemTypeFields VALUES (6, 87, NULL, 8); 
    368 INSERT INTO itemTypeFields VALUES (6, 116, NULL, 9); 
    369 INSERT INTO itemTypeFields VALUES (6, 13, NULL, 10); 
    370 INSERT INTO itemTypeFields VALUES (6, 1, NULL, 11); 
    371 INSERT INTO itemTypeFields VALUES (6, 27, NULL, 12); 
    372 INSERT INTO itemTypeFields VALUES (6, 18, NULL, 13); 
    373 INSERT INTO itemTypeFields VALUES (6, 19, NULL, 14); 
    374 INSERT INTO itemTypeFields VALUES (6, 62, NULL, 15); 
    375 INSERT INTO itemTypeFields VALUES (6, 2, NULL, 16); 
    376 INSERT INTO itemTypeFields VALUES (6, 22, NULL, 17); 
     365INSERT INTO itemTypeFields VALUES (6, 7, NULL, 5); 
     366INSERT INTO itemTypeFields VALUES (6, 14, NULL, 6); 
     367INSERT INTO itemTypeFields VALUES (6, 15, NULL, 7); 
     368INSERT INTO itemTypeFields VALUES (6, 10, NULL, 8); 
     369INSERT INTO itemTypeFields VALUES (6, 87, NULL, 9); 
     370INSERT INTO itemTypeFields VALUES (6, 116, NULL, 10); 
     371INSERT INTO itemTypeFields VALUES (6, 13, NULL, 11); 
     372INSERT INTO itemTypeFields VALUES (6, 1, NULL, 12); 
     373INSERT INTO itemTypeFields VALUES (6, 27, NULL, 13); 
     374INSERT INTO itemTypeFields VALUES (6, 18, NULL, 14); 
     375INSERT INTO itemTypeFields VALUES (6, 19, NULL, 15); 
     376INSERT INTO itemTypeFields VALUES (6, 62, NULL, 16); 
     377INSERT INTO itemTypeFields VALUES (6, 2, NULL, 17); 
     378INSERT INTO itemTypeFields VALUES (6, 22, NULL, 18); 
    377379INSERT INTO itemTypeFields VALUES (7, 110, NULL, 1); 
    378380INSERT INTO itemTypeFields VALUES (7, 90, NULL, 2); 
    379381INSERT INTO itemTypeFields VALUES (7, 69, NULL, 3); 
    … …  
    913915INSERT INTO itemTypeCreatorTypes VALUES(2,3,0); 
    914916INSERT INTO itemTypeCreatorTypes VALUES(2,4,0); 
    915917INSERT INTO itemTypeCreatorTypes VALUES(2,5,0); 
     918INSERT INTO itemTypeCreatorTypes VALUES(2,12,0); 
    916919INSERT INTO itemTypeCreatorTypes VALUES(3,1,1); 
    917920INSERT INTO itemTypeCreatorTypes VALUES(3,2,0); 
    918921INSERT INTO itemTypeCreatorTypes VALUES(3,3,0); 
    919922INSERT INTO itemTypeCreatorTypes VALUES(3,4,0); 
    920923INSERT INTO itemTypeCreatorTypes VALUES(3,5,0); 
     924INSERT INTO itemTypeCreatorTypes VALUES(3,12,0); 
    921925INSERT INTO itemTypeCreatorTypes VALUES(4,1,1); 
    922926INSERT INTO itemTypeCreatorTypes VALUES(4,2,0); 
    923927INSERT INTO itemTypeCreatorTypes VALUES(4,3,0);