wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3994 from owncloud/fix_oracle_setup

Browse source 
General setup fixes for Oracle
This commit is contained in:
Jörn Friedrich Dreyer 2013-07-10 01:02:52 -07:00
commit 6a50848a6e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/setup/oci.php
View file

@ -9,8 +9,8 @@ class OCI extends AbstractDatabase {
public function initialize($config) {
parent::initialize($config);
if (array_key_exists('dbtablespace', $options)) {
$this->dbtablespace = $options['dbtablespace'];
if (array_key_exists('dbtablespace', $config)) {
$this->dbtablespace = $config['dbtablespace'];
} else {
$this->dbtablespace = 'USERS';
}
@ -31,14 +31,14 @@ class OCI extends AbstractDatabase {
if(!$connection) {
$e = oci_error();
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')
.' ORACLE_SID='.getenv('ORACLE_SID')
.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
.' NLS_LANG='.getenv('NLS_LANG')
.' 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')
.' ORACLE_SID='.getenv('ORACLE_SID')
.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')