Removed die on failure of initial updates, add version var to config table

git-svn-id: file:///svn/phpbb/trunk@2096 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Paul S. Owen <psotfx@users.sourceforge.net> 2002-02-12 02:55:23 +0000
committer: Paul S. Owen <psotfx@users.sourceforge.net> 2002-02-12 02:55:23 +0000
commit: e81fa52af2ccb91857f5712ca717c13c653ced33 (patch)
tree: 1cbaf331ba99f02099b1360b2cf00489d823e2fb
parent: 9218b750283f04f25ee96aee3bd5c806081b841f (diff)
download: forums-e81fa52af2ccb91857f5712ca717c13c653ced33.tar
forums-e81fa52af2ccb91857f5712ca717c13c653ced33.tar.gz
forums-e81fa52af2ccb91857f5712ca717c13c653ced33.tar.bz2
forums-e81fa52af2ccb91857f5712ca717c13c653ced33.tar.xz
forums-e81fa52af2ccb91857f5712ca717c13c653ced33.zip
1 files changed, 63 insertions, 75 deletions
diff --git a/phpBB/update_to_RC3.php b/phpBB/update_to_RC3.php
index 1929201b4e..8539da1a09 100644
--- a/phpBB/update_to_RC3.php
+++ b/phpBB/update_to_RC3.php
@@ -12,19 +12,15 @@ switch ( SQL_LAYER )
 {
 	case 'mysql':
 	case 'mysql4':
-/*		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
+		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
 			ADD COLUMN user_session_time int(11) DEFAULT '0' NOT NULL, 
 			ADD COLUMN user_session_page smallint(5) DEFAULT '0' NOT NULL, 
 			ADD INDEX (user_session_time)";
 		$sql[] = "ALTER TABLE " . SEARCH_TABLE . " 
 			MODIFY search_id int(11) NOT NULL";
-		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " 
-			MODIFY topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL";
-		$sql[] = "UPDATE " . THEMES_TABLE . " 
-			SET head_stylesheet = 'subSilver.css' 
-			WHERE template_name = 'subSilver'";
-*/			
+			
 		$sql[] = "ALTER TABLE " . TOPICS_TABLE . "  
+			MODIFY topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,  
 			ADD COLUMN topic_first_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, 
 			ADD INDEX (topic_first_post_id)";
 
@@ -44,7 +40,7 @@ switch ( SQL_LAYER )
 		break;
 
 	case 'postgresql':
-/*		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
+		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
 			ADD COLUMN user_session_time int4";
 		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
 			ADD COLUMN user_session_page int2";
@@ -54,10 +50,7 @@ switch ( SQL_LAYER )
 			ALTER COLUMN user_session_page SET DEFAULT '0'";
 		$sql[] = "CREATE INDEX user_session_time_" . $table_prefix . "users_index 
 			ON " . USERS_TABLE . " (user_session_time)";
-		$sql[] = "UPDATE " . THEMES_TABLE . " 
-			SET head_stylesheet = 'subSilver.css' 
-			WHERE template_name = 'subSilver'";
-*/				
+				
 		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " 
 			ADD COLUMN topic_first_post_id int4";
 		$sql[] = "CREATE INDEX topic_first_post_id_" . $table_prefix . "topics_index 
@@ -91,17 +84,14 @@ switch ( SQL_LAYER )
 
 	case 'mssql-odbc':
 	case 'mssql':
-/*		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
+		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
 			user_session_time int NOT NULL, 
 			user_session_page smallint NOT NULL, 
 			CONSTRAINT [DF_" . $table_prefix . "users_user_session_time] DEFAULT (0) FOR [user_session_time],
 			CONSTRAINT [DF_" . $table_prefix . "users_user_session_page] DEFAULT (0) FOR [user_session_page]";
 		$sql[] = "CREATE INDEX [IX_" . $table_prefix . "users] 
 			ON [" . USERS_TABLE . "]([user_session_time]) ON [PRIMARY]";
-		$sql[] = "UPDATE " . THEMES_TABLE . " 
-			SET head_stylesheet = 'subSilver.css' 
-			WHERE template_name = 'subSilver'";
-*/	
+	
 		$sql[] = "DROP INDEX " . TOPICS_TABLE . ".IX_" . $table_prefix . "topics";
 		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
 			topic_first_post_id int NOT NULL, 
@@ -125,15 +115,12 @@ switch ( SQL_LAYER )
 		break;
 
 	case 'msaccess':
-/*		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
+		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
 			user_session_time int NOT NULL, 
 			user_session_page smallint NOT NULL";
 		$sql[] = "CREATE INDEX user_session_time 
 			ON " . USERS_TABLE . " (user_session_time)";
-		$sql[] = "UPDATE " . THEMES_TABLE . " 
-			SET head_stylesheet = 'subSilver.css' 
-			WHERE template_name = 'subSilver'";
-*/	
+	
 		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
 			topic_first_post_id int NOT NULL";
 		$sql[] = "CREATE INDEX topic_first_post_id 
@@ -159,91 +146,92 @@ switch ( SQL_LAYER )
 		break;
 }
 
