RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

fixes #298

Browse source
This commit is contained in:
zYne 2007-04-11 18:35:15 +00:00
parent dcab3087f7
commit 28e937b981
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Doctrine/DataDict/Mysql.php
View file

@ -137,7 +137,7 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
if ( ! isset($field['type'])) { if ( ! isset($field['type'])) {
$field['type'] = null; $field['type'] = null;
} }
switch ($field['type']) { switch ($field['type']) {
case 'char': case 'char':
$length = (! empty($field['length'])) ? $field['length'] : false; $length = (! empty($field['length'])) ? $field['length'] : false;
@ -246,6 +246,8 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
if ( ! isset($field['name'])) { if ( ! isset($field['name'])) {
$field['name'] = ''; $field['name'] = '';
} }
$values = null;
switch ($dbType) { switch ($dbType) {
case 'tinyint': case 'tinyint':
@ -304,7 +306,7 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
} }
break; break;
case 'enum': case 'enum':
$type[] = 'text'; $type[] = 'enum';
preg_match_all('/\'.+\'/U', $field['type'], $matches); preg_match_all('/\'.+\'/U', $field['type'], $matches);
$length = 0; $length = 0;
$fixed = false; $fixed = false;
@ -317,6 +319,8 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
if (preg_match('/^(is|has)/', $field['name'])) { if (preg_match('/^(is|has)/', $field['name'])) {
$type = array_reverse($type); $type = array_reverse($type);
} }
} else {
$values = $matches[0];
} }
} }
$type[] = 'integer'; $type[] = 'integer';
@ -369,7 +373,7 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
$length = ((int) $length == 0) ? null : (int) $length; $length = ((int) $length == 0) ? null : (int) $length;
return array('type' => $type, 'length' => $length, 'unsigned' => $unsigned, 'fixed' => $fixed); return array('type' => $type, 'length' => $length, 'unsigned' => $unsigned, 'fixed' => $fixed, 'values' => $values);
} }
/** /**
* Obtain DBMS specific SQL code portion needed to set the CHARACTER SET * Obtain DBMS specific SQL code portion needed to set the CHARACTER SET

3
lib/Doctrine/Import/Builder.php
View file

@ -121,6 +121,9 @@ class Doctrine_Import_Builder
if (isset($column['unsigned']) && $column['unsigned']) { if (isset($column['unsigned']) && $column['unsigned']) {
$a[] = '\'unsigned\' => true'; $a[] = '\'unsigned\' => true';
} }
if ($column['ptype'][0] == 'enum' && isset($column['values']) && $column['values']) {
$a[] = '\'values\' => array(' . implode(',', $column['values']) . ')';
}
if ( ! empty($a)) { if ( ! empty($a)) {
$columns[$i] .= ', ' . 'array('; $columns[$i] .= ', ' . 'array(';

1
lib/Doctrine/Import/Mysql.php
View file

@ -129,6 +129,7 @@ class Doctrine_Import_Mysql extends Doctrine_Import
'length' => $decl['length'], 'length' => $decl['length'],
'fixed' => $decl['fixed'], 'fixed' => $decl['fixed'],
'unsigned' => $decl['unsigned'], 'unsigned' => $decl['unsigned'],
'values' => $decl['values'],
'primary' => (strtolower($val['key']) == 'pri'), 'primary' => (strtolower($val['key']) == 'pri'),
'default' => $val['default'], 'default' => $val['default'],
'notnull' => (bool) ($val['null'] != 'YES'), 'notnull' => (bool) ($val['null'] != 'YES'),