mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

This commit is contained in:
Robin Appelman 2010-07-05 13:35:41 +02:00
parent a73fbc5e32 4e12ce63f9
commit db5ac0b477
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inc/lib_base.php
View File

@ -302,6 +302,8 @@ class OC_UTIL {
class OC_DB { class OC_DB {
static private $DBConnection=false; static private $DBConnection=false;
static private $schema=false; static private $schema=false;
static private $affected=0;
static private $result=false;
/** /**
* connect to the datbase if not already connected * connect to the datbase if not already connected
*/ */
@ -371,12 +373,15 @@ class OC_DB {
}elseif($CONFIG_DBTYPE=='pgsql'){ }elseif($CONFIG_DBTYPE=='pgsql'){
$cmd=str_replace('`','"',$cmd); $cmd=str_replace('`','"',$cmd);
} }
$result=self::$DBConnection->query($cmd); $result=self::$DBConnection->exec($cmd);
if (PEAR::isError($result)) { if (PEAR::isError($result)) {
$entry='DB Error: "'.$result->getMessage().'"<br />'; $entry='DB Error: "'.$result->getMessage().'"<br />';
$entry.='Offending command was: '.$cmd.'<br />'; $entry.='Offending command was: '.$cmd.'<br />';
die($entry); die($entry);
}else{
self::$affected=$result;
} }
self::$result=$result;
return $result; return $result;
} }
@ -454,7 +459,7 @@ class OC_DB {
* @return int * @return int
*/ */
static function affected_rows() { static function affected_rows() {
self::$DBConnection->affectedRows(); return self::$affected;
} }
/** /**
@ -487,8 +492,11 @@ class OC_DB {
* @param unknown_type $result * @param unknown_type $result
* @return bool * @return bool
*/ */
static function free_result($result) { static function free_result() {
$result->free(); if(self::$result){
self::$result->free();
self::$result=false;
}
} }
static public function disconnect(){ static public function disconnect(){