Make check more strict to respect existing queries

cakephp · Jul 26, 2016 · c01525f · c01525f
1 parent d6e4513
commit c01525f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/Cake/Model/Datasource/Database/Mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php
@@ -438,8 +438,9 @@ public function delete(Model $model, $conditions = null) {
 			$alias = $joins = false;
 		}
 		$complexConditions = false;
+		$fields = array_keys($this->describe($model));
 		foreach ((array)$conditions as $key => $value) {
-			if (strpos($key, '.') !== false && strpos($key, $model->alias) === false) {
+			if (strpos($key, $model->alias) === false && !in_array($key, $fields, true)) {
 				$complexConditions = true;
 				break;
 			}