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.

Browse source
This commit is contained in:
Jonathan.Wage 2007-09-13 22:39:52 +00:00
parent 122ebf0ca6
commit 8e57185e30
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Doctrine/Export/Schema.php
View file

@ -124,8 +124,7 @@ abstract class Doctrine_Export_Schema
// and currently declared classes // and currently declared classes
foreach ($tables as $name) { foreach ($tables as $name) {
$class = new ReflectionClass($name); $class = new ReflectionClass($name);
$conn = Doctrine_Manager::getInstance()->getConnectionForComponent($name);
// check if class is an instance of Doctrine_Record and not abstract // check if class is an instance of Doctrine_Record and not abstract
// class must have method setTableDefinition (to avoid non-Record subclasses like symfony's sfDoctrineRecord) // class must have method setTableDefinition (to avoid non-Record subclasses like symfony's sfDoctrineRecord)
// we have to recursively iterate through the class parents just to be sure that the classes using for example // we have to recursively iterate through the class parents just to be sure that the classes using for example
@ -154,6 +153,12 @@ abstract class Doctrine_Export_Schema
$table = array(); $table = array();
$table['name'] = $data['tableName']; $table['name'] = $data['tableName'];
$table['class'] = get_class($record); $table['class'] = get_class($record);
foreach ($data['columns'] AS $name => $column)
{
$data['columns'][$name]['name'] = $name;
}
$table['columns'] = $data['columns']; $table['columns'] = $data['columns'];
$array['tables'][$data['tableName']] = $table; $array['tables'][$data['tableName']] = $table;

8
tests/schema.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?> <?xml version="1.0" encoding="ISO-8859-1" ?>
<schema> <schema>
<tables> <tables>
<table> <user>
<name>user</name> <name>user</name>
<class>User</class> <class>User</class>
<columns> <columns>
@ -18,9 +18,9 @@
<notnull>true</notnull> <notnull>true</notnull>
</column> </column>
</columns> </columns>
</table> </user>
<table> <group>
<name>group</name> <name>group</name>
<class>Group</class> <class>Group</class>
<columns> <columns>
@ -37,6 +37,6 @@
<notnull>true</notnull> <notnull>true</notnull>
</column> </column>
</columns> </columns>
</table> </group>
</tables> </tables>
</schema> </schema>