Add DBA::collapseCondition method

- Update Database->update for use with DBA::collapseCondition

src/Database/DBA.php

@@ -529,19 +529,50 @@ class DBA
 	 */
 	public static function buildCondition(array &$condition = [])
 	{
+		$condition = self::collapseCondition($condition);
+		
 		$condition_string = '';
 		if (count($condition) > 0) {
+			$condition_string = " WHERE (" . array_shift($condition) . ")";
+		}
+
+		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)) {
-				$condition_string = " WHERE (" . array_shift($condition) . ")";
+			// Already collapsed
-			} else {
+			return $condition;
-				$new_values = [];
+		}
+
+		$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.
@@ -568,7 +599,7 @@ class DBA
 						unset($ref); //Prevent accidental re-use.
 					}
 
-							$new_values = array_merge($new_values, array_values($value));
+					$values = array_merge($values, array_values($value));
 					$placeholders = substr(str_repeat("?, ", count($value)), 0, -2);
 					$condition_string .= self::quoteIdentifier($field) . " IN (" . $placeholders . ")";
 				} else {
@@ -578,16 +609,14 @@ class DBA
 			} elseif (is_null($value)) {
 				$condition_string .= self::quoteIdentifier($field) . " IS NULL";
 			} else {
-						$new_values[$field] = $value;
+				$values[$field] = $value;
 				$condition_string .= self::quoteIdentifier($field) . " = ?";
 			}
 		}
-				$condition_string = " WHERE (" . $condition_string . ")";
-				$condition = $new_values;
-			}
-		}
 
-		return $condition_string;
+		$condition = array_merge([$condition_string], array_values($values));
+
+		return $condition;
 	}
 
 	/**

src/Database/Database.php

@@ -1327,10 +1327,6 @@ class Database
 			return false;
 		}
 
-		$table_string = DBA::buildTableString($table);
-
-		$condition_string = DBA::buildCondition($condition);
-
 		if (is_bool($old_fields)) {
 			$do_insert = $old_fields;
 
@@ -1361,13 +1357,16 @@ class Database
 			return true;
 		}
 
+		$table_string = DBA::buildTableString($table);
+
+		$condition_string = DBA::buildCondition($condition);
+
 		$sql = "UPDATE " . $table_string . " SET "
 			. implode(" = ?, ", array_map([DBA::class, 'quoteIdentifier'], array_keys($fields))) . " = ?"
 			. $condition_string;
 
-		$params1 = array_values($fields);
+		// Combines the updated fields parameter values with the condition parameter values
-		$params2 = array_values($condition);
+		$params  = array_merge(array_values($fields), $condition);
-		$params  = array_merge_recursive($params1, $params2);
 
 		return $this->e($sql, $params);
 	}