RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 14:31:40 +03:00
Code Issues Projects Releases Wiki Activity

Reversed r3840. Broke tests.

Browse Source
This commit is contained in:
jwage 2008-02-19 20:12:46 +00:00
parent d5b8a6a70b
commit dcc2a54e63
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/Builder/Migration.php
View File

@ -157,10 +157,10 @@ END;
{ {
if ($modelsPath) { if ($modelsPath) {
$models = Doctrine::loadModels($modelsPath); $models = Doctrine::loadModels($modelsPath);
} else {
$models = Doctrine::getLoadedModels();
} }
$models = Doctrine::getLoadedModels();
$foreignKeys = array(); $foreignKeys = array();
foreach ($models as $model) { foreach ($models as $model) {

4
lib/Doctrine/Export.php
View File

@ -1047,10 +1047,10 @@ class Doctrine_Export extends Doctrine_Connection_Module
{ {
if ($directory !== null) { if ($directory !== null) {
$models = Doctrine::loadModels($directory); $models = Doctrine::loadModels($directory);
} else {
$models = Doctrine::getLoadedModels();
} }
$models = Doctrine::getLoadedModels();
$this->exportClasses($models); $this->exportClasses($models);
} }

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

@ -45,11 +45,11 @@ class Doctrine_Export_Schema
public function buildSchema($directory = null, $models = array()) public function buildSchema($directory = null, $models = array())
{ {
if ($directory) { if ($directory) {
Doctrine::loadModels($directory); $loadedModels = Doctrine::loadModels($directory);
} else {
$loadedModels = Doctrine::getLoadedModels();
} }
$loadedModels = Doctrine::getLoadedModels();
$array = array(); $array = array();
$parent = new ReflectionClass('Doctrine_Record'); $parent = new ReflectionClass('Doctrine_Record');