RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-17 22:11:41 +03:00
Code Issues Projects Releases Wiki Activity

Merged r3839 from 0.10

Browse Source
This commit is contained in:
jwage 2008-02-19 19:51:08 +00:00
parent 280e7d5e17
commit d5b8a6a70b
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) {
$models = Doctrine::loadModels($modelsPath);
} else {
$models = Doctrine::getLoadedModels();
}
$models = Doctrine::getLoadedModels();
$foreignKeys = array();
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) {
$models = Doctrine::loadModels($directory);
} else {
$models = Doctrine::getLoadedModels();
}
$models = Doctrine::getLoadedModels();
$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())
{
if ($directory) {
$loadedModels = Doctrine::loadModels($directory);
} else {
$loadedModels = Doctrine::getLoadedModels();
Doctrine::loadModels($directory);
}
$loadedModels = Doctrine::getLoadedModels();
$array = array();
$parent = new ReflectionClass('Doctrine_Record');