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

A few fixes to Migrations and formatting/code fixes.

Browse Source
This commit is contained in:
Jonathan.Wage 2007-11-25 20:30:51 +00:00
parent 3829b0f2d4
commit 2bd3667750
4 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine.php
View File

@ -1114,7 +1114,7 @@ final class Doctrine
*/
public static function makeDirectories($path, $mode = 0777)
{
if (!$path) {
if ( ! $path) {
return false;
}

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

@ -82,9 +82,7 @@ class Doctrine_Migration_Builder
*/
public function setMigrationsPath($path)
{
if ( ! file_exists($path)) {
mkdir($path, 0777);
}
Doctrine::makeDirectories($path);
$this->migrationsPath = $path;
}
@ -138,7 +136,7 @@ END;
*/
public function generateMigrationsFromDb()
{
$directory = '/tmp/tmp_doctrine_models';
$directory = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'tmp_doctrine_models';
Doctrine::generateModelsFromDb($directory);
@ -173,7 +171,7 @@ END;
$up = $this->buildCreateTable($export);
$down = $this->buildDropTable($export);
$className = 'Add'.Doctrine::classify($export['tableName']);
$className = 'Add' . Doctrine::classify($export['tableName']);
$this->generateMigrationClass($className, array(), $up, $down);
}
@ -207,7 +205,7 @@ END;
*/
public function buildCreateForeignKey($tableName, $definition)
{
return "\t\t\$this->createForeignKey('" . $tableName . "', " . $this->dataToPhpCode($definition) . ");";
return "\t\t\$this->createForeignKey('" . $tableName . "', " . var_export($definition, true) . ");";
}
/**
@ -232,9 +230,9 @@ END;
{
$code = "\t\t\$this->createTable('" . $tableData['tableName'] . "', ";
$code .= $this->dataToPhpCode($tableData['columns']) . ", ";
$code .= var_export($tableData['columns'], true) . ", ";
$code .= $this->dataToPhpCode(array('indexes' => $tableData['options']['indexes'], 'primary' => $tableData['options']['primary']));
$code .= var_export(array('indexes' => $tableData['options']['indexes'], 'primary' => $tableData['options']['primary']), true);
$code .= ");";
@ -252,22 +250,6 @@ END;
return "\t\t\$this->dropTable('" . $tableData['tableName'] . "');";
}
/**
* dataToPhpCode
*
* @param string $data
* @return string
*/
public function dataToPhpCode($data)
{
ob_start();
var_export($data);
$results = ob_get_contents();
ob_end_clean();
return $results;
}
/**
* generateMigrationClass
*