moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-17491 oracle connections - fix annoyance when multiple connections

Browse source 
are used and enforce new connections by using oci_new_connect()
This commit is contained in:
Eloy Lafuente 2009-11-08 23:13:31 +00:00
parent 446e2634d4
commit 9d3cbeb695
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/dml/oci_native_moodle_database.php
View file

@ -180,19 +180,20 @@ class oci_native_moodle_database extends moodle_database {
$pass = addcslashes($this->dbpass, "'\\"); $pass = addcslashes($this->dbpass, "'\\");
if (empty($this->dbhost)) { if (empty($this->dbhost)) {
// old style full address // old style full address (TNS)
$dbstring = $this->dbname;
} else { } else {
if (empty($this->dboptions['dbport'])) { if (empty($this->dboptions['dbport'])) {
$this->dboptions['dbport'] = 1521; $this->dboptions['dbport'] = 1521;
} }
$this->dbname = '//'.$this->dbhost.':'.$this->dboptions['dbport'].'/'.$this->dbname; $dbstring = '//'.$this->dbhost.':'.$this->dboptions['dbport'].'/'.$this->dbname;
} }
ob_start(); ob_start();
if (empty($this->dboptions['dbpersit'])) { if (empty($this->dboptions['dbpersit'])) {
$this->oci = oci_connect($this->dbuser, $this->dbpass, $this->dbname, 'AL32UTF8'); $this->oci = oci_new_connect($this->dbuser, $this->dbpass, $dbstring, 'AL32UTF8');
} else { } else {
$this->oci = oci_pconnect($this->dbuser, $this->dbpass, $this->dbname, 'AL32UTF8'); $this->oci = oci_pconnect($this->dbuser, $this->dbpass, $dbstring, 'AL32UTF8');
} }
$dberr = ob_get_contents(); $dberr = ob_get_contents();
ob_end_clean(); ob_end_clean();