From 3b713d22d1e6573a127a91e3fa51fe7620c23bb1 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Wed, 16 Feb 2005 04:57:27 +0000
Subject: [PATCH] fixing some more bugs

---
 docs/upgrades/upgrade_6.2.11-6.3.0.pl | 15 +++++++++++----
 lib/WebGUI/SQL.pm                     |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/docs/upgrades/upgrade_6.2.11-6.3.0.pl b/docs/upgrades/upgrade_6.2.11-6.3.0.pl
index b0a2bb84a..4c2a60dd7 100644
--- a/docs/upgrades/upgrade_6.2.11-6.3.0.pl
+++ b/docs/upgrades/upgrade_6.2.11-6.3.0.pl
@@ -1812,6 +1812,7 @@ sub walkTree {
 
 sub migrateForum {
 	my $originalId = shift;
+	print "\t\t\t\t Migrating forum $originalId\n";
 	my $newParentId = shift;
 	my $newParentLineage = shift;
 	my $rank = shift;
@@ -1873,6 +1874,7 @@ sub migrateForum {
 		styleTemplateId=>$styleId,
 		printableStyleTemplateId=>$printId
 		},undef,$newId);
+	print "\t\t\t\t\t Migrating subscriptions for forum $originalId\n";
 	my $subscriptionGroup = WebGUI::Group->new("new");
 	$subscriptionGroup->description("The group to store subscriptions for the collaboration system $newId");
 	$subscriptionGroup->name($newId);
@@ -1917,10 +1919,12 @@ sub migrateForum {
 		},undef,$newId);
 	my %oldestForumPost;
 	my $ratingprep = WebGUI::SQL->prepare("insert into Post_rating (assetId, userId, ipAddress, dateOfRating, rating) values (?,?,?,?,?)");
+	print "\t\t\t\t\t Migrating threads for forum $originalId\n";
 	my $threads = WebGUI::SQL->read("select * from forumThread left join forumPost on forumThread.rootPostId=forumPost.forumPostId where
 		forumThread.forumId=".quote($originalId));
 	my $threadRank = 1;
 	while (my ($thread) = $threads->hashRef) {
+		print "\t\t\t\t\t\t Migrating thread ".$thread->{forumThreadId}."\n";
 		my $threadLineage = $lineage.sprintf("%06d",$threadRank);
 		my $threadId = WebGUI::SQL->setRow("asset","assetId",{
 			assetId=>"new",
@@ -1973,10 +1977,12 @@ sub migrateForum {
 			subscriptionGroupId=>$threadSubscriptionGroup->groupId
 			}, undef, $threadId);
 		# we're going to give up hierarchy during the upgrade for the sake of simplicity
+		print "\t\t\t\t\t\t Migrating posts for thread ".$thread->{forumThreadId}."\n";
 		my %oldestThreadPost;
 		my $posts = WebGUI::SQL->read("select * from forumPost where forumThreadId=".quote($thread->{forumThreadId})." and parentId<>''");
 		my $postRank = 1;
 		while (my $post = $posts->hashRef) {
+			print "\t\t\t\t\t\t\t Migrating post ".$post->{forumPostId}."\n";
 			my $postId = WebGUI::SQL->setRow("asset","assetId",{
 				assetId=>"new",
 				parentId=>$threadId,
@@ -2011,11 +2017,12 @@ sub migrateForum {
 				contentType=>$post->{contentType},
 				rating=>$post->{rating}
 				},undef,$postId);
-			my $sth = WebGUI::SQL->read("select userId,ipAddress,dateOfRating,rating from forumPostRating where forumPostId=".quote($post->{forumPostId}));
-			while (my ($uid,$ip,$date,$rating) = $sth->array) {
-				$ratingprep->execute($postId,$uid,$ip,$date,$rating);
+			print "\t\t\t\t\t\t\t\t Migrating ratings for post ".$post->{forumPostId}."\n";
+			my $ratings = WebGUI::SQL->read("select userId,ipAddress,dateOfRating,rating from forumPostRating where forumPostId=".quote($post->{forumPostId}));
+			while (my ($uid,$ip,$date,$rating) = $ratings->array) {
+				$ratingprep->execute([$postId,$uid,$ip,$date,$rating]);
 			}
-			$sth->finish;
+			$ratings->finish;
 			$postRank++;
 		}
 		$posts->finish;
diff --git a/lib/WebGUI/SQL.pm b/lib/WebGUI/SQL.pm
index 6e060f0a8..163a7564d 100644
--- a/lib/WebGUI/SQL.pm
+++ b/lib/WebGUI/SQL.pm
@@ -279,7 +279,7 @@ sub execute {
 	my $self = shift;
 	my $placeholders = shift || [];
 	my $sql = $self->{_sql};
-	$self->{_sth}->execute(@$placeholders) or WebGUI::ErrorHandler::fatalError("Couldn't execute prepared statement: $sql  Root cause: ". DBI->errstr);
+	$self->{_sth}->execute(@{$placeholders}) or WebGUI::ErrorHandler::fatalError("Couldn't execute prepared statement: $sql  Root cause: ". DBI->errstr);
 }