-
-
 $errored = false;
 for($i = 0; $i < count($sql); $i++)
 {
-	echo "Running >>> " . $sql[$i];
+	echo "Running :: " . $sql[$i];
 
-	$result = $db->sql_query($sql[$i]);
-	if ( !$result )
+	if ( !($result = $db->sql_query($sql[$i])) )
 	{
 		$errored = true;
 		$error = $db->sql_error();
-		echo " :: <b>FAILED</b> <u>( " . $error['message'] . " )</u><br /><br />\n\n";
+		echo " -> <b>FAILED</b> ---> <u>" . $error['message'] . "</u><br /><br />\n\n";
 	}
 	else
 	{
-		echo " :: <b>COMPLETED</b><br /><br />\n\n";
+		echo " -> <b>COMPLETED</b><br /><br />\n\n";
 	}
 }
 
 if ( $errored )
 {
-	echo "\n<br /><br />Errors occured! Please check and correct issues as required<br />\n";
+	echo "\n<br /><b>Some queries failed! This is probably nothing to worry about, update will attempt to continue. Should this fail you may need to seek help at our development board (see README)</b><br /><br />\n\n";
 }
-else
+
+$sql = "SELECT themes_id 
+	FROM " . THEMES_TABLE . " 
+	WHERE template_name = 'subSilver'";
+if( !($result = $db->sql_query($sql)) )
 {
+	die("Couldn't obtain subSilver id");
+}
 
-	$sql = "SELECT themes_id 
-		FROM " . THEMES_TABLE . " 
-		WHERE template_name = 'subSilver'";
-	if( !($result = $db->sql_query($sql)) )
-	{
-		die("Couldn't obtain subSilver id");
-	}
+if( $row = $db->sql_fetchrow($result) )
+{
+	$theme_id = $row['themes_id'];
 
-	if( $row = $db->sql_fetchrow($result) )
+	$sql = "UPDATE " . THEMES_TABLE . " 
+		SET head_stylesheet = 'subSilver.css', body_background = '', body_bgcolor = 'E5E5E5', body_text = '000000', body_link = '006699', body_vlink = '5493B4', body_alink = '', body_hlink = 'DD6900', tr_color1 = 'EFEFEF', tr_color2 = 'DEE3E7', tr_color3 = 'D1D7DC', tr_class1 = '', tr_class2 = '', tr_class3 = '', th_color1 = '98AAB1', th_color2 = '006699', th_color3 = 'FFFFFF', th_class1 = 'cellpic1.gif', th_class2 = 'cellpic3.gif', th_class3 = 'cellpic2.jpg', td_color1 = 'FAFAFA', td_color2 = 'FFFFFF', td_color3 = '', td_class1 = 'row1', td_class2 = 'row2', td_class3 = '', fontface1 = 'Verdana, Arial, Helvetica, sans-serif', fontface2 = 'Trebuchet MS', fontface3 = 'Courier, ''Courier New'', sans-serif', fontsize1 = 10, fontsize2 = 11, fontsize3 = 12, fontcolor1 = '444444', fontcolor2 = '006600', fontcolor3 = 'FFA34F', span_class1 = '', span_class2 = '', span_class3 = ''
+		WHERE themes_id = $theme_id";
+	if ( !($result = $db->sql_query($sql)) )
 	{
-		$theme_id = $row['themes_id'];
-
-		$sql = "UPDATE " . THEMES_TABLE . " 
-			SET head_stylesheet = '', body_background = '', body_bgcolor = 'E5E5E5', body_text = '000000', body_link = '006699', body_vlink = '5493B4', body_alink = '', body_hlink = 'DD6900', tr_color1 = 'EFEFEF', tr_color2 = 'DEE3E7', tr_color3 = 'D1D7DC', tr_class1 = '', tr_class2 = '', tr_class3 = '', th_color1 = '98AAB1', th_color2 = '006699', th_color3 = 'FFFFFF', th_class1 = 'cellpic1.gif', th_class2 = 'cellpic3.gif', th_class3 = 'cellpic2.jpg', td_color1 = 'FAFAFA', td_color2 = 'FFFFFF', td_color3 = '', td_class1 = 'row1', td_class2 = 'row2', td_class3 = '', fontface1 = 'Verdana, Arial, Helvetica, sans-serif', fontface2 = 'Trebuchet MS', fontface3 = 'Courier, ''Courier New'', sans-serif', fontsize1 = 10, fontsize2 = 11, fontsize3 = 12, fontcolor1 = '444444', fontcolor2 = '006600', fontcolor3 = 'FFA34F', span_class1 = '', span_class2 = '', span_class3 = ''
-			WHERE themes_id = $theme_id";
-		if ( !($result = $db->sql_query($sql)) )
-		{
-			die("Couldn't update subSilver theme");
-		}
-
-		$sql = "INSERT INTO " . THEMES_NAME_TABLE . " (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, tr_class1_name, tr_class2_name, tr_class3_name, th_color1_name, th_color2_name, th_color3_name, th_class1_name, th_class2_name, th_class3_name, td_color1_name, td_color2_name, td_color3_name, td_class1_name, td_class2_name, td_class3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, span_class1_name, span_class2_name, span_class3_name) 
-			VALUES ($theme_id, 'The lightest row colour', 'The medium row color', 'The darkest row colour', '', '', '', 'Border round the whole page', 'Outer table border', 'Inner table border', 'Silver gradient picture', 'Blue gradient picture', 'Fade-out gradient on index', 'Background for quote boxes', 'All white areas', '', 'Background for topic posts', '2nd background for topic posts', '', 'Main fonts', 'Additional topic title font', 'Form fonts', 'Smallest font size', 'Medium font size', 'Normal font size (post body etc)', 'Quote & copyright text', 'Code text colour', 'Main table header text colour', '', '', '')";
-		if ( !($result = $db->sql_query($sql)) )
-		{
-			echo "WARNING >> Couldn't insert subSilver name info";
-		}
+		die("Couldn't update subSilver theme");
 	}
 
-	$sql = "SELECT MIN(post_id) AS first_post_id, topic_id
-		FROM " . POSTS_TABLE . "
-		GROUP BY topic_id
-		ORDER BY topic_id ASC";
+	$sql = "INSERT INTO " . THEMES_NAME_TABLE . " (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, tr_class1_name, tr_class2_name, tr_class3_name, th_color1_name, th_color2_name, th_color3_name, th_class1_name, th_class2_name, th_class3_name, td_color1_name, td_color2_name, td_color3_name, td_class1_name, td_class2_name, td_class3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, span_class1_name, span_class2_name, span_class3_name) 
+		VALUES ($theme_id, 'The lightest row colour', 'The medium row color', 'The darkest row colour', '', '', '', 'Border round the whole page', 'Outer table border', 'Inner table border', 'Silver gradient picture', 'Blue gradient picture', 'Fade-out gradient on index', 'Background for quote boxes', 'All white areas', '', 'Background for topic posts', '2nd background for topic posts', '', 'Main fonts', 'Additional topic title font', 'Form fonts', 'Smallest font size', 'Medium font size', 'Normal font size (post body etc)', 'Quote & copyright text', 'Code text colour', 'Main table header text colour', '', '', '')";
 	if ( !($result = $db->sql_query($sql)) )
 	{
-		die("Couldn't obtain first post id list");
+		echo "WARNING >> Couldn't insert subSilver name info<br />\n";
 	}
+}
+
+$sql = "SELECT MIN(post_id) AS first_post_id, topic_id
+	FROM " . POSTS_TABLE . "
+	GROUP BY topic_id
+	ORDER BY topic_id ASC";
+if ( !($result = $db->sql_query($sql)) )
+{
+	die("Couldn't obtain first post id list");
+}
 
