diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2006-04-05 13:30:31 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2006-04-05 13:30:31 +0000 |
| commit | 69c48ce3e78df188ae3eab99b0471a88e6ad92f4 (patch) | |
| tree | ecffb319928e3702ebcd932b1866dfe6429b0fe3 /admin | |
| parent | 268b8d46a49c8989ab5392244085261abbe4f96b (diff) | |
| download | pigeonholes-69c48ce3e78df188ae3eab99b0471a88e6ad92f4.tar.gz pigeonholes-69c48ce3e78df188ae3eab99b0471a88e6ad92f4.tar.bz2 pigeonholes-69c48ce3e78df188ae3eab99b0471a88e6ad92f4.zip | |
tonnes of upgrader error sqashes - liberty_content_links still remain to be dealt with
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/upgrade_inc.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index b9fb035..93f4d2f 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -6,10 +6,10 @@ $upgrades = array( 'BWR1' => array( 'BWR2' => array( -// transfer all the settings into liberty_content_prefs +// transfer all the pigeonhole settings into liberty_content_prefs array( 'PHP' => ' global $gBitSystem; - $pigeonhole_settings = $gBitSystem->mDb->getAssoc( "SELECT `content_id`, `name`, `value` FROM `".BIT_DB_PREFIX."bit_pigeonhole_settings` ); + $pigeonhole_settings = $gBitSystem->mDb->getAssoc( "SELECT `content_id`, `name`, `value` FROM `".BIT_DB_PREFIX."bit_pigeonhole_settings`" ); if( !empty( $pigeonhole_settings ) ) { foreach( $pigeonhole_settings as $store ) { $query = "INSERT INTO `".BIT_DB_PREFIX."liberty_content_prefs` (`content_id`,`name`,`value`) VALUES(?, ?, ?)"; @@ -18,16 +18,6 @@ array( 'PHP' => ' } '), -// add constraints for pgsql -array( 'QUERY' => - array( 'PGSQL' => array( - "ALTER TABLE `".BIT_DB_PREFIX."bit_pigeonholes` ADD CONSTRAINT `bit_pigeonholes_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."tiki_content`( `content_id` )", - "ALTER TABLE `".BIT_DB_PREFIX."bit_pigeonholes` ADD CONSTRAINT `bit_pigeonholes_ref` FOREIGN KEY (`structure_id`) REFERENCES `".BIT_DB_PREFIX."tiki_structures`( `structure_id` )", - "ALTER TABLE `".BIT_DB_PREFIX."bit_pigeonhole_members` ADD CONSTRAINT `bit_pigeonhole_members_ref` FOREIGN KEY (`parent_id`) REFERENCES `".BIT_DB_PREFIX."bit_pigeonholes`( `content_id` )", - "ALTER TABLE `".BIT_DB_PREFIX."bit_pigeonhole_members` ADD CONSTRAINT `bit_pigeonhole_members_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."tiki_content`( `content_id` )", - )), -), - // drop unused columns and tables array( 'DATADICT' => array( // positional data for categories is just odd @@ -44,6 +34,16 @@ array( 'DATADICT' => array( 'bit_pigeonhole_members' => 'pigeonhole_members', )), )), + +// add constraints for pgsql +array( 'QUERY' => + array( 'PGSQL' => array( + "ALTER TABLE `".BIT_DB_PREFIX."pigeonholes` ADD CONSTRAINT `pigeonholes_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )", + "ALTER TABLE `".BIT_DB_PREFIX."pigeonholes` ADD CONSTRAINT `pigeonholes_ref` FOREIGN KEY (`structure_id`) REFERENCES `".BIT_DB_PREFIX."liberty_structures`( `structure_id` )", + "ALTER TABLE `".BIT_DB_PREFIX."pigeonhole_members` ADD CONSTRAINT `pigeonhole_members_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )", + )), +), + ) ) ); |