support for logging the SQL queries generated, instead

of the progress messages during database installation git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@3715 f5dc347c-c33d-0410-90a0-b07cc1902cb9
mantisbt · Jul 20, 2005 · 4d452dd · 4d452dd
1 parent f38979e
commit 4d452dd
Showing 1 changed file with 37 additions and 13 deletions.
diff --git a/admin/install.php b/admin/install.php
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: install.php,v 1.9 2005-07-17 13:39:30 vboctor Exp $
+	# $Id: install.php,v 1.10 2005-07-20 23:49:02 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -82,6 +82,7 @@ function InsertData( $p_table, $p_data ) {
 	$f_db_password = gpc_get( 'db_password', config_get( 'db_password', '' ) );
 	$f_admin_username = gpc_get( 'admin_username', '' );
 	$f_admin_password = gpc_get( 'admin_password', '');
+	$f_log_queries = gpc_get_bool( 'log_queries', false );
 ?>
 <html>
 <head>
@@ -371,6 +372,14 @@ function InsertData( $p_table, $p_data ) {
 </tr>
 
 <tr>
+	<td>
+		Log SQL Queries
+	</td>
+	<td>
+		<input name="log_queries" type="checkbox" value="1" <?php echo ( $f_log_queries ? 'checked="checked"' : '' ) ?>"></input>
+	</td>
+</tr>
+
 <tr>
 	<td>
 		Attempt Installation
@@ -447,30 +456,43 @@ function InsertData( $p_table, $p_data ) {
 		$t_last_update = config_get( 'database_version', -1 );
 		$lastid = sizeof( $upgrade ) - 1;
 		$i = $t_last_update + 1;
+
+		if ( $f_log_queries ) {
+			echo '<tr><td bgcolor="#ffffff" col_span="2"> Progress Suppressed, SQL Queries follow <pre>';
+		}
 
 		while ( ( $i <= $lastid ) && ! $g_failed ) {
-?>
-<tr>
-	<td bgcolor="#ffffff">
-		Create Schema ( <?php echo $upgrade[$i][0] . ' on ' . $upgrade[$i][1][0]?> )
-	</td>
-<?php
+			if ( ! $f_log_queries ) {
+				echo '<tr><td bgcolor="#ffffff">Create Schema ( ' . $upgrade[$i][0] . ' on ' . $upgrade[$i][1][0] . ' )</td>';
+			}
+
 			$dict = NewDataDictionary($g_db);
 			if ( $upgrade[$i][0] == 'InsertData' ) {
 				$sqlarray = call_user_func_array( $upgrade[$i][0], $upgrade[$i][1] );
 			} else {
 				$sqlarray = call_user_func_array(Array($dict,$upgrade[$i][0]),$upgrade[$i][1]);
 			}
+			if ( $f_log_queries ) {
+				foreach ( $sqlarray as $sql ) {
+					echo htmlentities( $sql ) . "\r\n\r\n";
+				}
+			}
 			$ret = $dict->ExecuteSQLArray($sqlarray);
-			if ( $ret == 2 ) {
-				print_test_result( GOOD );
-				config_set( 'database_version', $i );
-			} else {
-				print_test_result( BAD, true, $sqlarray[0] . '<br />' . $g_db->ErrorMsg() );
+			if ( ! $f_log_queries ) {
+				if ( $ret == 2 ) {
+					print_test_result( GOOD );
+					config_set( 'database_version', $i );
+				} else {
+					print_test_result( BAD, true, $sqlarray[0] . '<br />' . $g_db->ErrorMsg() );
+				}
+				echo '</tr>';
 			}
-			echo '</tr>';
 			$i++;
 		}
+		if ( $f_log_queries ) {
+			echo '</pre></br /></td></tr>';
+		}
+
 	}
 	if ( false == $g_failed ) {
 		$t_install_state++;
@@ -493,6 +515,7 @@ function InsertData( $p_table, $p_data ) {
 		<input name="db_password" type="hidden" value="<?php echo $f_db_password ?>"></input>
 		<input name="admin_username" type="hidden" value="<?php echo $f_admin_username ?>"></input>
 		<input name="admin_password" type="hidden" value="<?php echo $f_admin_password ?>"></input>
+		<input name="log_queries" type="hidden" value="<?php echo ( $f_log_queries ? 1 : 0 ) ?>"></input>
 <?php
 	# must post <input name="install" type="hidden" value="5"></input>
 	# rather than the following line
@@ -621,6 +644,7 @@ function InsertData( $p_table, $p_data ) {
 		<input name="db_password" type="hidden" value="<?php echo $f_db_password ?>"></input>
 		<input name="admin_username" type="hidden" value="<?php echo $f_admin_username ?>"></input>
 		<input name="admin_password" type="hidden" value="<?php echo $f_admin_password ?>"></input>
+		<input name="log_queries" type="hidden" value="<?php echo ( $f_log_queries ? 1 : 0 ) ?>"></input>
 		<input name="retry" type="submit" value="Retry"></input>
 	</td>
 </tr>