Skip to content
Snippets Groups Projects
Commit 904573d0 authored by Andreas Fischer's avatar Andreas Fischer
Browse files

Add getLastError()

parent 95512723
Branches
No related tags found
No related merge requests found
...@@ -29,10 +29,10 @@ class OCI extends AbstractDatabase { ...@@ -29,10 +29,10 @@ class OCI extends AbstractDatabase {
\OC_Log::write('setup oracle', 'connect string: ' . $easy_connect_string, \OC_Log::DEBUG); \OC_Log::write('setup oracle', 'connect string: ' . $easy_connect_string, \OC_Log::DEBUG);
$connection = @oci_connect($this->dbuser, $this->dbpassword, $easy_connect_string); $connection = @oci_connect($this->dbuser, $this->dbpassword, $easy_connect_string);
if(!$connection) { if(!$connection) {
$e = oci_error(); $errorMessage = $this->getLastError();
if (is_array ($e) && isset ($e['message'])) { if ($errorMessage) {
throw new \DatabaseSetupException($this->trans->t('Oracle connection could not be established'), throw new \DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
$e['message'].' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME') $errorMessage.' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
.' ORACLE_SID='.getenv('ORACLE_SID') .' ORACLE_SID='.getenv('ORACLE_SID')
.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH') .' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
.' NLS_LANG='.getenv('NLS_LANG') .' NLS_LANG='.getenv('NLS_LANG')
...@@ -207,4 +207,21 @@ class OCI extends AbstractDatabase { ...@@ -207,4 +207,21 @@ class OCI extends AbstractDatabase {
\OC_Log::write('setup.oci', $entry, \OC_Log::WARN); \OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
} }
} }
/**
* @param resource $connection
*/
protected function getLastError($connection = null) {
if ($connection) {
$error = oci_error($connection);
} else {
$error = oci_error();
}
foreach (array('message', 'code') as $key) {
if (isset($error[$key])) {
return $error[$key];
}
}
return '';
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment