From e5d3cd59acf5e9d9c7480797f30668103c00d1cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 14 Jun 2013 12:09:49 +0200
Subject: [PATCH] use USERS tablespace whn none is given, only needed when we
need to create a user, does not need to be stored in config
---
lib/setup.php | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/lib/setup.php b/lib/setup.php
index 71a2d13937..5a513bccae 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -133,12 +133,15 @@ class OC_Setup {
$dbuser = $options['dbuser'];
$dbpass = $options['dbpass'];
$dbname = $options['dbname'];
- $dbtablespace = $options['dbtablespace'];
+ if (array_key_exists('dbtablespace', $options)) {
+ $dbtablespace = $options['dbtablespace'];
+ } else {
+ $dbtablespace = 'USERS';
+ }
$dbhost = isset($options['dbhost'])?$options['dbhost']:'';
$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
OC_Config::setValue('dbname', $dbname);
- OC_Config::setValue('dbtablespace', $dbtablespace);
OC_Config::setValue('dbhost', $dbhost);
OC_Config::setValue('dbtableprefix', $dbtableprefix);
@@ -439,8 +442,8 @@ class OC_Setup {
}
}
- private static function setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace,
- $username) {
+ private static function setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix,
+ $dbtablespace = 'USERS', $username) {
$l = self::getTrans();
$e_host = addslashes($dbhost);
$e_dbname = addslashes($dbname);
@@ -552,7 +555,7 @@ class OC_Setup {
* @param String $tablespace
* @param resource $connection
*/
- private static function oci_createDBUser($name, $password, $tablespace, $connection) {
+ private static function oci_createDBUser($name, $password, $tablespace = 'USERS', $connection) {
$l = self::getTrans();
$query = "SELECT * FROM all_users WHERE USERNAME = :un";
$stmt = oci_parse($connection, $query);
--
GitLab