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

Fix review items

Browse source
This commit is contained in:
Bart Visscher 2013-06-27 20:19:51 +02:00
parent e93ce26f27
commit 60eb63e35a
7 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/setup.php
View file

@ -19,7 +19,7 @@ class DatabaseSetupException extends Exception
}
class OC_Setup {
static $db_setup_classes = array(
static $dbSetupClasses = array(
'mysql' => '\OC\Setup\MySQL',
'pgsql' => '\OC\Setup\PostgreSQL',
'oci' => '\OC\Setup\OCI',
@ -48,13 +48,13 @@ class OC_Setup {
$options['directory'] = OC::$SERVERROOT."/data";
}
if (!isset(self::$db_setup_classes[$dbtype])) {
if (!isset(self::$dbSetupClasses[$dbtype])) {
$dbtype = 'sqlite';
}
$class = self::$db_setup_classes[$dbtype];
$db_setup = new $class(self::getTrans());
$error = array_merge($error, $db_setup->validate($options));
$class = self::$dbSetupClasses[$dbtype];
$dbSetup = new $class(self::getTrans(), 'db_structure.xml');
$error = array_merge($error, $dbSetup->validate($options));
if(count($error) != 0) {
return $error;
@ -83,8 +83,8 @@ class OC_Setup {
OC_Config::setValue('dbtype', $dbtype);
OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
try {
$db_setup->initialize($options);
$db_setup->setupDatabase($username);
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
} catch (DatabaseSetupException $e) {
$error[] = array(
'error' => $e->getMessage(),

4
lib/setup/abstractdatabase.php
View file

@ -4,14 +4,16 @@ namespace OC\Setup;
abstract class AbstractDatabase {
protected $trans;
protected $dbDefinitionFile;
protected $dbuser;
protected $dbpassword;
protected $dbname;
protected $dbhost;
protected $tableprefix;
public function __construct($trans) {
public function __construct($trans, $dbDefinitionFile) {
$this->trans = $trans;
$this->dbDefinitionFile = $dbDefinitionFile;
}
public function validate($config) {

2
lib/setup/mssql.php
View file

@ -172,7 +172,7 @@ class MSSQL extends AbstractDatabase {
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
} else {
if ($row == null) {
\OC_DB::createDbFromStructure('db_structure.xml');
\OC_DB::createDbFromStructure($this->dbDefinitionFile);
}
}
}

2
lib/setup/mysql.php
View file

@ -52,7 +52,7 @@ class MySQL extends AbstractDatabase {
$row=mysql_fetch_row($result);
}
if(!$result or $row[0]==0) {
\OC_DB::createDbFromStructure('db_structure.xml');
\OC_DB::createDbFromStructure($this->dbDefinitionFile);
}
mysql_close($connection);
}

2
lib/setup/oci.php
View file

@ -128,7 +128,7 @@ class OCI extends AbstractDatabase {
$row = oci_fetch_row($stmt);
}
if(!$result or $row[0]==0) {
\OC_DB::createDbFromStructure('db_structure.xml');
\OC_DB::createDbFromStructure($this->dbDefinitionFile);
}
}

2
lib/setup/postgresql.php
View file

@ -75,7 +75,7 @@ class PostgreSQL extends AbstractDatabase {
$row = pg_fetch_row($result);
}
if(!$result or $row[0]==0) {
\OC_DB::createDbFromStructure('db_structure.xml');
\OC_DB::createDbFromStructure($this->dbDefinitionFile);
}
}

2
lib/setup/sqlite.php
View file

@ -21,6 +21,6 @@ class Sqlite extends AbstractDatabase {
}
//in case of sqlite, we can always fill the database
error_log("creating sqlite db");
\OC_DB::createDbFromStructure('db_structure.xml');
\OC_DB::createDbFromStructure($this->dbDefinitionFile);
}
}