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

A fixes to get the importing a little closer.

Browse Source
This commit is contained in:
Jonathan.Wage 2007-08-03 22:05:05 +00:00
parent ff832983bd
commit 121d9ad9aa
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,10 @@ class Doctrine_Import_Schema
$arr = $this->importSchema($schema); $arr = $this->importSchema($schema);
foreach ($arr as $name => $columns) { foreach ($arr as $name => $columns) {
$Builder->buildRecord($name, $columns); $options['className'] = $name;
$options['fileName'] = $directory.DIRECTORY_SEPARATOR.$name.'.class.php';
$builder->buildRecord($options, $columns, array());
} }
} }
} }

34
lib/Doctrine/Import/Schema/Xml.php
View File

@ -37,7 +37,7 @@
* @author Nicolas Bérard-Nault <nicobn@gmail.com> * @author Nicolas Bérard-Nault <nicobn@gmail.com>
* @author Jonathan H. Wage <jonwage@gmail.com> * @author Jonathan H. Wage <jonwage@gmail.com>
*/ */
class Doctrine_Import_Schema_Yml extends Doctrine_Import_Schema class Doctrine_Import_Schema_Xml extends Doctrine_Import_Schema
{ {
/** /**
* importArr * importArr
@ -54,26 +54,30 @@ class Doctrine_Import_Schema_Yml extends Doctrine_Import_Schema
throw new Doctrine_Import_Exception('Could not read schema file '. $schema); throw new Doctrine_Import_Exception('Could not read schema file '. $schema);
} }
$xmlObj = simplexml_load_file($schema); if (!($xmlString = file_get_contents($schema))) {
throw new Doctrine_Import_Exception('Schema file '. $schema . ' is empty');
}
$xmlObj = simplexml_load_string($xmlString);
// Go through all tables... // Go through all tables...
foreach ($xmlObj->table as $table) { foreach ($xmlObj->table as $table) {
// Go through all columns... // Go through all columns...
foreach ($table->declaration->field as $field) { foreach ($table->declaration->column as $column) {
$colDesc = array( $colDesc = array(
'name' => (string) $field->name, 'name' => (string) $column->name,
'type' => (string) $field->type, 'type' => (string) $column->type,
'ptype' => (string) $field->type, 'ptype' => (string) $column->type,
'length' => (int) $field->length, 'length' => (int) $column->length,
'fixed' => (int) $field->fixed, 'fixed' => (int) $column->fixed,
'unsigned' => (bool) $field->unsigned, 'unsigned' => (bool) $column->unsigned,
'primary' => (bool) (isset($field->primary) && $field->primary), 'primary' => (bool) (isset($column->primary) && $column->primary),
'default' => (string) $field->default, 'default' => (string) $column->default,
'notnull' => (bool) (isset($field->notnull) && $field->notnull), 'notnull' => (bool) (isset($column->notnull) && $column->notnull),
'autoinc' => (bool) (isset($field->autoincrement) && $field->autoincrement), 'autoinc' => (bool) (isset($column->autoincrement) && $column->autoincrement),
); );
$columns[(string) $field->name] = $colDesc; $columns[(string) $column->name] = $colDesc;
} }
$tables[(string) $table->name] = $columns; $tables[(string) $table->name] = $columns;