From c01525f2cc5fbef111ddad0c97b011dcb3b9b139 Mon Sep 17 00:00:00 2001
From: Mark van Driel <mvdriel@nlware.com>
Date: Tue, 26 Jul 2016 11:25:27 +0200
Subject: [PATCH] Make check more strict to respect existing queries

---
 lib/Cake/Model/Datasource/Database/Mysql.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Cake/Model/Datasource/Database/Mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php
index d0d3b23755a..3d1d498ed5d 100644
--- 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;
 			}