|
|
@ -442,8 +442,8 @@ class OC_Setup { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private static function setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, |
|
|
|
private static function setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace, |
|
|
|
$dbtablespace = 'USERS', $username) { |
|
|
|
$username) { |
|
|
|
$l = self::getTrans(); |
|
|
|
$l = self::getTrans(); |
|
|
|
$e_host = addslashes($dbhost); |
|
|
|
$e_host = addslashes($dbhost); |
|
|
|
$e_dbname = addslashes($dbname); |
|
|
|
$e_dbname = addslashes($dbname); |
|
|
@ -555,7 +555,7 @@ class OC_Setup { |
|
|
|
* @param String $tablespace |
|
|
|
* @param String $tablespace |
|
|
|
* @param resource $connection |
|
|
|
* @param resource $connection |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
private static function oci_createDBUser($name, $password, $tablespace = 'USERS', $connection) { |
|
|
|
private static function oci_createDBUser($name, $password, $tablespace, $connection) { |
|
|
|
$l = self::getTrans(); |
|
|
|
$l = self::getTrans(); |
|
|
|
$query = "SELECT * FROM all_users WHERE USERNAME = :un"; |
|
|
|
$query = "SELECT * FROM all_users WHERE USERNAME = :un"; |
|
|
|
$stmt = oci_parse($connection, $query); |
|
|
|
$stmt = oci_parse($connection, $query); |
|
|
|