get rid of unused table tiki_blog_activity on R1 to R2 upgrade

1 files changed, 7 insertions, 5 deletions

diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index e32c9aa..696e04c 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -9,6 +9,9 @@ $upgrades = array(
 	'BWR1' => array(
 		'BWR2' => array(
 array( 'DATADICT' => array(
+	array( 'DROPTABLE' => array(
+		'tiki_blog_activity'
+	)),
 	array( 'RENAMECOLUMN' => array(
 		'tiki_blogs' => array(
 			'`public`' => '`is_public` C(1)',
@@ -26,7 +29,6 @@ array( 'DATADICT' => array(
 	// de-tikify tables
 	array( 'RENAMETABLE' => array(
 		'tiki_blogs' => 'blogs',
-		'tiki_blog_activity' => 'blog_activity',
 		'tiki_blog_posts' => 'blog_posts',
 	)),
 	array( 'CREATE' => array (
@@ -39,7 +41,7 @@ array( 'DATADICT' => array(
 				, CONSTRAINT `blogs_posts_map_post_ref` FOREIGN KEY (`post_content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content` (`content_id`)
 				, CONSTRAINT `blogs_posts_map_blog_ref` FOREIGN KEY (`blog_content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content` (`content_id`)'
 		",
-	)),		
+	)),
 	array( 'RENAMESEQUENCE' => array(
 		"tiki_blog_posts_post_id_seq" => "blog_posts_post_id_seq",
 	)),
@@ -57,7 +59,7 @@ array( 'PHP' => '
 			$contentHash = array();
 			$blogId = $rs->fields["blog_id"];
 			$conId = $gBitDb->GenID( "liberty_content_id_seq" );
-error_log( $conId."->".$blogId );			
+error_log( $conId."->".$blogId );
 			$contentHash["content_id"] = $conId;
 			$contentHash["content_type_guid"] = BITBLOG_CONTENT_TYPE_GUID;
 			$contentHash["user_id"] = $rs->fields["user_id"];
@@ -74,8 +76,8 @@ error_log( $conId."->".$blogId );
 			$gBitSystem->mDb->query( "UPDATE `'.BIT_DB_PREFIX.'blogs` SET `content_id`=? WHERE `blog_id`=? ", array( $conId, $blogId ) );
 			$rs->MoveNext();
 		}
-	}		
-	$query2 = "INSERT INTO `'.BIT_DB_PREFIX.'blogs_posts_map` (`post_content_id`,`blog_content_id`,`date_added`) (SELECT blp.`content_id`, blc.`content_id`, bplc.`created` FROM `'.BIT_DB_PREFIX.'blog_posts` blp INNER JOIN `'.BIT_DB_PREFIX.'liberty_content` bplc ON(blp.`content_id`=bplc.`content_id`) INNER JOIN `'.BIT_DB_PREFIX.'blogs` bl ON(blp.`blog_id`=bl.`blog_id`) INNER JOIN `'.BIT_DB_PREFIX.'liberty_content` blc ON(bl.`content_id`=blc.`content_id`))";	
+	}
+	$query2 = "INSERT INTO `'.BIT_DB_PREFIX.'blogs_posts_map` (`post_content_id`,`blog_content_id`,`date_added`) (SELECT blp.`content_id`, blc.`content_id`, bplc.`created` FROM `'.BIT_DB_PREFIX.'blog_posts` blp INNER JOIN `'.BIT_DB_PREFIX.'liberty_content` bplc ON(blp.`content_id`=bplc.`content_id`) INNER JOIN `'.BIT_DB_PREFIX.'blogs` bl ON(blp.`blog_id`=bl.`blog_id`) INNER JOIN `'.BIT_DB_PREFIX.'liberty_content` blc ON(bl.`content_id`=blc.`content_id`))";
 	$gBitSystem->mDb->query( $query2 );
 	$query3 = $gBitDb->getOne("SELECT MAX(blog_id) FROM `'.BIT_DB_PREFIX.'blogs`");
 	$tempId = $gBitDb->mDb->GenID("blogs_blog_id_seq", $query3);