RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 22:23:14 +03:00
Code Issues Projects Releases Wiki Activity

Cleaned up some stuff with schema generation and removed name: key from column definition.

Browse Source
This commit is contained in:
Jonathan.Wage 2007-11-07 01:57:01 +00:00
parent 3b898ca983
commit a476c62efe
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Doctrine/Export/Schema.php
View File

@ -59,22 +59,21 @@ class Doctrine_Export_Schema
// we iterate trhough the diff of previously declared classes
// and currently declared classes
foreach ($loadedModels as $name) {
if ( ! empty($models) && !in_array($name, $models)) {
foreach ($loadedModels as $className) {
if ( ! empty($models) && !in_array($className, $models)) {
continue;
}
$record = new $name();
$record = new $className();
$recordTable = $record->getTable();
$data = $recordTable->getExportableFormat();
$table = array();
$table['tableName'] = $data['tableName'];
$table['className'] = get_class($record);
foreach ($data['columns'] AS $name => $column) {
$data['columns'][$name]['name'] = $name;
$data['columns'][$name]['type'] = $column['type'] . '(' . $column['length'] . ')';
unset($data['columns'][$name]['length']);
}
$table['columns'] = $data['columns'];
@ -105,7 +104,7 @@ class Doctrine_Export_Schema
}
}
$array[$table['className']] = $table;
$array[$className] = $table;
}
return $array;

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

@ -100,14 +100,14 @@ class Doctrine_Import_Schema
public function buildSchema($schema, $format)
{
$array = array();
foreach ((array) $schema AS $s) {
if (is_file($s)) {
$array = array_merge($array, $this->parseSchema($s, $format));
} else if (is_dir($s)) {
$it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($s),
RecursiveIteratorIterator::LEAVES_ONLY);
foreach ($it as $file) {
$e = explode('.', $file->getFileName());
if (end($e) === $format) {
@ -116,9 +116,9 @@ class Doctrine_Import_Schema
}
}
}
$this->buildRelationships($array);
return array('schema' => $array, 'relations' => $this->_relations);
}
@ -218,15 +218,15 @@ class Doctrine_Import_Schema
$exist_relations = array();
$unique_relations = array();
foreach ($all_relations as $relation) {
if (!in_array($relation['class'], $exist_relations)) {
$exist_relations[] = $relation['class'];
$unique_relations = array_merge($unique_relations, array($relation['alias'] => $relation));
} else {
// check to see if this relationship is not autogenerated, if it's not, then the user must have explicitly declared it
if (!isset($relation['autogenerated']) || $relation['autogenerated'] != true) {
$unique_relations = array_merge($unique_relations, array($relation['alias'] => $relation));
if (!in_array($relation['class'], $exist_relations)) {
$exist_relations[] = $relation['class'];
$unique_relations = array_merge($unique_relations, array($relation['alias'] => $relation));
} else {
// check to see if this relationship is not autogenerated, if it's not, then the user must have explicitly declared it
if (!isset($relation['autogenerated']) || $relation['autogenerated'] != true) {
$unique_relations = array_merge($unique_relations, array($relation['alias'] => $relation));
}
}
}
}
return $unique_relations;
@ -320,7 +320,7 @@ class Doctrine_Import_Schema
if ( ! empty($columns)) {
foreach ($columns as $columnName => $field) {
$colDesc = array();
$colDesc['name'] = isset($field['name']) ? (string) $field['name']:$columnName;
$colDesc['name'] = $columnName;
$e = explode('(', $field['type']);
if (isset($e[0]) && isset($e[1])) {