Index: branches/RC/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r10098 -r10134
--- branches/RC/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 10098)
+++ branches/RC/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 10134)
@@ -452,7 +452,7 @@
$error_messages = Array (
'field_not_found' => 'Field %s exists in the database, but is not defined in config',
'default_missing' => 'Default value for field %s not set in config',
- 'not_null_error1' => 'Field %s is NOT NULL in the database, but is not configured as not_null or required',
+ 'not_null_error1' => 'Field %s is NOT NULL in the database, but is not configured as not_null', // or required',
'not_null_error2' => 'Field %s is described as NOT NULL in config, but does not have DEFAULT value',
'not_null_error3' => 'Field %s is described as NOT NULL in config, but is NULL in db',
'invalid_default' => 'Default value for field %s%s not sync. to db (in config = %s, in db = %s)',
@@ -488,7 +488,7 @@
if ($field['Null'] != 'YES') {
// field is NOT NULL in database (MySQL5 for null returns "NO", but MySQL4 returns "")
- if ( $f_name != $config['IDField'] && !isset($options['not_null']) && !isset($options['required']) ) {
+ if ( $f_name != $config['IDField'] && !isset($options['not_null']) /*&& !isset($options['required'])*/ ) {
$config_errors[] = sprintf($error_messages['not_null_error1'], $f_name);
}
if (isset($options['not_null']) && $options['not_null'] && !isset($options['default']) ) {