Report the types of the fields that differ.

For example, the checkbox label will now say "Change type of field from INT to BIGINT when upgrading" if the type of the field in the database is INT and the type in the schema is BIGINT.
openwebwork · Feb 4, 2025 · edb0ff9 · edb0ff9
1 parent 3089aa8
commit edb0ff9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/WeBWorK/ContentGenerator/CourseAdmin.pm b/lib/WeBWorK/ContentGenerator/CourseAdmin.pm
@@ -2808,7 +2808,11 @@ sub formatReportOnDatabaseTables ($c, $dbStatus, $courseID = undef) {
 											"$courseID.$table.fix_type_fieldIDs" => $key,
 											class                                => 'form-check-input'
 										),
-										$c->maketext('Change type of field when upgrading')
+										$c->maketext(
+											'Change type of field from [_1] to [_2] when upgrading',
+											$fieldInfo{$key}[1],
+											$fieldInfo{$key}[2]
+										)
 									)->join('')
 								)
 							)

diff --git a/lib/WeBWorK/Utils/CourseDBIntegrityCheck.pm b/lib/WeBWorK/Utils/CourseDBIntegrityCheck.pm
@@ -234,10 +234,10 @@ sub checkTableFields {
 		} else {
 			my $data_type = $database_fields{$field_name}[1];
 			$data_type =~ s/\(\d*\)$// if $data_type =~ /^(big|small)?int\(\d*\)$/;
-			$data_type = lc($data_type);
-			my $schema_data_type = lc($db->{$table}{record}->FIELD_DATA->{$field_name}{type} =~ s/ .*$//r);
+			$data_type = uc($data_type);
+			my $schema_data_type = uc($db->{$table}{record}->FIELD_DATA->{$field_name}{type} =~ s/ .*$//r);
 			if ($data_type ne $schema_data_type) {
-				$fieldStatus{$field_name} = [DIFFER_IN_A_AND_B];
+				$fieldStatus{$field_name} = [ DIFFER_IN_A_AND_B, $data_type, $schema_data_type ];
 				$fields_ok = 0;
 			}
 		}