fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-3821

Browse Source 
update
This commit is contained in:
hjonathan
2017-09-01 14:59:19 -04:00
parent 17719bc5ab
commit ec971836e8
1 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gulliver/bin/tasks/pakePropel.php
View File

@@ -223,6 +223,7 @@ function run_propel_build_model($task, $args)
function run_propel_build_sql($task, $args) function run_propel_build_sql($task, $args)
{ {
$alternateDir = '';
if (isset ($args[1])) { if (isset ($args[1])) {
$propelIniFile = $args[1] . '.ini'; $propelIniFile = $args[1] . '.ini';
$alternateDir = ''; $alternateDir = '';
@@ -239,8 +240,6 @@ function run_propel_build_sql($task, $args)
pake_echo_action('propel.ini', "using the file : $propelIniFile "); pake_echo_action('propel.ini', "using the file : $propelIniFile ");
$alternateDir = PATH_PLUGINS . $path[0] . PATH_SEP; $alternateDir = PATH_PLUGINS . $path[0] . PATH_SEP;
//_call_phing($task, 'om', false, $path[1] . '.ini' , PATH_PLUGINS . $path[0] . PATH_SEP );
//return;
} }
} }
@@ -249,19 +248,22 @@ function run_propel_build_sql($task, $args)
if (!in_array($args[0], $aDB)) { if (!in_array($args[0], $aDB)) {
throw new Exception('invalid database Adapter, available:[mysql|mssql|oracle|pgsql].'); throw new Exception('invalid database Adapter, available:[mysql|mssql|oracle|pgsql].');
} } else {
else {
switch ($args [0]) { switch ($args [0]) {
case 'mysql' : if ( $alternateDir != '' ) case 'mysql' :
if ($alternateDir != '')
_call_phing($task, 'sql', false, 'propel.mysql.ini', $alternateDir); _call_phing($task, 'sql', false, 'propel.mysql.ini', $alternateDir);
else else
_call_phing($task, 'sql', true, 'propel.mysql.ini'); _call_phing($task, 'sql', true, 'propel.mysql.ini');
break; break;
case 'mssql' : _call_phing($task, 'sql', true, 'propel.mssql.ini' ); case 'mssql' :
_call_phing($task, 'sql', true, 'propel.mssql.ini');
break; break;
case 'oracle' : _call_phing($task, 'sql', true, 'propel.oracle.ini' ); case 'oracle' :
_call_phing($task, 'sql', true, 'propel.oracle.ini');
break; break;
case 'pgsql' : _call_phing($task, 'sql', true, 'propel.pgsql.ini' ); case 'pgsql' :
_call_phing($task, 'sql', true, 'propel.pgsql.ini');
break; break;
default : default :
throw new Exception('specify database Adapter, valid values are: mysql, mssql, oracle, pgsql.'); throw new Exception('specify database Adapter, valid values are: mysql, mssql, oracle, pgsql.');