In-Portal Issue Tracker

Index: multilanguage_helper.php
===================================================================
RCS file: /www/cvs/kernel.X/core/units/helpers/Attic/multilanguage_helper.php,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 multilanguage_helper.php
--- multilanguage_helper.php	21 Jan 2010 14:42:58 -0000	1.1.2.2
+++ multilanguage_helper.php	31 Mar 2010 14:41:41 -0000
@@ -166,7 +166,7 @@
 							$default_value = is_null($field_options['default']) ? 'NULL' : $this->Conn->qstr($field_options['default']);
 							$field_mask['type'] = $field_options['db_type'];
 						}
-						$field_mask['default'] = 'DEFAULT '.$default_value;
+						$field_mask['default'] = ($field_mask['null'] == 'NOT NULL' && $default_value == 'NULL') ? '' : 'DEFAULT '.$default_value;
 
 						if (strtoupper($field_mask['type']) == 'TEXT') {
 							// text fields in mysql doesn't have default value

Index: kernel/utility/unit_config_reader.php
===================================================================
--- kernel/utility/unit_config_reader.php	(revision 13931)
+++ kernel/utility/unit_config_reader.php	(working copy)
@@ -620,8 +620,10 @@
 		$table_found = $conn->Query('SHOW TABLES LIKE "'.$tablename.'"');
 		if (!$table_found) {
 			// config present, but table missing, strange
+			safeDefine('DBG_RAISE_ON_WARNINGS', 1);
 			$debugger->appendHTML("<b class='debug_error'>Config Warning: </b>Table <strong>$tablename</strong> missing, but prefix <b>".$config['Prefix']."</b> requires it!");
-			safeDefine('DBG_RAISE_ON_WARNINGS', 1);
+			$debugger->WarningCount++;
+
 			return ;
 		}
 
@@ -636,11 +638,13 @@
 			'not_null_error3' => 'Field <strong>%s</strong> is described as <strong>NOT NULL in config</strong>, but is <strong>NULL in db</strong>',
 			'invalid_default' => '<strong>Default value</strong> for field %s<strong>%s</strong> not sync. to db (in config = %s, in db = %s)',
 			'type_missing' => '<strong>Type definition</strong> for field <strong>%s</strong> missing in config',
+			'invalid_calculated_field' => 'Calculated field <strong>%s</strong> is missing corresponding virtual field',
 		);
 
 		$config_errors = Array ();
 		$tablename = preg_replace('/^'.preg_quote(TABLE_PREFIX, '/').'(.*)/', '\\1', $tablename); // remove table prefix
 
+		// validate unit config field declaration in relation to database table structure
 		foreach ($res as $field) {
 			$f_name = $field['Field'];
 
@@ -654,12 +658,16 @@
 					$config_errors[] = sprintf($error_messages['field_not_found'], $f_name);
 				}
 				else {
-					if (is_numeric($field['Default'])) {
-						$field['Default'] = preg_match('/[\.,]/', $field['Default']) ? (float)$field['Default'] : (int)$field['Default'];
+					$db_default = $field['Default'];
+
+					if (is_numeric($db_default)) {
+						$db_default = preg_match('/[\.,]/', $db_default) ? (float)$db_default : (int)$db_default;
 					}
 
+					$default_missing = false;
 					$options = $config['Fields'][$f_name];
-					$default_missing = false;
+					$not_null = isset($options['not_null']) && $options['not_null'];
+
 					if (!array_key_exists('default', $options)) {
 						$config_errors[] = sprintf($error_messages['default_missing'], $f_name);
 						$default_missing = true;
@@ -670,14 +678,12 @@
 						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']) ) {
+						if ($not_null && !isset($options['default']) ) {
 							$config_errors[] = sprintf($error_messages['not_null_error2'], $f_name);
 						}
 					}
-					else {
-						if (isset($options['not_null']) && $options['not_null']) {
-							$config_errors[] = sprintf($error_messages['not_null_error3'], $f_name);
-						}
+					elseif ($not_null) {
+						$config_errors[] = sprintf($error_messages['not_null_error3'], $f_name);
 					}
 
 					if (!array_key_exists('type', $options)) {
@@ -685,23 +691,39 @@
 					}
 
 					if (!$default_missing) {
+						if ( is_null($db_default) && $not_null ) {
+							$db_default = $options['type'] == 'string' ? '' : 0;
+						}
+
 						if ($f_name == $config['IDField'] && $options['type'] != 'string' && $options['default'] !== 0) {
 							$config_errors[] = sprintf($error_messages['invalid_default'], '<span class="debug_error">IDField</span> ', $f_name, $this->varDump($options['default']), $this->varDump($field['Default']));
 						}
-						else if ($options['default'] != '#NOW#' && $field['Default'] !== $options['default'] && !in_array($options['type'], $float_types)) {
-							$config_errors[] = sprintf($error_messages['invalid_default'], '', $f_name, $this->varDump($options['default']), $this->varDump($field['Default']));
+						else if (((string)$options['default'] != '#NOW#') && ($db_default !== $options['default']) && !in_array($options['type'], $float_types)) {
+							$config_errors[] = sprintf($error_messages['invalid_default'], '', $f_name, $this->varDump($options['default']), $this->varDump($db_default));
 						}
 					}
 				}
 			}
 		}
 
+		// validate calculated fields
+		if ( array_key_exists('CalculatedFields', $config) ) {
+			foreach ($config['CalculatedFields'] as $special => $calculated_fields) {
+				foreach ($calculated_fields as $calculated_field => $calculated_field_expr) {
+					if ( !isset($config['VirtualFields'][$calculated_field]) ) {
+						$config_errors[] = sprintf($error_messages['invalid_calculated_field'], $calculated_field);
+					}
+				}
+			}
+		}
+
 		if ($config_errors) {
 			$error_prefix = '<strong class="debug_error">Config Error'.(count($config_errors) > 1 ? 's' : '').': </strong> for prefix <strong>'.$config_link.'</strong> ('.$tablename.') in unit config:<br />';
 			$config_errors = $error_prefix.'&nbsp;&nbsp;&nbsp;'.implode('<br />&nbsp;&nbsp;&nbsp;', $config_errors);
 
+			safeDefine('DBG_RAISE_ON_WARNINGS', 1);
 			$debugger->appendHTML($config_errors);
-			safeDefine('DBG_RAISE_ON_WARNINGS', 1);
+			$debugger->WarningCount++;
 		}
 	}
 
