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

BUG 7798 Fix Bug in the connection to an instance for SQLServer database.

Browse Source
This commit is contained in:
Hector Cortez
2011-11-08 16:23:23 -04:00
parent 9b3921665f
commit cab6281d06
4 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/methods/dbConnections/dbConnectionsAjax.php
View File

@@ -147,6 +147,8 @@ switch ( $action ){
$oDBSource = new DbSource();
$oContent = new Content();
if(strpos($_POST['server'], "\\"))
$_POST['port'] = 'none';
$aData = Array(
'DBS_UID' => $_POST['dbs_uid'],
'PRO_UID' => $_SESSION['PROCESS'],
@@ -168,6 +170,8 @@ switch ( $action ){
$oDBSource = new DbSource();
$oContent = new Content();
if(strpos($_POST['server'], "\\"))
$_POST['port'] = 'none';
$aData = Array(
'PRO_UID' => $_SESSION['PROCESS'],
'DBS_TYPE' => $_POST['type'],

6
workflow/engine/methods/dbConnections/genericDbConnections.php
View File

@@ -13,7 +13,11 @@ if( isset($_SESSION['PROCESS']) ){
$db['DBS_PASSWORD'] = $oDbConnections->getPassWithoutEncrypt($db);
$dbsPort = ($db['DBS_PORT'] == '') ? ('') : (':'.$db['DBS_PORT']);
$ENCODE = (trim($db['DBS_ENCODE']) == '')? '': '?encoding=' . $db['DBS_ENCODE'];
$pro['datasources'][$db['DBS_UID']]['connection'] = $db['DBS_TYPE'] . '://' . $db['DBS_USERNAME'] . ':' . $db['DBS_PASSWORD'] . '@' . $db['DBS_SERVER'] .$dbsPort. '/' . $db['DBS_DATABASE_NAME'] . $ENCODE;
if(strpos($db['DBS_SERVER'], "\\") && $db['DBS_TYPE'] == 'mssql'){
$pro['datasources'][$db['DBS_UID']]['connection'] = $db['DBS_TYPE'] . '://' . $db['DBS_USERNAME'] . ':' . $db['DBS_PASSWORD'] . '@' . $db['DBS_SERVER'] . '/' . $db['DBS_DATABASE_NAME'] . $ENCODE;
} else {
$pro['datasources'][$db['DBS_UID']]['connection'] = $db['DBS_TYPE'] . '://' . $db['DBS_USERNAME'] . ':' . $db['DBS_PASSWORD'] . '@' . $db['DBS_SERVER'] .$dbsPort. '/' . $db['DBS_DATABASE_NAME'] . $ENCODE;
}
$pro['datasources'][$db['DBS_UID']]['adapter'] = $db['DBS_TYPE'];
}
return $pro;