Merged in darojas/processmaker/PM-1442 (pull request #1376)

PM-1442 "Revisar el endpoint de los dependientes y verificar si existe el reemplazo de variables para los queries, si no existe implementarlo" SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-04 15:01:46 -04:00

View File

@@ -1,6 +1,8 @@
<?php <?php
namespace ProcessMaker\BusinessModel; namespace ProcessMaker\BusinessModel;
use \G;
class Variable class Variable
{ {
/** /**
@@ -487,7 +489,7 @@ class Variable
$variableDbConnectionUid = $row["VAR_DBCONNECTION"]; $variableDbConnectionUid = $row["VAR_DBCONNECTION"];
$variableSql = $row["VAR_SQL"]; $variableSql = $row["VAR_SQL"];
} else { } else {
throw new \Exception(\G::LoadTranslation("ID_PROCESS_VARIABLE_DOES_NOT_EXIST", array(strtolower("VAR_NAME"), $variableName))); throw new \Exception(G::LoadTranslation("ID_PROCESS_VARIABLE_DOES_NOT_EXIST", array(strtolower("VAR_NAME"), $variableName)));
} }
//Verify data //Verify data
@@ -499,7 +501,9 @@ class Variable
$cnn = \Propel::getConnection(($variableDbConnectionUid . "" != "")? $variableDbConnectionUid : "workflow"); $cnn = \Propel::getConnection(($variableDbConnectionUid . "" != "")? $variableDbConnectionUid : "workflow");
$stmt = $cnn->createStatement(); $stmt = $cnn->createStatement();
$rs = $stmt->executeQuery(\G::replaceDataField($variableSql, $arrayVariable), \ResultSet::FETCHMODE_NUM); $replaceFields = G::replaceDataField($variableSql, $arrayVariable);
$rs = $stmt->executeQuery($replaceFields, \ResultSet::FETCHMODE_NUM);
while ($rs->next()) { while ($rs->next()) {
$row = $rs->getRow(); $row = $rs->getRow();
@@ -661,8 +665,9 @@ class Variable
$cnn = \Propel::getConnection(($variableDbConnectionUid . "" != "")? $variableDbConnectionUid : "workflow"); $cnn = \Propel::getConnection(($variableDbConnectionUid . "" != "")? $variableDbConnectionUid : "workflow");
$stmt = $cnn->createStatement(); $stmt = $cnn->createStatement();
$replaceFields = G::replaceDataField($sqlQuery, $arrayVariable);
$rs = $stmt->executeQuery(\G::replaceDataField($sqlQuery, $arrayVariable), \ResultSet::FETCHMODE_NUM); $rs = $stmt->executeQuery($replaceFields, \ResultSet::FETCHMODE_NUM);
while ($rs->next()) { while ($rs->next()) {
$row = $rs->getRow(); $row = $rs->getRow();