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

HOR-362 "Conexiones a Oracle por TNS no se discriminan..." SOLVED

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2016-03-01 12:35:02 -04:00
parent 3368a0d225
commit cc5a1c4e65
2 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
workflow/engine/classes/class.dbConnections.php
View File

@@ -137,7 +137,7 @@ class dbConnections
* getConnectionsProUid * getConnectionsProUid
* *
* Parameter $only list of items displayed, everything else is ignored. * Parameter $only list of items displayed, everything else is ignored.
* *
* @param string $pProUid * @param string $pProUid
* @param string $only * @param string $only
* @return Array $connections * @return Array $connections
@@ -153,6 +153,8 @@ class dbConnections
$c->addSelectColumn( DbSourcePeer::DBS_TYPE ); $c->addSelectColumn( DbSourcePeer::DBS_TYPE );
$c->addSelectColumn( DbSourcePeer::DBS_SERVER ); $c->addSelectColumn( DbSourcePeer::DBS_SERVER );
$c->addSelectColumn( DbSourcePeer::DBS_DATABASE_NAME ); $c->addSelectColumn( DbSourcePeer::DBS_DATABASE_NAME );
$c->addSelectColumn( DbSourcePeer::DBS_CONNECTION_TYPE );
$c->addSelectColumn( DbSourcePeer::DBS_TNS );
$result = DbSourcePeer::doSelectRS( $c ); $result = DbSourcePeer::doSelectRS( $c );
$result->next(); $result->next();
@@ -161,8 +163,31 @@ class dbConnections
$sw = count($only) > 0; $sw = count($only) > 0;
while ($row = $result->getRow()) { while ($row = $result->getRow()) {
if ((trim( $pProUid ) == trim( $row[1] )) && ( $sw ? in_array($row[2], $only) : true )) { if ((trim( $pProUid ) == trim( $row[1] )) && ( $sw ? in_array($row[2], $only) : true )) {
$connections[] = Array ('DBS_UID' => $row[0],'DBS_NAME' => '[' . $row[3] . '] ' . $row[2] . ': ' . $row[4] $dbUid = $row[0];
);
$dbDescription = '';
$criteria2 = new Criteria('workflow');
$criteria2->addSelectColumn(ContentPeer::CON_VALUE);
$criteria2->add(ContentPeer::CON_ID, $dbUid, Criteria::EQUAL);
$rsCriteria2 = ContentPeer::doSelectRS($criteria2);
$rsCriteria2->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($rsCriteria2->next()) {
$row2 = $rsCriteria2->getRow();
if ($row2['CON_VALUE'] != '') {
$dbDescription = ' - [' . $row2['CON_VALUE'] . ']';
}
}
if ($row[5] == 'NORMAL') {
$connections[] = array('DBS_UID' => $row[0], 'DBS_NAME' => '[' . $row[3] . '] ' . $row[2] . ': ' . $row[4] . $dbDescription);
} else {
$connections[] = array('DBS_UID' => $row[0], 'DBS_NAME' => '[' . $row[6] . '] ' . $row[2] . ': ' . $row[6] . $dbDescription);
}
} }
$result->next(); $result->next();
} }

26
workflow/engine/src/ProcessMaker/BusinessModel/DataBaseConnection.php
View File

@@ -70,6 +70,32 @@ class DataBaseConnection
} }
$aFields['DBS_PASSWORD'] = $dbs->getPassWithoutEncrypt($aFields); $aFields['DBS_PASSWORD'] = $dbs->getPassWithoutEncrypt($aFields);
$aFields['DBS_DATABASE_DESCRIPTION'] = '';
$dbDescription = '';
$criteria2 = new \Criteria('workflow');
$criteria2->addSelectColumn(\ContentPeer::CON_VALUE);
$criteria2->add(\ContentPeer::CON_ID, $aFields['DBS_UID'], \Criteria::EQUAL);
$rsCriteria2 = \ContentPeer::doSelectRS($criteria2);
$rsCriteria2->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
if ($rsCriteria2->next()) {
$row2 = $rsCriteria2->getRow();
if ($row2['CON_VALUE'] != '') {
$dbDescription = ' - [' . $row2['CON_VALUE'] . ']';
}
}
if($aFields['DBS_TYPE'] == 'oracle' && $aFields['DBS_CONNECTION_TYPE'] == 'TNS') {
$aFields['DBS_DATABASE_DESCRIPTION'] = '[' . $aFields['DBS_TNS'] . ']' . $dbDescription;
} else {
$aFields['DBS_DATABASE_DESCRIPTION'] = $dbDescription;
}
$response = array_change_key_case($aFields, CASE_LOWER); $response = array_change_key_case($aFields, CASE_LOWER);
return $response; return $response;
} catch (\Exception $e) { } catch (\Exception $e) {