Fix different format of $results in afterFind #4223
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It occurs when a model and the children models are related to a same model. For example, such as the following: * User hasMany Comment * User hasMany Article * Article hasMany Comment
Refs cakephp#2529 As of this commit, we can get consistent format of $resutls in afterFind. And we can keep backward compatibility if Model::$useConsistentAfterFind is set to false.
| @@ -1375,10 +1399,15 @@ public function queryAssociation(Model $Model, Model $LinkModel, $type, $associa | |||
| $this->_mergeAssociation($row, $merge, $association, $type); | |||
| } | |||
| } else { | |||
| if (!$prefetched && $LinkModel->useConsistentAfterFind) { | |||
There was a problem hiding this comment.
I'm guessing this property can be set to false for the old behavior?
There was a problem hiding this comment.
Personally, I don't need this property.
I think that the old behavior is a bug.
|
I had to explain what was changed in detail. Deep hasOne / belongsTo association array(
'id' => '1',
'name' => 'foo',
)
After: array(
0 => array(
'ModelName' => array(
'id' => '1',
'name' => 'foo',
)
)
)
Limited hasMany association array(
0 => array(
'id' => '1',
'name' => 'foo',
),
1 => array(
'id' => '2',
'name' => 'bar',
)
)
After: // afterFind() is called for each record.
// This is the same behavior as unlimited hasMany.
array(
0 => array(
'ModelName' => array(
'id' => '1',
'name' => 'foo',
)
)
)
array(
0 => array(
'ModelName' => array(
'id' => '2',
'name' => 'bar',
)
)
)
And previously, Model::find() parameter 'callbacks' is ignored in these cases. |
|
Any objections to merging this? |
|
@markstory Would it better to remeve 'useConsistentAfterFind' ? |
lorenzo
added a commit
that referenced
this pull request
Sep 3, 2014
Fix different format of $results in afterFind
|
@chinpei215 No I think it xould be useful for people that don't want to get the new behaviour. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2529 and #4221
Now, we can get consistent format of $resutls in afterFind.
And we can keep backward compatibility if Model::$useConsistentAfterFind is set to false.
Then, we will get $results without a model key in some cases.