Install: pgsql bool check now handles nullable columns

Issue #16392
mantisbt · Mar 24, 2014 · ddba1d9 · ddba1d9
1 parent e2e0a9d
commit ddba1d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/admin/install.php b/admin/install.php
@@ -868,11 +868,12 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
 				# Convert the columns
 				foreach( $ret as $row ) {
 					extract( $row );
+					$t_null = $is_nullable ? 'NULL' : 'NOT NULL';
+					$t_default = is_null( $column_default ) ? 'NULL' : $column_default;
 					$sqlarray = $dict->AlterColumnSQL(
 						$table_name,
-						"$column_name L NOTNULL DEFAULT '$column_default'"
+						"$column_name L $t_null DEFAULT $t_default"
 					);
-
 					print_test(
 						"Converting column $table_name.$column_name to BOOLEAN",
 						2 == $dict->ExecuteSQLArray( $sqlarray, false ),

diff --git a/core/install_helper_functions_api.php b/core/install_helper_functions_api.php
@@ -122,7 +122,7 @@ function check_pgsql_bool_columns() {
 			. implode($t_columns, "', '")
 			. "' ) OR\n";
 	}
-	$sql = "SELECT table_name, column_name, data_type, column_default
+	$sql = "SELECT table_name, column_name, data_type, column_default, is_nullable
 		FROM information_schema.columns
 		WHERE
 			table_catalog = '$f_database_name' AND