-	if ( $row = $db->sql_fetchrow($result) )
+if ( $row = $db->sql_fetchrow($result) )
+{
+	do
 	{
-		do
+		$post_id = $row['first_post_id'];
+		$topic_id = $row['topic_id'];
+
+		$sql = "UPDATE " . TOPICS_TABLE . " 
+			SET topic_first_post_id = $post_id 
+			WHERE topic_id = $topic_id";
+		if ( !$db->sql_query($sql) )
 		{
-			$post_id = $row['first_post_id'];
-			$topic_id = $row['topic_id'];
-
-			$sql = "UPDATE " . TOPICS_TABLE . " 
-				SET topic_first_post_id = $post_id 
-				WHERE topic_id = $topic_id";
-			if ( !$db->sql_query($sql) )
-			{
-				die("Couldn't update topic first post id in topic :: $topic_id");
-			}
+			die("Couldn't update topic first post id in topic :: $topic_id");
 		}
-		while ( $row = $db->sql_fetchrow($result) );
 	}
-	
-	echo "\n<br /><br />\nCOMPLETE! Please delete this file before continuing!<br />\n";
+	while ( $row = $db->sql_fetchrow($result) );
 }
 
+$sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value )
+	VALUES ('version', 'RC-3')";
+if ( !$db->sql_query($sql) )
+{
+	die("Couldn't insert new config var");
+}
+
+echo "\n<br /><br />\n<b>COMPLETE! Please delete this file before continuing!</b><br />\n";
+
 ?>
 </body>
 </html>
 \ No newline at end of file
author	Paul S. Owen <psotfx@users.sourceforge.net>	2002-02-12 02:55:23 +0000
committer	Paul S. Owen <psotfx@users.sourceforge.net>	2002-02-12 02:55:23 +0000
commit	e81fa52af2ccb91857f5712ca717c13c653ced33 (patch)
tree	1cbaf331ba99f02099b1360b2cf00489d823e2fb
parent	9218b750283f04f25ee96aee3bd5c806081b841f (diff)
download	forums-e81fa52af2ccb91857f5712ca717c13c653ced33.tar forums-e81fa52af2ccb91857f5712ca717c13c653ced33.tar.gz forums-e81fa52af2ccb91857f5712ca717c13c653ced33.tar.bz2 forums-e81fa52af2ccb91857f5712ca717c13c653ced33.tar.xz forums-e81fa52af2ccb91857f5712ca717c13c653ced33.zip