From 5db34308b3e7cdd25b5d9585fc5bceed759a5a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Fri, 27 Sep 2019 13:50:44 -0400 Subject: [PATCH] PMC-1117 --- gulliver/methods/genericAjax.php | 5 ++- gulliver/system/class.database_mysql.php | 2 +- .../engine/methods/dynaforms/fields_Edit.php | 33 ------------------- 3 files changed, 3 insertions(+), 37 deletions(-) diff --git a/gulliver/methods/genericAjax.php b/gulliver/methods/genericAjax.php index 83883f03b..403530000 100644 --- a/gulliver/methods/genericAjax.php +++ b/gulliver/methods/genericAjax.php @@ -108,9 +108,8 @@ if (isset($request)) { $aRows = []; try { $con = Propel::getConnection($bdUid); - $con->begin(); - $rs = $con->executeQuery($sqlQuery); - $con->commit(); + $stmt = $con->createStatement(); + $rs = $stmt->executeQuery($sqlQuery, \ResultSet::FETCHMODE_NUM); while ($rs->next()) { array_push($aRows, $rs->getRow()); diff --git a/gulliver/system/class.database_mysql.php b/gulliver/system/class.database_mysql.php index d40d36a3b..47a104280 100644 --- a/gulliver/system/class.database_mysql.php +++ b/gulliver/system/class.database_mysql.php @@ -1010,7 +1010,7 @@ class database extends database_base public function tableExists($tableName, $database) { try { - $result = DB::connect($this->getNameConnection()) + $result = DB::connection($this->getNameConnection()) ->select("show tables like '$tableName'"); $flag = count($result) > 0; diff --git a/workflow/engine/methods/dynaforms/fields_Edit.php b/workflow/engine/methods/dynaforms/fields_Edit.php index 1c75e744e..073ee75f9 100644 --- a/workflow/engine/methods/dynaforms/fields_Edit.php +++ b/workflow/engine/methods/dynaforms/fields_Edit.php @@ -155,39 +155,6 @@ if (! (isset( $fields->Fields['XMLNODE_NAME'] ) && ($fields->Fields['XMLNODE_NAM } } - if ($type == 'suggest' && isset( $Fields['PME_SQLCONNECTION'] ) && $Fields['PME_SQLCONNECTION'] != '') { - //define the dbArray with the table fields - //g::pr($Fields); - - - $tableExists = true; - $sDataBase = 'database_' . strtolower( DB_ADAPTER ); - if (G::LoadSystemExist( $sDataBase )) { - - $oDataBase = new database(); - $dataBase = $Fields['PME_SQLCONNECTION']; - if ($Fields['PME_SQLCONNECTION'] == 'workflow') { - $dataBase = DB_NAME; - } - $tableExists = $oDataBase->tableExists( 'USERS', $dataBase ); - } - if ($tableExists) { - $con = Propel::getConnection( $Fields['PME_SQLCONNECTION'] ); - if ($Fields['PME_SQLCONNECTION'] == 'rbac') { - $rs = $con->executeQuery( "SHOW COLUMNS FROM RBAC_USERS" ); - } else { - $rs = $con->executeQuery( "SHOW COLUMNS FROM USERS" ); - } - $result = Array (); - $i = 0; - while ($rs->next()) { - $result[$i ++] = $rs->getRow(); - } - } - } - //g::pr($result); - - if (isset( $Fields['PME_HINT'] )) { $Fields['PME_HINT'] = stripslashes( $Fields['PME_HINT'] ); $Fields['PME_HINT'] = htmlspecialchars_decode( $Fields['PME_HINT'] );