clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DBA: Deactivation of the mysqli-class for testing purposes.

This commit is contained in:
Michael Vogel 2012-04-13 00:05:52 +02:00
parent ee714daf4d
commit 138caa4380
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
include/dba.php
View File

@ -53,8 +53,9 @@ if(! class_exists('dba')) {
} }
if(class_exists('mysqli')) { if(class_exists('mysqli')) {
$this->db = new mysqli($server,$user,$pass,$db); $this->db = @new mysqli($server,$user,$pass,$db);
if(NULL === $this->db->connect_error) { //if(NULL === $this->db->connect_error) {
if(!$this->db->connect_error) {
$this->connected = true; $this->connected = true;
} else { } else {
throw new RuntimeException($this->db->connect_error); throw new RuntimeException($this->db->connect_error);
@ -116,7 +117,7 @@ if(! class_exists('dba')) {
// If dbfail.out exists, we will write any failed calls directly to it, // If dbfail.out exists, we will write any failed calls directly to it,
// regardless of any logging that may or may nor be in effect. // regardless of any logging that may or may nor be in effect.
// These usually indicate SQL syntax errors that need to be resolved. // These usually indicate SQL syntax errors that need to be resolved.
if(file_exists('dbfail.out')) { if(file_exists('dbfail.out')) {
file_put_contents('dbfail.out', datetime_convert() . "\n" . $str . "\n", FILE_APPEND); file_put_contents('dbfail.out', datetime_convert() . "\n" . $str . "\n", FILE_APPEND);
} }
logger('dba: ' . $str ); logger('dba: ' . $str );
@ -176,49 +177,49 @@ if(! class_exists('dba')) {
* commit() or rollback(). Please mind that the db table engine may * commit() or rollback(). Please mind that the db table engine may
* not support this. * not support this.
*/ */
public function beginTransaction() { public function beginTransaction() {
if($this->mysqli) { if($this->mysqli) {
return $this->db->autocommit(false); return $this->db->autocommit(false);
} else { } else {
//no transaction support in mysql module... //no transaction support in mysql module...
mysql_query('SET AUTOCOMMIT = 0;', $db); mysql_query('SET AUTOCOMMIT = 0;', $db);
} }
} }
/** /**
* rollback a transaction. So, rollback anything that was done since the last call * rollback a transaction. So, rollback anything that was done since the last call
* to beginTransaction(). * to beginTransaction().
*/ */
public function rollback() { public function rollback() {
if($this->mysqli) { if($this->mysqli) {
return $this->db->rollback(); return $this->db->rollback();
} else { } else {
//no transaction support in mysql module... //no transaction support in mysql module...
mysql_query('ROLLBACK;', $db); mysql_query('ROLLBACK;', $db);
} }
$this->stopTransaction(); $this->stopTransaction();
} }
/** /**
* commit a transaction. So, write any query to the database. * commit a transaction. So, write any query to the database.
*/ */
public function commit() { public function commit() {
if($this->mysqli) { if($this->mysqli) {
return $this->db->commit(); return $this->db->commit();
} else { } else {
//no transaction support in mysql module... //no transaction support in mysql module...
mysql_query('COMMIT;', $db); mysql_query('COMMIT;', $db);
} }
$this->stopTransaction(); $this->stopTransaction();
} }
private function stopTransaction() { private function stopTransaction() {
if($this->mysqli) { if($this->mysqli) {
return $this->db->autocommit(true); return $this->db->autocommit(true);
} else { } else {
//no transaction support in mysql module... //no transaction support in mysql module...
mysql_query('SET AUTOCOMMIT = 1;', $db); mysql_query('SET AUTOCOMMIT = 1;', $db);
} }
} }
public function dbg($dbg) { public function dbg($dbg) {