X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FDatabase.php;h=88d8d7d0f6ef87baa78cbc7f63dcd2cceeb65c15;hb=612e91b603a5a5817839d04d120e1cf672b8a80e;hp=8e347056326e57f552555746216461e53cccab3a;hpb=054c301ef0345c4ff9f35cfd08717757eab17b9d;p=friendica.git

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 8e34705632..88d8d7d0f6 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,9 +21,9 @@
 
 namespace Friendica\Database;
 
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\System;
-use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Network\HTTPException\ServiceUnavailableException;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
 use mysqli;
@@ -49,7 +49,7 @@ class Database
 	protected $connected = false;
 
 	/**
-	 * @var Cache
+	 * @var \Friendica\Core\Config\ValueObject\Cache
 	 */
 	protected $configCache;
 	/**
@@ -114,6 +114,7 @@ class Database
 		$pass    = trim($this->configCache->get('database', 'password'));
 		$db      = trim($this->configCache->get('database', 'database'));
 		$charset = trim($this->configCache->get('database', 'charset'));
+		$socket  = trim($this->configCache->get('database', 'socket')); 
 
 		if (!(strlen($server) && strlen($user))) {
 			return false;
@@ -135,9 +136,14 @@ class Database
 				$connect .= ";charset=" . $charset;
 			}
 
+			if ($socket) {
+				$connect .= ";$unix_socket=" . $socket;
+			}
+
 			try {
 				$this->connection = @new PDO($connect, $user, $pass, [PDO::ATTR_PERSISTENT => $persistent]);
 				$this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, $this->pdo_emulate_prepares);
+				$this->connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 				$this->connected = true;
 			} catch (PDOException $e) {
 				$this->connected = false;
@@ -159,6 +165,11 @@ class Database
 				if ($charset) {
 					$this->connection->set_charset($charset);
 				}
+
+				if ($socket) {
+					$this->connection->set_socket($socket);
+				}
+
 			}
 		}
 
@@ -434,7 +445,7 @@ class Database
 	private function replaceParameters($sql, $args)
 	{
 		$offset = 0;
-		foreach ($args AS $param => $value) {
+		foreach ($args as $param => $value) {
 			if (is_int($args[$param]) || is_float($args[$param]) || is_bool($args[$param])) {
 				$replace = intval($args[$param]);
 			} elseif (is_null($args[$param])) {
@@ -468,6 +479,7 @@ class Database
 	public function p($sql)
 	{
 
+		$this->profiler->startRecording('database');
 		$stamp1 = microtime(true);
 
 		$params = DBA::getParam(func_get_args());
@@ -475,7 +487,7 @@ class Database
 		// Renumber the array keys to be sure that they fit
 		$i    = 0;
 		$args = [];
-		foreach ($params AS $param) {
+		foreach ($params as $param) {
 			// Avoid problems with some MySQL servers and boolean values. See issue #3645
 			if (is_bool($param)) {
 				$param = (int)$param;
@@ -519,7 +531,7 @@ class Database
 		$called_from_e = ($called_from['function'] == 'e');
 
 		if (!isset($this->connection)) {
-			throw new InternalServerErrorException('The Connection is empty, although connected is set true.');
+			throw new ServiceUnavailableException('The Connection is empty, although connected is set true.');
 		}
 
 		switch ($this->driver) {
@@ -548,12 +560,14 @@ class Database
 					break;
 				}
 
-				foreach ($args AS $param => $value) {
+				foreach (array_keys($args) as $param) {
+					$data_type = PDO::PARAM_STR;
 					if (is_int($args[$param])) {
 						$data_type = PDO::PARAM_INT;
-					} else {
-						$data_type = PDO::PARAM_STR;
+					} elseif ($args[$param] !== null) {
+						$args[$param] = (string)$args[$param];
 					}
+
 					$stmt->bindParam($param, $args[$param], $data_type);
 				}
 
@@ -604,13 +618,16 @@ class Database
 
 				$param_types = '';
 				$values      = [];
-				foreach ($args AS $param => $value) {
+				foreach (array_keys($args) as $param) {
 					if (is_int($args[$param])) {
 						$param_types .= 'i';
 					} elseif (is_float($args[$param])) {
 						$param_types .= 'd';
 					} elseif (is_string($args[$param])) {
 						$param_types .= 's';
+					} elseif (is_object($args[$param]) && method_exists($args[$param], '__toString')) {
+						$param_types .= 's';
+						$args[$param] = (string)$args[$param];
 					} else {
 						$param_types .= 'b';
 					}
@@ -695,7 +712,7 @@ class Database
 			$this->errorno = $errorno;
 		}
 
-		$this->profiler->saveTimestamp($stamp1, 'database');
+		$this->profiler->stopRecording();
 
 		if ($this->configCache->get('system', 'db_log')) {
 			$stamp2   = microtime(true);
@@ -727,7 +744,7 @@ class Database
 	public function e($sql)
 	{
 
-		$stamp = microtime(true);
+		$this->profiler->startRecording('database_write');
 
 		$params = DBA::getParam(func_get_args());
 
@@ -779,7 +796,7 @@ class Database
 			$this->errorno = $errorno;
 		}
 
-		$this->profiler->saveTimestamp($stamp, "database_write");
+		$this->profiler->stopRecording();
 
 		return $retval;
 	}
@@ -908,13 +925,13 @@ class Database
 	/**
 	 * Fetch a single row
 	 *
-	 * @param PDOStatement|mysqli_stmt $stmt statement object
+	 * @param bool|PDOStatement|mysqli_stmt $stmt statement object
 	 *
 	 * @return array|false current row
 	 */
 	public function fetch($stmt)
 	{
-		$stamp1 = microtime(true);
+		$this->profiler->startRecording('database');
 
 		$columns = [];
 
@@ -957,18 +974,18 @@ class Database
 				$result = $stmt->result_metadata();
 				$fields = $result->fetch_fields();
 
-				foreach ($cols_num AS $param => $col) {
+				foreach ($cols_num as $param => $col) {
 					$columns[$fields[$param]->name] = $col;
 				}
 		}
 
-		$this->profiler->saveTimestamp($stamp1, 'database');
+		$this->profiler->stopRecording();
 
 		return $columns;
 	}
 
 	/**
-	 * Insert a row into a table
+	 * Insert a row into a table. Field value objects will be cast as string.
 	 *
 	 * @param string|array $table          Table name or array [schema => table]
 	 * @param array        $param          parameter array
@@ -1243,9 +1260,9 @@ class Database
 	}
 
 	/**
-	 * Updates rows
+	 * Updates rows in the database. Field value objects will be cast as string.
 	 *
-	 * Updates rows in the database. When $old_fields is set to an array,
+	 * When $old_fields is set to an array,
 	 * the system will only do an update if the fields in that array changed.
 	 *
 	 * Attention:
@@ -1266,7 +1283,7 @@ class Database
 	 * @param string|array  $table      Table name or array [schema => table]
 	 * @param array         $fields     contains the fields that are updated
 	 * @param array         $condition  condition array with the key values
-	 * @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate)
+	 * @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate, false = don't update identical fields)
 	 *
 	 * @return boolean was the update successfull?
 	 * @throws \Exception
@@ -1292,7 +1309,7 @@ class Database
 			}
 		}
 
-		foreach ($old_fields AS $fieldname => $content) {
+		foreach ($old_fields as $fieldname => $content) {
 			if (isset($fields[$fieldname]) && !is_null($content) && ($fields[$fieldname] == $content)) {
 				unset($fields[$fieldname]);
 			}
@@ -1361,6 +1378,45 @@ class Database
 		return $this->toArray($this->select($table, $fields, $condition, $params));
 	}
 
+	/**
+	 * Escape fields, adding special treatment for "group by" handling
+	 *
+	 * @param array $fields 
+	 * @param array $options 
+	 * @return array 
+	 */
+	private function escapeFields(array $fields, array $options)
+	{
+		// In the case of a "GROUP BY" we have to add all the ORDER fields to the fieldlist.
+		// This needs to done to apply the "ANY_VALUE(...)" treatment from below to them.
+		// Otherwise MySQL would report errors.
+		if (!empty($options['group_by']) && !empty($options['order'])) {
+			foreach ($options['order'] as $key => $field) {
+				if (!is_int($key)) {
+					if (!in_array($key, $fields)) {
+						$fields[] = $key;
+					}
+				} else {
+					if (!in_array($field, $fields)) {
+						$fields[] = $field;
+					}
+				}
+			}
+		}
+
+		array_walk($fields, function(&$value, $key) use ($options)
+		{
+			$field = $value;
+			$value = '`' . str_replace('`', '``', $value) . '`';
+
+			if (!empty($options['group_by']) && !in_array($field, $options['group_by'])) {
+				$value = 'ANY_VALUE(' . $value . ') AS ' . $value;
+			}
+		});
+
+		return $fields;
+	}
+
 	/**
 	 * Select rows from a table
 	 *
@@ -1397,7 +1453,8 @@ class Database
 		}
 
 		if (count($fields) > 0) {
-			$select_string = implode(', ', array_map([DBA::class, 'quoteIdentifier'], $fields));
+			$fields = $this->escapeFields($fields, $params);
+			$select_string = implode(', ', $fields);
 		} else {
 			$select_string = '*';
 		}
@@ -1460,8 +1517,12 @@ class Database
 
 		$row = $this->fetchFirst($sql, $condition);
 
-		// Ensure to always return either a "null" or a numeric value
-		return is_numeric($row['count']) ? (int)$row['count'] : $row['count'];
+		if (!isset($row['count'])) {
+			$this->logger->notice('Invalid count.', ['table' => $table, 'row' => $row, 'expression' => $expression, 'condition' => $condition_string, 'callstack' => System::callstack()]);
+			return 0;
+		} else {
+			return (int)$row['count'];
+		}
 	}
 
 	/**
@@ -1556,9 +1617,9 @@ class Database
 			}
 		}
 
-		return $fields;	
+		return $fields;
 	}
-	
+
 	/**
 	 * Returns the error number of the last query
 	 *
@@ -1589,7 +1650,7 @@ class Database
 	public function close($stmt)
 	{
 
-		$stamp1 = microtime(true);
+		$this->profiler->startRecording('database');
 
 		if (!is_object($stmt)) {
 			return false;
@@ -1615,7 +1676,7 @@ class Database
 				break;
 		}
 
-		$this->profiler->saveTimestamp($stamp1, 'database');
+		$this->profiler->stopRecording();
 
 		return $ret;
 	}