X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FDBA.php;h=9c607638b9c6050b8e069f591881ad3b20b49791;hb=6b8db5ad1333e2b430da3a771d9a962d44d4b6fc;hp=593ca0e5074e439492163f1f35d706b1b73ad5e6;hpb=9c9e07dbab0211c42a2e2e3653856588a7a48c54;p=friendica.git

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 593ca0e507..9c607638b9 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -2,7 +2,7 @@
 
 namespace Friendica\Database;
 
-use Friendica\BaseObject;
+use Friendica\DI;
 use mysqli;
 use mysqli_result;
 use mysqli_stmt;
@@ -14,7 +14,7 @@ use PDOStatement;
  *
  * This class is for the low level database stuff that does driver specific things.
  */
-class DBA extends BaseObject
+class DBA
 {
 	/**
 	 * Lowest possible date value
@@ -27,7 +27,7 @@ class DBA extends BaseObject
 
 	public static function connect()
 	{
-		return self::getClass(Database::class)->connect();
+		return DI::dba()->connect();
 	}
 
 	/**
@@ -35,7 +35,7 @@ class DBA extends BaseObject
 	 */
 	public static function disconnect()
 	{
-		self::getClass(Database::class)->disconnect();
+		DI::dba()->disconnect();
 	}
 
 	/**
@@ -43,7 +43,7 @@ class DBA extends BaseObject
 	 */
 	public static function reconnect()
 	{
-		return self::getClass(Database::class)->reconnect();
+		return DI::dba()->reconnect();
 	}
 
 	/**
@@ -52,7 +52,7 @@ class DBA extends BaseObject
 	 */
 	public static function getConnection()
 	{
-		return self::getClass(Database::class)->getConnection();
+		return DI::dba()->getConnection();
 	}
 
 	/**
@@ -65,7 +65,7 @@ class DBA extends BaseObject
 	 */
 	public static function serverInfo()
 	{
-		return self::getClass(Database::class)->serverInfo();
+		return DI::dba()->serverInfo();
 	}
 
 	/**
@@ -76,17 +76,17 @@ class DBA extends BaseObject
 	 */
 	public static function databaseName()
 	{
-		return self::getClass(Database::class)->databaseName();
+		return DI::dba()->databaseName();
 	}
 
 	public static function escape($str)
 	{
-		return self::getClass(Database::class)->escape($str);
+		return DI::dba()->escape($str);
 	}
 
 	public static function connected()
 	{
-		return self::getClass(Database::class)->connected();
+		return DI::dba()->connected();
 	}
 
 	/**
@@ -102,7 +102,7 @@ class DBA extends BaseObject
 	 */
 	public static function anyValueFallback($sql)
 	{
-		return self::getClass(Database::class)->anyValueFallback($sql);
+		return DI::dba()->anyValueFallback($sql);
 	}
 
 	/**
@@ -158,7 +158,7 @@ class DBA extends BaseObject
 	{
 		$params = self::getParam(func_get_args());
 
-		return self::getClass(Database::class)->p($sql, $params);
+		return DI::dba()->p($sql, $params);
 	}
 
 	/**
@@ -174,7 +174,7 @@ class DBA extends BaseObject
 
 		$params = self::getParam(func_get_args());
 
-		return self::getClass(Database::class)->e($sql, $params);
+		return DI::dba()->e($sql, $params);
 	}
 
 	/**
@@ -188,7 +188,7 @@ class DBA extends BaseObject
 	 */
 	public static function exists($table, $condition)
 	{
-		return self::getClass(Database::class)->exists($table, $condition);
+		return DI::dba()->exists($table, $condition);
 	}
 
 	/**
@@ -205,7 +205,7 @@ class DBA extends BaseObject
 	{
 		$params = self::getParam(func_get_args());
 
-		return self::getClass(Database::class)->fetchFirst($sql, $params);
+		return DI::dba()->fetchFirst($sql, $params);
 	}
 
 	/**
@@ -215,7 +215,7 @@ class DBA extends BaseObject
 	 */
 	public static function affectedRows()
 	{
-		return self::getClass(Database::class)->affectedRows();
+		return DI::dba()->affectedRows();
 	}
 
 	/**
@@ -226,7 +226,7 @@ class DBA extends BaseObject
 	 */
 	public static function columnCount($stmt)
 	{
-		return self::getClass(Database::class)->columnCount($stmt);
+		return DI::dba()->columnCount($stmt);
 	}
 	/**
 	 * @brief Returns the number of rows of a statement
@@ -236,7 +236,7 @@ class DBA extends BaseObject
 	 */
 	public static function numRows($stmt)
 	{
-		return self::getClass(Database::class)->numRows($stmt);
+		return DI::dba()->numRows($stmt);
 	}
 
 	/**
@@ -247,7 +247,7 @@ class DBA extends BaseObject
 	 */
 	public static function fetch($stmt)
 	{
-		return self::getClass(Database::class)->fetch($stmt);
+		return DI::dba()->fetch($stmt);
 	}
 
 	/**
@@ -262,7 +262,7 @@ class DBA extends BaseObject
 	 */
 	public static function insert($table, $param, $on_duplicate_update = false)
 	{
-		return self::getClass(Database::class)->insert($table, $param, $on_duplicate_update);
+		return DI::dba()->insert($table, $param, $on_duplicate_update);
 	}
 
 	/**
@@ -272,7 +272,7 @@ class DBA extends BaseObject
 	 */
 	public static function lastInsertId()
 	{
-		return self::getClass(Database::class)->lastInsertId();
+		return DI::dba()->lastInsertId();
 	}
 
 	/**
@@ -287,7 +287,7 @@ class DBA extends BaseObject
 	 */
 	public static function lock($table)
 	{
-		return self::getClass(Database::class)->lock($table);
+		return DI::dba()->lock($table);
 	}
 
 	/**
@@ -298,7 +298,7 @@ class DBA extends BaseObject
 	 */
 	public static function unlock()
 	{
-		return self::getClass(Database::class)->unlock();
+		return DI::dba()->unlock();
 	}
 
 	/**
@@ -308,7 +308,7 @@ class DBA extends BaseObject
 	 */
 	public static function transaction()
 	{
-		return self::getClass(Database::class)->transaction();
+		return DI::dba()->transaction();
 	}
 
 	/**
@@ -318,7 +318,7 @@ class DBA extends BaseObject
 	 */
 	public static function commit()
 	{
-		return self::getClass(Database::class)->commit();
+		return DI::dba()->commit();
 	}
 
 	/**
@@ -328,7 +328,7 @@ class DBA extends BaseObject
 	 */
 	public static function rollback()
 	{
-		return self::getClass(Database::class)->rollback();
+		return DI::dba()->rollback();
 	}
 
 	/**
@@ -345,7 +345,7 @@ class DBA extends BaseObject
 	 */
 	public static function delete($table, array $conditions, array $options = [])
 	{
-		return self::getClass(Database::class)->delete($table, $conditions, $options);
+		return DI::dba()->delete($table, $conditions, $options);
 	}
 
 	/**
@@ -379,7 +379,7 @@ class DBA extends BaseObject
 	 */
 	public static function update($table, $fields, $condition, $old_fields = [])
 	{
-		return self::getClass(Database::class)->update($table, $fields, $condition, $old_fields);
+		return DI::dba()->update($table, $fields, $condition, $old_fields);
 	}
 
 	/**
@@ -396,7 +396,7 @@ class DBA extends BaseObject
 	 */
 	public static function selectFirst($table, array $fields = [], array $condition = [], $params = [])
 	{
-		return self::getClass(Database::class)->selectFirst($table, $fields, $condition, $params);
+		return DI::dba()->selectFirst($table, $fields, $condition, $params);
 	}
 
 	/**
@@ -413,7 +413,7 @@ class DBA extends BaseObject
 	 */
 	public static function selectToArray($table, array $fields = [], array $condition = [], array $params = [])
 	{
-		return self::getClass(Database::class)->selectToArray($table, $fields, $condition, $params);
+		return DI::dba()->selectToArray($table, $fields, $condition, $params);
 	}
 
 	/**
@@ -441,7 +441,7 @@ class DBA extends BaseObject
 	 */
 	public static function select($table, array $fields = [], array $condition = [], array $params = [])
 	{
-		return self::getClass(Database::class)->select($table, $fields, $condition, $params);
+		return DI::dba()->select($table, $fields, $condition, $params);
 	}
 
 	/**
@@ -465,7 +465,7 @@ class DBA extends BaseObject
 	 */
 	public static function count($table, array $condition = [], array $params = [])
 	{
-		return self::getClass(Database::class)->count($table, $condition, $params);
+		return DI::dba()->count($table, $condition, $params);
 	}
 
 	/**
@@ -529,65 +529,94 @@ class DBA extends BaseObject
 	 */
 	public static function buildCondition(array &$condition = [])
 	{
+		$condition = self::collapseCondition($condition);
+		
 		$condition_string = '';
 		if (count($condition) > 0) {
-			reset($condition);
-			$first_key = key($condition);
-			if (is_int($first_key)) {
-				$condition_string = " WHERE (" . array_shift($condition) . ")";
-			} else {
-				$new_values = [];
-				$condition_string = "";
-				foreach ($condition as $field => $value) {
-					if ($condition_string != "") {
-						$condition_string .= " AND ";
-					}
-					if (is_array($value)) {
-						if (count($value)) {
-							/* Workaround for MySQL Bug #64791.
-							 * Never mix data types inside any IN() condition.
-							 * In case of mixed types, cast all as string.
-							 * Logic needs to be consistent with DBA::p() data types.
-							 */
-							$is_int = false;
-							$is_alpha = false;
-							foreach ($value as $single_value) {
-								if (is_int($single_value)) {
-									$is_int = true;
-								} else {
-									$is_alpha = true;
-								}
-							}
+			$condition_string = " WHERE (" . array_shift($condition) . ")";
+		}
 
-							if ($is_int && $is_alpha) {
-								foreach ($value as &$ref) {
-									if (is_int($ref)) {
-										$ref = (string)$ref;
-									}
-								}
-								unset($ref); //Prevent accidental re-use.
-							}
+		return $condition_string;
+	}
+
+	/**
+	 * Collapse an associative array condition into a SQL string + parameters condition array.
+	 *
+	 * ['uid' => 1, 'network' => ['dspr', 'apub']]
+	 *
+	 * gets transformed into
+	 *
+	 * ["`uid` = ? AND `network` IN (?, ?)", 1, 'dspr', 'apub']
+	 *
+	 * @param array $condition
+	 * @return array
+	 */
+	public static function collapseCondition(array $condition)
+	{
+		// Ensures an always true condition is returned
+		if (count($condition) < 1) {
+			return ['1'];
+		}
+
+		reset($condition);
+		$first_key = key($condition);
+
+		if (is_int($first_key)) {
+			// Already collapsed
+			return $condition;
+		}
+
+		$values = [];
+		$condition_string = "";
+		foreach ($condition as $field => $value) {
+			if ($condition_string != "") {
+				$condition_string .= " AND ";
+			}
 
-							$new_values = array_merge($new_values, array_values($value));
-							$placeholders = substr(str_repeat("?, ", count($value)), 0, -2);
-							$condition_string .= self::quoteIdentifier($field) . " IN (" . $placeholders . ")";
+			if (is_array($value)) {
+				if (count($value)) {
+					/* Workaround for MySQL Bug #64791.
+					 * Never mix data types inside any IN() condition.
+					 * In case of mixed types, cast all as string.
+					 * Logic needs to be consistent with DBA::p() data types.
+					 */
+					$is_int = false;
+					$is_alpha = false;
+					foreach ($value as $single_value) {
+						if (is_int($single_value)) {
+							$is_int = true;
 						} else {
-							// Empty value array isn't supported by IN and is logically equivalent to no match
-							$condition_string .= "FALSE";
+							$is_alpha = true;
+						}
+					}
+
+					if ($is_int && $is_alpha) {
+						foreach ($value as &$ref) {
+							if (is_int($ref)) {
+								$ref = (string)$ref;
+							}
 						}
-					} elseif (is_null($value)) {
-						$condition_string .= self::quoteIdentifier($field) . " IS NULL";
-					} else {
-						$new_values[$field] = $value;
-						$condition_string .= self::quoteIdentifier($field) . " = ?";
+						unset($ref); //Prevent accidental re-use.
 					}
+
+					$values = array_merge($values, array_values($value));
+					$placeholders = substr(str_repeat("?, ", count($value)), 0, -2);
+					$condition_string .= self::quoteIdentifier($field) . " IN (" . $placeholders . ")";
+				} else {
+					// Empty value array isn't supported by IN and is logically equivalent to no match
+					$condition_string .= "FALSE";
 				}
-				$condition_string = " WHERE (" . $condition_string . ")";
-				$condition = $new_values;
+			} elseif (is_null($value)) {
+				$condition_string .= self::quoteIdentifier($field) . " IS NULL";
+			} else {
+				$values[$field] = $value;
+				$condition_string .= self::quoteIdentifier($field) . " = ?";
 			}
 		}
 
-		return $condition_string;
+		$condition = array_merge([$condition_string], array_values($values));
+
+		return $condition;
 	}
 
 	/**
@@ -639,7 +668,7 @@ class DBA extends BaseObject
 	 */
 	public static function toArray($stmt, $do_close = true)
 	{
-		return self::getClass(Database::class)->toArray($stmt, $do_close);
+		return DI::dba()->toArray($stmt, $do_close);
 	}
 
 	/**
@@ -649,7 +678,7 @@ class DBA extends BaseObject
 	 */
 	public static function errorNo()
 	{
-		return self::getClass(Database::class)->errorNo();
+		return DI::dba()->errorNo();
 	}
 
 	/**
@@ -659,7 +688,7 @@ class DBA extends BaseObject
 	 */
 	public static function errorMessage()
 	{
-		return self::getClass(Database::class)->errorMessage();
+		return DI::dba()->errorMessage();
 	}
 
 	/**
@@ -670,7 +699,7 @@ class DBA extends BaseObject
 	 */
 	public static function close($stmt)
 	{
-		return self::getClass(Database::class)->close($stmt);
+		return DI::dba()->close($stmt);
 	}
 
 	/**
@@ -683,7 +712,7 @@ class DBA extends BaseObject
 	 */
 	public static function processlist()
 	{
-		return self::getClass(Database::class)->processlist();
+		return DI::dba()->processlist();
 	}
 
 	/**
@@ -695,7 +724,7 @@ class DBA extends BaseObject
 	 */
 	public static function isResult($array)
 	{
-		return self::getClass(Database::class)->isResult($array);
+		return DI::dba()->isResult($array);
 	}
 
 	/**
@@ -707,6 +736,6 @@ class DBA extends BaseObject
 	 */
 	public static function escapeArray(&$arr, $add_quotation = false)
 	{
-		return self::getClass(Database::class)->escapeArray($arr, $add_quotation);
+		DI::dba()->escapeArray($arr, $add_quotation);
 	}
 }