X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=86a3762b44f041945891eca407e5e31269fd7b77;hb=b50769b6d09549e1641bab1813087fd928602129;hp=50354b7f49ebaad028dc2042f335ce35ce78d76a;hpb=41f31f32824849a475b0259b4d5987e179f00b16;p=friendica.git diff --git a/include/dba.php b/include/dba.php index 50354b7f49..86a3762b44 100644 --- a/include/dba.php +++ b/include/dba.php @@ -1,23 +1,35 @@ connected = true; } + if (isset($a->config["system"]["db_charset"])) + $this->db->set_charset($a->config["system"]["db_charset"]); } else { $this->mysqli = false; @@ -61,6 +75,8 @@ class dba { if($this->db && mysql_select_db($db,$this->db)) { $this->connected = true; } + if (isset($a->config["system"]["db_charset"])) + mysql_set_charset($a->config["system"]["db_charset"], $this->db); } if(! $this->connected) { $this->db = null; @@ -75,7 +91,24 @@ class dba { return $this->db; } - public function q($sql) { + /** + * @brief Returns the MySQL server version string + * + * This function discriminate between the deprecated mysql API and the current + * object-oriented mysqli API. Example of returned string: 5.5.46-0+deb8u1 + * + * @return string + */ + public function server_info() { + if ($this->mysqli) { + $return = $this->db->server_info; + } else { + $return = mysql_get_server_info($this->db); + } + return $return; + } + + public function q($sql, $onlyquery = false) { global $a; if((! $this->db) || (! $this->connected)) @@ -83,6 +116,14 @@ class dba { $this->error = ''; + // Check the connection (This can reconnect the connection - if configured) + if ($this->mysqli) + $connected = $this->db->ping(); + else + $connected = mysql_ping($this->db); + + $connstr = ($connected ? "Connected": "Disonnected"); + $stamp1 = microtime(true); if($this->mysqli) @@ -93,11 +134,16 @@ class dba { $stamp2 = microtime(true); $duration = (float)($stamp2-$stamp1); + $a->save_timestamp($stamp1, "database"); + + if (strtolower(substr($sql, 0, 6)) != "select") + $a->save_timestamp($stamp1, "database_write"); + if(x($a->config,'system') && x($a->config['system'],'db_log')) { if (($duration > $a->config["system"]["db_loglimit"])) { $duration = round($duration, 3); $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - @file_put_contents($a->config["system"]["db_log"], $duration."\t". + @file_put_contents($a->config["system"]["db_log"], datetime_convert()."\t".$duration."\t". basename($backtrace[1]["file"])."\t". $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t". substr($sql, 0, 2000)."\n", FILE_APPEND); @@ -105,14 +151,17 @@ class dba { } if($this->mysqli) { - if($this->db->errno) + if($this->db->errno) { $this->error = $this->db->error; + $this->errorno = $this->db->errno; + } + } elseif(mysql_errno($this->db)) { + $this->error = mysql_error($this->db); + $this->errorno = mysql_errno($this->db); } - elseif(mysql_errno($this->db)) - $this->error = mysql_error($this->db); if(strlen($this->error)) { - logger('dba: ' . $this->error); + logger('DB Error ('.$connstr.') '.$this->errorno.': '.$this->error); } if($this->debug) { @@ -152,6 +201,11 @@ class dba { if(($result === true) || ($result === false)) return $result; + if ($onlyquery) { + $this->result = $result; + return true; + } + $r = array(); if($this->mysqli) { if($result->num_rows) { @@ -168,13 +222,37 @@ class dba { } } - $a->save_timestamp($stamp1, "database"); + //$a->save_timestamp($stamp1, "database"); if($this->debug) logger('dba: ' . printable(print_r($r, true))); return($r); } + public function qfetch() { + $x = false; + + if ($this->result) + if($this->mysqli) { + if($this->result->num_rows) + $x = $this->result->fetch_array(MYSQLI_ASSOC); + } else { + if(mysql_num_rows($this->result)) + $x = mysql_fetch_array($this->result, MYSQL_ASSOC); + } + + return($x); + } + + public function qclose() { + if ($this->result) + if($this->mysqli) { + $this->result->free_result(); + } else { + mysql_free_result($this->result); + } + } + public function dbg($dbg) { $this->debug = $dbg; } @@ -188,8 +266,17 @@ class dba { } } + function connected() { + if ($this->mysqli) + $connected = $this->db->ping(); + else + $connected = mysql_ping($this->db); + + return $connected; + } + function __destruct() { - if ($this->db) + if ($this->db) if($this->mysqli) $this->db->close(); else @@ -207,14 +294,14 @@ function printable($s) { }} // Procedural functions -if(! function_exists('dbg')) { +if(! function_exists('dbg')) { function dbg($state) { global $db; if($db) $db->dbg($state); }} -if(! function_exists('dbesc')) { +if(! function_exists('dbesc')) { function dbesc($str) { global $db; if($db && $db->connected) @@ -230,7 +317,7 @@ function dbesc($str) { // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", // 'user', 1); -if(! function_exists('q')) { +if(! function_exists('q')) { function q($sql) { global $db; @@ -247,12 +334,12 @@ function q($sql) { /** * - * This will happen occasionally trying to store the - * session data after abnormal program termination + * This will happen occasionally trying to store the + * session data after abnormal program termination * */ logger('dba: no database: ' . print_r($args,true)); - return false; + return false; }} @@ -262,7 +349,7 @@ function q($sql) { * */ -if(! function_exists('dbq')) { +if(! function_exists('dbq')) { function dbq($sql) { global $db; @@ -274,10 +361,10 @@ function dbq($sql) { }} -// Caller is responsible for ensuring that any integer arguments to +// Caller is responsible for ensuring that any integer arguments to // dbesc_array are actually integers and not malformed strings containing -// SQL injection vectors. All integer array elements should be specifically -// cast to int to avoid trouble. +// SQL injection vectors. All integer array elements should be specifically +// cast to int to avoid trouble. if(! function_exists('dbesc_array_cb')) { @@ -298,4 +385,3 @@ function dbesc_array(&$arr) { function dba_timer() { return microtime(true); } -