diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2006-05-06 22:03:05 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2006-05-06 22:03:05 +0000 |
| commit | b349ac5d1e5f33990007bb6de1cd617550abbefb (patch) | |
| tree | 79ff361198f3e41ae604e29e2e67eb8c10587a33 | |
| parent | 1da5f824e7d7ac361a86b7e1bec1ccdfdcea3583 (diff) | |
| download | pigeonholes-b349ac5d1e5f33990007bb6de1cd617550abbefb.tar.gz pigeonholes-b349ac5d1e5f33990007bb6de1cd617550abbefb.tar.bz2 pigeonholes-b349ac5d1e5f33990007bb6de1cd617550abbefb.zip | |
more work on R1 to R2 upgrade process - basic upgrade works with only minor errors
| -rw-r--r-- | admin/schema_inc.php | 6 | ||||
| -rw-r--r-- | admin/upgrade_inc.php | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php index 48b5da4..a97daf8 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -4,9 +4,9 @@ $tables = array( 'pigeonholes' => " content_id I4 NOTNULL PRIMARY, structure_id I4 NOTNULL PRIMARY - CONSTRAINT ', - CONSTRAINT `pigeonholes_content_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` ), - CONSTRAINT `pigeonholes_structure_ref` FOREIGN KEY (`structure_id`) REFERENCES `".BIT_DB_PREFIX."liberty_structures`( `structure_id` )' + CONSTRAINT ' + , CONSTRAINT `pigeonholes_content_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` ) + , CONSTRAINT `pigeonholes_structure_ref` FOREIGN KEY (`structure_id`) REFERENCES `".BIT_DB_PREFIX."liberty_structures`( `structure_id` )' ", 'pigeonhole_members' => " parent_id I4 NOTNULL PRIMARY, diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index a901893..e2e2919 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -5,14 +5,13 @@ global $gBitSystem, $gUpgradeFrom, $gUpgradeTo; $upgrades = array( 'BWR1' => array( 'BWR2' => array( - // 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`" ); if( !empty( $pigeonhole_settings ) ) { foreach( $pigeonhole_settings as $store ) { - $query = "INSERT INTO `".BIT_DB_PREFIX."liberty_content_prefs` (`content_id`,`pref_name`,`value`) VALUES(?, ?, ?)"; + $query = "INSERT INTO `".BIT_DB_PREFIX."liberty_content_prefs` (`content_id`,`pref_name`,`pref_value`) VALUES(?, ?, ?)"; $result = $this->mDb->query( $query, $store ); } } @@ -38,12 +37,12 @@ array( 'DATADICT' => array( // 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` )", + "ALTER TABLE `".BIT_DB_PREFIX."pigeonholes` ADD CONSTRAINT `pigeonholes_content_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )", + "ALTER TABLE `".BIT_DB_PREFIX."pigeonholes` ADD CONSTRAINT `pigeonholes_structure_ref` FOREIGN KEY (`structure_id`) REFERENCES `".BIT_DB_PREFIX."liberty_structures`( `structure_id` )", + "ALTER TABLE `".BIT_DB_PREFIX."pigeonholes_members` ADD CONSTRAINT `pigeonhole_members_parent_ref` FOREIGN KEY (`parent_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )", + "ALTER TABLE `".BIT_DB_PREFIX."pigeonholes_members` ADD CONSTRAINT `pigeonhole_members_content_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )", )), ), - ) ) ); |