deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #176 from vbardales/fix-build-command

Browse source 
create sql folder if not exists + CS
This commit is contained in:
William Durand 2012-08-24 10:59:14 -07:00
parent b70c73f674 89d2a43650
commit ea7653d2c7
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Command/SqlBuildCommand.php
View file

@ -63,6 +63,10 @@ EOT
$filesystem->remove($cacheDir);
$filesystem->mkdir($cacheDir);
if (!$filesystem->exists($sqlDir)) {
$filesystem->mkdir($sqlDir);
}
// Execute the task
$ret = $this->callPhing('build-sql', array(
'propel.sql.dir' => $cacheDir
@ -77,10 +81,9 @@ EOT
$fileExt = pathinfo($file->getFilename(), PATHINFO_EXTENSION);
$finalLocation = $sqlDir. DIRECTORY_SEPARATOR. $file->getFilename();
if($fileExt === 'map' && $filesystem->exists($finalLocation)) {
if ($fileExt === 'map' && $filesystem->exists($finalLocation)) {
$this->mergeMapFiles($finalLocation, (string) $file);
}
else {
} else {
$filesystem->remove($finalLocation);
$filesystem->rename((string) $file, $finalLocation);
}
@ -105,18 +108,21 @@ EOT
}
/**
* Reads the existing target and the generated map files, and adds to the
* Reads the existing target and the generated map files, and adds to the
* target the missing lines that are in the generated file.
*
* @param string $target target map filename
* @param string $target target map filename
* @param string $generated generated map filename
*
* @return boolean result
*/
protected function mergeMapFiles($target, $generated) {
protected function mergeMapFiles($target, $generated)
{
if(($targetContent = file($target)) === false)
return false;
if(($generatedContent = file($generated)) === false)
return false;
$targetContent = array_merge($generatedContent, array_diff($targetContent, $generatedContent));