Skip to content

Patches ArrayDatasource by disabling fields-filtering, fixing broken results on hasMany/HABTM scenarios #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
albertboada wants to merge 1 commit into
base: 1.3
Choose a base branch
from
Open

Patches ArrayDatasource by disabling fields-filtering, fixing broken results on hasMany/HABTM scenarios #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 37 additions & 19 deletions models/datasources/array_source.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,26 +140,44 @@ public function read(&$model, $queryData = array()) {
if ($limit !== false) {
$data = array_slice($data, ($queryData['page'] - 1) * $queryData['limit'], $queryData['limit'], false);
}

// Filter fields
if (!empty($queryData['fields'])) {
$listOfFields = array();
foreach ((array)$queryData['fields'] as $field) {
if (strpos($field, '.') !== false) {
list($alias, $field) = explode('.', $field, 2);
if ($alias !== $model->alias) {
continue;
}
}
$listOfFields[] = $field;
}
foreach ($data as $id => $record) {
foreach ($record[$model->alias] as $field => $value) {
if (!in_array($field, $listOfFields)) {
unset($data[$id][$model->alias][$field]);
}
}
}
}
//
// NOTE:
// The following bit of code has been commented out (disabled) on purpose.
// The reason for this patch lies on a strange behaviour in
// CakePHP 1.3.X's DBO Datasource (`dbo_source.php:generateAssociationQuery():1230`),
// where `$queryData['fields']` is polluted with a fields list from the root model
// when querying its `hasMany/HABTM` relationships, thus affecting all queries on the
// following related models (since `$queryData` is passed by reference).
// This pollution affected the following bit of code in a way that, if no
// `fields` for the current relationship were initially specified by the developer,
// it would unset ALL of them, giving almost blank results.
// Since trying to fully understand all the side effects that changing
// CakePHP's DBO Datasource would carry, and since field-filtering makes
// almost no sense in terms of optimization on Array Datasources (unlike in SQL),
// this patch consists in ignoring field-filtering on Array Datasource's models.
// Albert Boada (github.com/albertboada)
//
// if (!empty($queryData['fields'])) {
// $listOfFields = array();
// foreach ((array)$queryData['fields'] as $field) {
// if (strpos($field, '.') !== false) {
// list($alias, $field) = explode('.', $field, 2);
// if ($alias !== $model->alias) {
// continue;
// }
// }
// $listOfFields[] = $field;
// }
// foreach ($data as $id => $record) {
// foreach ($record[$model->alias] as $field => $value) {
// if (!in_array($field, $listOfFields)) {
// unset($data[$id][$model->alias][$field]);
// }
// }
// }
// }
$this->_registerLog($model, $queryData, getMicrotime() - $startTime, count($data));
$_associations = $model->__associations;
if ($queryData['recursive'] > -1) {
Expand Down