Fix PHP Warning if check_pgsql_bool_columns() fails

If SQL to retrieve column data in information_schema fails, the function returns a string. This string is then used in a foreach loop, triggering a warning.
mantisbt · Sep 22, 2019 · c7f8791 · c7f8791
1 parent 86eb8de
commit c7f8791
Showing 1 changed file with 32 additions and 27 deletions.
diff --git a/admin/install.php b/admin/install.php
@@ -893,40 +893,45 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
 				# Some columns need converting
 				$t_msg = "PostgreSQL: check Boolean columns' actual type";
 				if( is_array( $t_bool_columns ) ) {
+					$t_count = count( $t_bool_columns );
 					print_test(
 						$t_msg,
-						count( $t_bool_columns ) == 0,
+						$t_count == 0,
 						false,
-						count( $t_bool_columns ) . ' columns must be converted to BOOLEAN' );
+						"$t_count columns must be converted to BOOLEAN"
+					);
+
+					# Convert the columns
+					foreach( $t_bool_columns as $t_row ) {
+						/**
+						 * @var string $v_table_name
+						 * @var string $v_column_name
+						 * @var boolean $v_is_nullable
+						 * @var boolean $v_column_default
+						 */
+						extract( $t_row, EXTR_PREFIX_ALL, 'v' );
+
+						$t_null = $v_is_nullable ? 'NULL' : 'NOT NULL';
+						$t_default = is_null( $v_column_default ) ? 'NULL' : $v_column_default;
+						$t_sqlarray = $t_dict->AlterColumnSQL(
+							$v_table_name,
+							$v_column_name . ' L ' . $t_null . ' DEFAULT ' . $t_default
+						);
+						print_test(
+							'Converting column ' . $v_table_name . '.' . $v_column_name . ' to BOOLEAN',
+							2 == $t_dict->ExecuteSQLArray( $t_sqlarray, false ),
+							true,
+							print_r( $t_sqlarray, true )
+						);
+						if( $g_failed ) {
+							# Error occurred, bail out
+							break;
+						}
+					}
 				} else {
 					# We did not get an array => error occurred
 					print_test( $t_msg, false, true, $t_bool_columns );
 				}
-
-				# Convert the columns
-				foreach( $t_bool_columns as $t_row ) {
-					/**
-					 * @var string $v_table_name
-					 * @var string $v_column_name
-					 * @var boolean $v_is_nullable
-					 * @var boolean $v_column_default
-					 */
-					extract( $t_row, EXTR_PREFIX_ALL, 'v' );
-					$t_null = $v_is_nullable ? 'NULL' : 'NOT NULL';
-					$t_default = is_null( $v_column_default ) ? 'NULL' : $v_column_default;
-					$t_sqlarray = $t_dict->AlterColumnSQL(
-						$v_table_name,
-						$v_column_name . ' L ' . $t_null . ' DEFAULT ' . $t_default );
-					print_test(
-						'Converting column ' . $v_table_name . '.' . $v_column_name . ' to BOOLEAN',
-						2 == $t_dict->ExecuteSQLArray( $t_sqlarray, false ),
-						true,
-						print_r( $t_sqlarray, true ) );
-					if( $g_failed ) {
-						# Error occurred, bail out
-						break;
-					}
-				}
 			}
 		}
 		# End of special processing for specific schema versions