Skip to content
Snippets Groups Projects
Commit 194ab113 authored by Victor Dubiniuk's avatar Victor Dubiniuk
Browse files

General fixes

parent 40879c63
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
lib/setup/oci.php
+ 4
− 4
View file @ 194ab113
...@@ -9,8 +9,8 @@ class OCI extends AbstractDatabase { ...@@ -9,8 +9,8 @@ class OCI extends AbstractDatabase {
public function initialize($config) { public function initialize($config) {
parent::initialize($config); parent::initialize($config);
if (array_key_exists('dbtablespace', $options)) { if (array_key_exists('dbtablespace', $config)) {
$this->dbtablespace = $options['dbtablespace']; $this->dbtablespace = $config['dbtablespace'];
} else { } else {
$this->dbtablespace = 'USERS'; $this->dbtablespace = 'USERS';
} }
...@@ -31,14 +31,14 @@ class OCI extends AbstractDatabase { ...@@ -31,14 +31,14 @@ class OCI extends AbstractDatabase {
if(!$connection) { if(!$connection) {
$e = oci_error(); $e = oci_error();
if (is_array ($e) && isset ($e['message'])) { if (is_array ($e) && isset ($e['message'])) {
throw new DatabaseSetupException($l->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') $e['message'].' 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')
.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable'); .' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
} }
throw new DatabaseSetupException($l->t('Oracle username and/or password not valid'), throw new \DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME') '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')
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment