Correccion de errores stdclass
This commit is contained in:
@@ -23,16 +23,14 @@
|
||||
*
|
||||
*/
|
||||
|
||||
if (defined('PATH_DB') && defined('SYS_SYS')) {
|
||||
if (defined('PATH_DB') && defined('SYS_SYS')) {
|
||||
|
||||
if (!file_exists(PATH_DB . SYS_SYS . '/db.php'))
|
||||
throw new Exception("Could not find db.php in current workspace " . SYS_SYS);
|
||||
throw new Exception("Could not find db.php in current workspace " . SYS_SYS);
|
||||
|
||||
require_once(PATH_DB . SYS_SYS . '/db.php');
|
||||
|
||||
//to do: enable for other databases
|
||||
$dbType = DB_ADAPTER;
|
||||
|
||||
$dsn = DB_ADAPTER . '://' . DB_USER . ':' . DB_PASS . '@' . DB_HOST . '/' . DB_NAME;
|
||||
|
||||
//to do: enable a mechanism to select RBAC Database
|
||||
@@ -42,18 +40,19 @@
|
||||
$dsnReport = DB_ADAPTER . '://' . DB_REPORT_USER . ':' . DB_REPORT_PASS . '@' . DB_REPORT_HOST . '/' . DB_REPORT_NAME;
|
||||
|
||||
switch (DB_ADAPTER) {
|
||||
case 'mysql':
|
||||
$dsn .= '?encoding=utf8';
|
||||
$dsnRbac .= '?encoding=utf8';
|
||||
$dsnReport .= '?encoding=utf8';
|
||||
break;
|
||||
case 'mssql':
|
||||
//$dsn .= '?sendStringAsUnicode=false';
|
||||
//$dsnRbac .= '?sendStringAsUnicode=false';
|
||||
//$dsnReport .= '?sendStringAsUnicode=false';
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
case 'mysql':
|
||||
$dsn .= '?encoding=utf8';
|
||||
$dsnRbac .= '?encoding=utf8';
|
||||
$dsnReport .= '?encoding=utf8';
|
||||
break;
|
||||
case 'mssql':
|
||||
case 'sqlsrv':
|
||||
//$dsn .= '?sendStringAsUnicode=false';
|
||||
//$dsnRbac .= '?sendStringAsUnicode=false';
|
||||
//$dsnReport .= '?sendStringAsUnicode=false';
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
$pro ['datasources']['workflow']['connection'] = $dsn;
|
||||
@@ -65,9 +64,9 @@
|
||||
$pro ['datasources']['rp']['connection'] = $dsnReport;
|
||||
$pro ['datasources']['rp']['adapter'] = DB_ADAPTER;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
$pro ['datasources']['dbarray']['connection'] = 'dbarray://user:pass@localhost/pm_os';
|
||||
$pro ['datasources']['dbarray']['adapter'] = 'dbarray';
|
||||
$pro ['datasources']['dbarray']['connection'] = 'dbarray://user:pass@localhost/pm_os';
|
||||
$pro ['datasources']['dbarray']['adapter'] = 'dbarray';
|
||||
|
||||
return $pro;
|
||||
return $pro;
|
||||
|
||||
Reference in New Issue
Block a user