X-Git-Url: https://reisub.nsupdate.info/git/?a=blobdiff_plain;f=include%2Fdba.php;h=b21b01b6db985720b925ff8aa81a36089d5ae55d;hb=8584e09e126b8c34d16761250205b4e1534ad02b;hp=aa63a5b36145d06da05b0faaab8db10aedf4e424;hpb=69300291f03fe85502df9907014f0ad68ee07c9c;p=friendica.git%2F.git

diff --git a/include/dba.php b/include/dba.php
index aa63a5b361..b21b01b6db 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -23,10 +23,15 @@ class dba {
 	private static $errorno = 0;
 	private static $affected_rows = 0;
 	private static $in_transaction = false;
+	private static $in_retrial = false;
 	private static $relation = [];
+	private static $db_serveraddr = '';
+	private static $db_user = '';
+	private static $db_pass = '';
+	private static $db_name = '';
 
 	public static function connect($serveraddr, $user, $pass, $db) {
-		if (!is_null(self::$db)) {
+		if (!is_null(self::$db) && self::connected()) {
 			return true;
 		}
 
@@ -34,6 +39,12 @@ class dba {
 
 		$stamp1 = microtime(true);
 
+		// We are storing these values for being able to perform a reconnect
+		self::$db_serveraddr = $serveraddr;
+		self::$db_user = $user;
+		self::$db_pass = $pass;
+		self::$db_name = $db;
+
 		$serveraddr = trim($serveraddr);
 
 		$serverdata = explode(':', $serveraddr);
@@ -92,6 +103,36 @@ class dba {
 		return self::$connected;
 	}
 
+	/**
+	 * Disconnects the current database connection
+	 */
+	public static function disconnect()
+	{
+		if (is_null(self::$db)) {
+			return;
+		}
+
+		switch (self::$driver) {
+			case 'pdo':
+				self::$db = null;
+				break;
+			case 'mysqli':
+				self::$db->close();
+				self::$db = null;
+				break;
+		}
+	}
+
+	/**
+	 * Perform a reconnect of an existing database connection
+	 */
+	public static function reconnect() {
+		self::disconnect();
+
+		$ret = self::connect(self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name);
+		return $ret;
+	}
+
 	/**
 	 * Return the database object.
 	 * @return PDO|mysqli
@@ -431,23 +472,23 @@ class dba {
 					break;
 				}
 
-				$params = '';
+				$param_types = '';
 				$values = [];
 				foreach ($args AS $param => $value) {
 					if (is_int($args[$param])) {
-						$params .= 'i';
+						$param_types .= 'i';
 					} elseif (is_float($args[$param])) {
-						$params .= 'd';
+						$param_types .= 'd';
 					} elseif (is_string($args[$param])) {
-						$params .= 's';
+						$param_types .= 's';
 					} else {
-						$params .= 'b';
+						$param_types .= 'b';
 					}
 					$values[] = &$args[$param];
 				}
 
 				if (count($values) > 0) {
-					array_unshift($values, $params);
+					array_unshift($values, $param_types);
 					call_user_func_array([$stmt, 'bind_param'], $values);
 				}
 
@@ -470,7 +511,27 @@ class dba {
 			$errorno = self::$errorno;
 
 			logger('DB Error '.self::$errorno.': '.self::$error."\n".
-				System::callstack(8)."\n".self::replaceParameters($sql, $params));
+				System::callstack(8)."\n".self::replaceParameters($sql, $args));
+
+			// On a lost connection we try to reconnect - but only once.
+			if ($errorno == 2006) {
+				if (self::$in_retrial || !self::reconnect()) {
+					// It doesn't make sense to continue when the database connection was lost
+					if (self::$in_retrial) {
+						logger('Giving up retrial because of database error '.$errorno.': '.$error);
+					} else {
+						logger("Couldn't reconnect after database error ".$errorno.': '.$error);
+					}
+					exit(1);
+				} else {
+					// We try it again
+					logger('Reconnected after database error '.$errorno.': '.$error);
+					self::$in_retrial = true;
+					$ret = self::p($sql, $args);
+					self::$in_retrial = false;
+					return $ret;
+				}
+			}
 
 			self::$error = $error;
 			self::$errorno = $errorno;
@@ -1148,29 +1209,9 @@ class dba {
 
 		$condition_string = self::buildCondition($condition);
 
-		$order_string = '';
-		if (isset($params['order'])) {
-			$order_string = " ORDER BY ";
-			foreach ($params['order'] AS $fields => $order) {
-				if (!is_int($fields)) {
-					$order_string .= "`" . $fields . "` " . ($order ? "DESC" : "ASC") . ", ";
-				} else {
-					$order_string .= "`" . $order . "`, ";
-				}
-			}
-			$order_string = substr($order_string, 0, -2);
-		}
+		$param_string = self::buildParameter($params);
 
-		$limit_string = '';
-		if (isset($params['limit']) && is_int($params['limit'])) {
-			$limit_string = " LIMIT " . $params['limit'];
-		}
-
-		if (isset($params['limit']) && is_array($params['limit'])) {
-			$limit_string = " LIMIT " . intval($params['limit'][0]) . ", " . intval($params['limit'][1]);
-		}
-
-		$sql = "SELECT " . $select_fields . " FROM `" . $table . "`" . $condition_string . $order_string . $limit_string;
+		$sql = "SELECT " . $select_fields . " FROM `" . $table . "`" . $condition_string . $param_string;
 
 		$result = self::p($sql, $condition);
 
@@ -1227,14 +1268,14 @@ class dba {
 	 * @param array $condition
 	 * @return string
 	 */
-	private static function buildCondition(array &$condition = [])
+	public static function buildCondition(array &$condition = [])
 	{
 		$condition_string = '';
 		if (count($condition) > 0) {
 			reset($condition);
 			$first_key = key($condition);
 			if (is_int($first_key)) {
-				$condition_string = " WHERE ".array_shift($condition);
+				$condition_string = " WHERE (" . array_shift($condition) . ")";
 			} else {
 				$new_values = [];
 				$condition_string = "";
@@ -1251,7 +1292,7 @@ class dba {
 						$condition_string .= "`" . $field . "` = ?";
 					}
 				}
-				$condition_string = " WHERE " . $condition_string;
+				$condition_string = " WHERE (" . $condition_string . ")";
 				$condition = $new_values;
 			}
 		}
@@ -1259,6 +1300,39 @@ class dba {
 		return $condition_string;
 	}
 
+	/**
+	 * @brief Returns the SQL parameter string built from the provided parameter array
+	 *
+	 * @param array $params
+	 * @return string
+	 */
+	public static function buildParameter(array $params = [])
+	{
+		$order_string = '';
+		if (isset($params['order'])) {
+			$order_string = " ORDER BY ";
+			foreach ($params['order'] AS $fields => $order) {
+				if (!is_int($fields)) {
+					$order_string .= "`" . $fields . "` " . ($order ? "DESC" : "ASC") . ", ";
+				} else {
+					$order_string .= "`" . $order . "`, ";
+				}
+			}
+			$order_string = substr($order_string, 0, -2);
+		}
+
+		$limit_string = '';
+		if (isset($params['limit']) && is_int($params['limit'])) {
+			$limit_string = " LIMIT " . $params['limit'];
+		}
+
+		if (isset($params['limit']) && is_array($params['limit'])) {
+			$limit_string = " LIMIT " . intval($params['limit'][0]) . ", " . intval($params['limit'][1]);
+		}
+
+		return $order_string.$limit_string;
+	}
+
 	/**
 	 * @brief Fills an array with data from a query
 	 *