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

only load mdb2 when we use the database

Browse source
This commit is contained in:
Robin Appelman 2011-02-06 01:18:45 +01:00
parent 7351528431
commit 0a505fd383
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
inc/lib_base.php
View file

@ -1,5 +1,4 @@
<?php
/**
* ownCloud
*
@ -81,8 +80,6 @@ oc_require_once('lib_log.php');
oc_require_once('lib_config.php');
oc_require_once('lib_user.php');
oc_require_once('lib_ocs.php');
@oc_require_once('MDB2.php');
@oc_require_once('MDB2/Schema.php');
oc_require_once('lib_connect.php');
oc_require_once('lib_remotestorage.php');
oc_require_once('lib_plugin.php');
@ -369,6 +366,7 @@ class OC_DB {
global $CONFIG_DBTYPE;
global $DOCUMENTROOT;
global $SERVERROOT;
@oc_require_once('MDB2.php');
if(!self::$DBConnection){
$options = array(
'portability' => MDB2_PORTABILITY_ALL,
@ -400,10 +398,14 @@ class OC_DB {
'database' => $CONFIG_DBNAME,
);
}
self::$DBConnection=&MDB2::factory($dsn,$options);
self::$DBConnection=MDB2::factory($dsn,$options);
if (PEAR::isError(self::$DBConnection)) {
echo('<b>can not connect to database, using '.$CONFIG_DBTYPE.'. ('.self::$DBConnection->getUserInfo().')</center>');
die(self::$DBConnection->getMessage());
$error=self::$DBConnection->getMessage();
error_log("$error");
error_log(self::$DBConnection->getUserInfo());
die($error);
}
self::$DBConnection->setFetchMode(MDB2_FETCHMODE_ASSOC);
}
@ -411,6 +413,7 @@ class OC_DB {
public static function connectScheme(){
self::connect();
@oc_require_once('MDB2/Schema.php');
if(!self::$schema){
self::$schema=&MDB2_Schema::factory(self::$DBConnection);
}
@ -467,7 +470,7 @@ class OC_DB {
$cmd=str_replace('`','"',$cmd);
}
$result=self::$DBConnection->queryAll($cmd);
if (PEAR::isError($result)) {
if (PEAR::isError($result)){
$entry='DB Error: "'.$result->getMessage().'"<br />';
$entry.='Offending command was: '.$cmd.'<br />';
die($entry);