RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-01 04:51:45 +03:00
Code Issues Projects Releases Wiki Activity

changes to support setting the tableName and properly create enum column values

Browse Source
This commit is contained in:
gnat 2007-09-21 07:14:37 +00:00
parent 9c32fef9bf
commit 2f7d4cbca1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/Import/Builder.php
View File

@ -94,6 +94,7 @@ class %s extends Doctrine_Record
{ {
public function setTableDefinition() public function setTableDefinition()
{ {
%s
%s %s
} }
public function setUp() public function setUp()
@ -144,8 +145,8 @@ END;
if (isset($column['unsigned']) && $column['unsigned']) { if (isset($column['unsigned']) && $column['unsigned']) {
$a[] = '\'unsigned\' => true'; $a[] = '\'unsigned\' => true';
} }
if ($column['type'] == 'enum' && isset($column['values']) && $column['values']) { if ($column['type'] == 'enum' && isset($column['values']) ) {
$a[] = '\'values\' => array(' . implode(',', $column['values']) . ')'; $a[] = '\'values\' => array(\'' . implode('\',\'', $column['values']) . '\')';
} }
if ( ! empty($a)) { if ( ! empty($a)) {
@ -228,9 +229,10 @@ END;
throw new Doctrine_Import_Builder_Exception('Missing class name.'); throw new Doctrine_Import_Builder_Exception('Missing class name.');
} }
//$opt = array(0 => str_repeat(' ', 8) . '$this->setTableName(\''. $table .'\');');
$content = sprintf(self::$tpl, $options['className'], $opt = isset($options['tableName']) && !empty($options['tableName']) ? str_repeat(' ', 8) . '$this->setTableName(\''. $options['tableName'].'\');':'';
$content = sprintf(self::$tpl, $options['className'],$opt,
$this->buildColumnDefinition($columns), $this->buildColumnDefinition($columns),
$this->buildRelationDefinition($relations)); $this->buildRelationDefinition($relations));

3
lib/Doctrine/Import/Schema.php
View File

@ -73,7 +73,7 @@ class Doctrine_Import_Schema
$options = array(); $options = array();
$options['className'] = $properties['className']; $options['className'] = $properties['className'];
$options['fileName'] = $directory.DIRECTORY_SEPARATOR.$properties['className'].'.class.php'; $options['fileName'] = $directory.DIRECTORY_SEPARATOR.$properties['className'].'.class.php';
$options['tableName'] = isset($properties['tableName'])?$properties['tableName']:null;
$columns = $properties['columns']; $columns = $properties['columns'];
$relations = isset($this->relations[$options['className']]) ? $this->relations[$options['className']]:array(); $relations = isset($this->relations[$options['className']]) ? $this->relations[$options['className']]:array();
@ -116,6 +116,7 @@ class Doctrine_Import_Schema
$colDesc['default'] = isset($field['default']) ? (string) $field['default']:null; $colDesc['default'] = isset($field['default']) ? (string) $field['default']:null;
$colDesc['notnull'] = isset($field['notnull']) ? (bool) (isset($field['notnull']) && $field['notnull']):null; $colDesc['notnull'] = isset($field['notnull']) ? (bool) (isset($field['notnull']) && $field['notnull']):null;
$colDesc['autoinc'] = isset($field['autoinc']) ? (bool) (isset($field['autoinc']) && $field['autoinc']):null; $colDesc['autoinc'] = isset($field['autoinc']) ? (bool) (isset($field['autoinc']) && $field['autoinc']):null;
$colDesc['values'] = isset($field['values']) ? (array) $field['values']: null;
$columns[(string) $colDesc['name']] = $colDesc; $columns[(string) $colDesc['name']] = $colDesc;
} }