diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2006-04-05 13:30:36 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2006-04-05 13:30:36 +0000 |
| commit | 8c7e0cdb073d829698ea448b87e5c97901e0833b (patch) | |
| tree | 7c465584e866b537ba11f72c653901446ecd76e2 /admin | |
| parent | f3a5faf7b0dbd6456036c254e9ee0dfc3509e4a9 (diff) | |
| download | search-8c7e0cdb073d829698ea448b87e5c97901e0833b.tar.gz search-8c7e0cdb073d829698ea448b87e5c97901e0833b.tar.bz2 search-8c7e0cdb073d829698ea448b87e5c97901e0833b.zip | |
tonnes of upgrader error sqashes - liberty_content_links still remain to be dealt with
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/schema_inc.php | 6 | ||||
| -rw-r--r-- | admin/upgrade_inc.php | 23 |
2 files changed, 21 insertions, 8 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php index ad4fe5d..7d512a8 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -2,20 +2,20 @@ $tables = array( -'searchindex' => " +'search_index' => " searchword C(80) PRIMARY, content_id I4 PRIMARY, i_count I4 NOTNULL DEFAULT '1', last_update I4 NOTNULL ", -'searchsyllable' => " +'search_syllable' => " syllable C(80) PRIMARY, last_used I4 NOTNULL, last_updated I4 NOTNULL ", -'searchwords' => " +'search_words' => " syllable C(80) KEY, searchword C(80) KEY ", diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index 1901d0f..9b4cbdd 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -4,6 +4,19 @@ global $gBitSystem, $gUpgradeFrom, $gUpgradeTo; $upgrades = array( +'BWR1' => array( + 'BWR2' => array( +array( 'DATADICT' => array( + array( 'RENAMETABLE' => array( + 'tiki_searchindex' => 'search_index', + 'tiki_searchsyllable' => 'search_syllable', + 'tiki_search_stats' => 'search_stats', + 'tiki_searchwords' => 'search_words', + )), +)), + ) +), + 'BONNIE' => array( 'BWR1' => array( // STEP 1 - Data is transient, so let's recreate the table with proper multi-column keys @@ -13,11 +26,11 @@ array( 'DATADICT' => array( )), array( 'CREATE' => array ( 'tiki_searchindex' => " - searchword C(80) PRIMARY, - location C(80) PRIMARY, - content_id I4 PRIMARY, - count I4 NOTNULL default '1', - last_update I4 NOTNULL + searchword C(80) PRIMARY, + location C(80) PRIMARY, + content_id I4 PRIMARY, + count I4 NOTNULL default '1', + last_update I4 NOTNULL ", )), )), |