group data types

This commit is contained in:
Sebastian Mendel
2007-12-13 12:49:31 +00:00
parent 8eaf437123
commit c77f3bd21f
2 changed files with 71 additions and 46 deletions

View File

@@ -2292,56 +2292,69 @@ $cfg['ColumnTypes'] = array(
'DATE',
// numeric
'TINYINT',
'SMALLINT',
'MEDIUMINT',
//'INT',
'BIGINT',
'NUMERIC' => array(
'TINYINT',
'SMALLINT',
'MEDIUMINT',
'INT',
'BIGINT',
'',
'DECIMAL',
'FLOAT',
'DOUBLE',
'REAL',
'',
'BIT',
'BOOL',
'SERIAL',
),
'DECIMAL',
'FLOAT',
'DOUBLE',
'REAL',
// Date/Time
//'DATE',
'DATETIME',
'TIMESTAMP',
'TIME',
'YEAR',
'DATE and TIME' => array(
'DATE',
'DATETIME',
'TIMESTAMP',
'TIME',
'YEAR',
),
// Text
'CHAR',
//'VARCHAR',
'STRING' => array(
'CHAR',
'VARCHAR',
'',
'TINYTEXT',
//'TEXT',
'MEDIUMTEXT',
'LONGTEXT',
'TINYTEXT',
'TEXT',
'MEDIUMTEXT',
'LONGTEXT',
'',
'BINARY',
'VARBINARY',
'BINARY',
'VARBINARY',
'',
'TINYBLOB',
'MEDIUMBLOB',
'BLOB',
'LONGBLOB',
'TINYBLOB',
'MEDIUMBLOB',
'BLOB',
'LONGBLOB',
'',
'ENUM',
'SET',
'ENUM',
'SET',
),
'BIT',
'BOOL',
'SERIAL',
'GEOMETRY',
'POINT',
'LINESTRING',
'POLYGON',
'MULTIPOINT',
'MULTILINESTRING',
'MULTIPOLYGON',
'GEOMETRYCOLLECTION',
'SPATIAL' => array(
'GEOMETRY',
'POINT',
'LINESTRING',
'POLYGON',
'MULTIPOINT',
'MULTILINESTRING',
'MULTIPOLYGON',
'GEOMETRYCOLLECTION',
),
);
/**

View File

@@ -17,7 +17,7 @@ require_once './libraries/mysql_charsets.lib.php';
require_once './libraries/StorageEngine.class.php';
/**
* Class for partition management
* Class for partition management
*/
require_once './libraries/Partition.class.php';
@@ -254,13 +254,25 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
$type = rtrim($type);
$type_upper = strtoupper($type);
$cnt_column_types = count($cfg['ColumnTypes']);
for ($j = 0; $j < $cnt_column_types; $j++) {
$content_cells[$i][$ci] .= ' <option value="'. $cfg['ColumnTypes'][$j] . '"';
if ($type_upper == strtoupper($cfg['ColumnTypes'][$j])) {
foreach ($cfg['ColumnTypes'] as $col_goup => $column_type) {
if (is_array($column_type)) {
$content_cells[$i][$ci] .= '<optgroup label="' . htmlspecialchars($col_goup) . '">';
foreach ($column_type as $col_group_type) {
$content_cells[$i][$ci] .= '<option value="'. $col_group_type . '"';
if ($type_upper == strtoupper($col_group_type)) {
$content_cells[$i][$ci] .= ' selected="selected"';
}
$content_cells[$i][$ci] .= '>' . $col_group_type . '</option>' . "\n";
}
$content_cells[$i][$ci] .= '</optgroup>';
continue;
}
$content_cells[$i][$ci] .= '<option value="'. $column_type . '"';
if ($type_upper == strtoupper($column_type)) {
$content_cells[$i][$ci] .= ' selected="selected"';
}
$content_cells[$i][$ci] .= '>' . $cfg['ColumnTypes'][$j] . '</option>' . "\n";
$content_cells[$i][$ci] .= '>' . $column_type . '</option>' . "\n";
} // end for
$content_cells[$i][$ci] .= ' </select>';