Index: units/admin/admin_events_handler.php
===================================================================
--- units/admin/admin_events_handler.php	(revision 13931)
+++ units/admin/admin_events_handler.php	(working copy)
@@ -270,24 +270,35 @@
 				}
 			}
 
+			// 2. get field default value
 			$default_value = $field_info['Default'];
-			if (in_array($php_type, $float_types)) {
+			$not_null = $field_info['Null'] != 'YES';
+
+			if (is_numeric($default_value)) {
+				$default_value = preg_match('/[\.,]/', $default_value) ? (float)$default_value : (int)$default_value;
+			}
+
+			if ( is_null($default_value) && $not_null ) {
+				$default_value = $field_options['type'] == 'string' ? '' : 0;
+			}
+
+			if ( in_array($php_type, $float_types) ) {
 				// this is float number
 				if (preg_match('/'.$db_types.'\([\d]+,([\d]+)\)/i', $field_info['Type'], $regs)) {
 					// size is described in structure -> add formatter
 					$field_options['formatter'] = 'kFormatter';
 					$field_options['format'] = '%01.'.$regs[1].'f';
-					if ($field_info['Null'] != 'YES') {
+
+					if ($not_null) {
 						// null fields, will most likely have NULL as default value
 						$default_value = 0;
 					}
 				}
-				else {
+				elseif ($not_null) {
 					// no size information, just convert to float
-					if ($field_info['Null'] != 'YES') {
-						// null fields, will most likely have NULL as default value
-						$default_value = (float)$default_value;
-					}
+					// null fields, will most likely have NULL as default value
+					$default_value = (float)$default_value;
+
 				}
 			}
 
@@ -302,7 +313,7 @@
 				$grid_col_options['filter_block'] = 'grid_options_filter';
 			}
 
-			if ($field_info['Null'] != 'YES') {
+			if ($not_null) {
 				$field_options['not_null'] = 1;
 			}
 
@@ -311,7 +322,7 @@
 				$id_field = $field_info['Field'];
 			}
 
-			if ($php_type == 'int' && !array_key_exists('not_null', $field_options)) {
+			if ($php_type == 'int' && !$not_null) {
 				// numeric null field
 				if (preg_match('/(On|Date)$/', $field_info['Field']) || $field_info['Field'] == 'Modified') {
 					$field_options['formatter'] = 'kDateFormatter';
@@ -319,7 +330,7 @@
 				}
 			}
 
-			if ($php_type == 'int' && ($field_info['Null'] != 'YES' || is_numeric($default_value))) {
+			if ($php_type == 'int' && ($not_null || is_numeric($default_value))) {
 				// is integer field AND not null
 				$field_options['default'] = (int)$default_value;
 			}
Index: units/helpers/multilanguage_helper.php
===================================================================
--- units/helpers/multilanguage_helper.php	(revision 13931)
+++ units/helpers/multilanguage_helper.php	(working copy)
@@ -170,7 +170,7 @@
 							$default_value = is_null($field_options['default']) ? 'NULL' : $this->Conn->qstr($field_options['default']);
 							$field_mask['type'] = $field_options['db_type'];
 						}
-						$field_mask['default'] = 'DEFAULT '.$default_value;
+						$field_mask['default'] = ($field_mask['null'] == 'NOT NULL' && $default_value == 'NULL') ? '' : 'DEFAULT '.$default_value;
 
 						if (strtoupper($field_mask['type']) == 'TEXT') {
 							// text fields in mysql doesn't have default value