From 2d449295981fbcceb9217a82e680383e0ee41c02 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Sun, 18 Apr 2010 22:22:09 -0300
Subject: [PATCH] Optimization on dbo datasource to not repeat ids in find.
Fixes #601
Signed-off-by: mark_story <mark@mark-story.com>
---
cake/libs/model/datasources/dbo_source.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 69945aeaf..db5dca354 100755
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -924,6 +924,7 @@ class DboSource extends DataSource {
}
if (!empty($ins)) {
+ $ins = array_unique($ins);
$fetch = $this->fetchAssociated($model, $query, $ins);
}
@@ -955,10 +956,10 @@ class DboSource extends DataSource {
}
}
if (!empty($ins)) {
+ $ins = array_unique($ins);
if (count($ins) > 1) {
$query = str_replace('{$__cakeID__$}', '(' .implode(', ', $ins) .')', $query);
$query = str_replace('= (', 'IN (', $query);
- $query = str_replace('= (', 'IN (', $query);
} else {
$query = str_replace('{$__cakeID__$}',$ins[0], $query);
}
@@ -1060,7 +1061,6 @@ class DboSource extends DataSource {
$query = str_replace('{$__cakeID__$}', implode(', ', $ids), $query);
if (count($ids) > 1) {
$query = str_replace('= (', 'IN (', $query);
- $query = str_replace('= (', 'IN (', $query);
}
return $this->fetchAll($query, $model->cacheQueries, $model->alias);
}
@@ -2179,7 +2179,7 @@ class DboSource extends DataSource {
}
} elseif (is_array($value) && !empty($value) && !$valueInsert) {
$keys = array_keys($value);
- if (array_keys($value) === array_values(array_keys($value))) {
+ if ($keys === array_values($keys)) {
$count = count($value);
if ($count === 1) {
$data = $this->__quoteFields($key) . ' = (';