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

Merged in paulis/processmaker/HOR-290 (pull request #3748)

Browse Source 
HOR-290
This commit is contained in:
Julio Cesar Laura Avendaño
2016-02-29 11:36:07 -04:00
parent c4d36fc7aa 544103a058
commit 423944a83c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.pmFunctions.php
View File

@@ -264,8 +264,11 @@ function executeQuery ($SqlStatement, $DBConnectionUID = 'workflow', $aParameter
$rs = $con->executeUpdate( $SqlStatement ); $rs = $con->executeUpdate( $SqlStatement );
$result = $con->getUpdateCount(); $result = $con->getUpdateCount();
$con->commit(); $con->commit();
//$result = $lastId->getId(); break;
// $result = 1; case preg_match( "/^REPLACE\s/i", $statement ):
$rs = $con->executeUpdate( $SqlStatement );
$result = $con->getUpdateCount();
$con->commit();
break; break;
case preg_match( "/^UPDATE\s/i", $statement ): case preg_match( "/^UPDATE\s/i", $statement ):
$rs = $con->executeUpdate( $SqlStatement ); $rs = $con->executeUpdate( $SqlStatement );

2
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -692,7 +692,7 @@ class pmTablesProxy extends HttpProxyController
$sErrorMessages = ''; $sErrorMessages = '';
$i = 1; $i = 1;
$conData = 0; $conData = 0;
$insert = 'INSERT INTO ' . $aAdditionalTables['ADD_TAB_NAME'] . ' ('; $insert = 'REPLACE INTO ' . $aAdditionalTables['ADD_TAB_NAME'] . ' (';
$query = ''; $query = '';
$swHead = false; $swHead = false;
while (($aAux = fgetcsv( $oFile, 4096, $_POST['form']['CSV_DELIMITER'] )) !== false) { while (($aAux = fgetcsv( $oFile, 4096, $_POST['form']['CSV_DELIMITER'] )) !== false) {