Making btm marshalling use table aliases #6867
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
| @@ -295,7 +295,9 @@ protected function _belongsToMany(Association $assoc, array $data, $options = [] | |||
| if (array_intersect_key($primaryKey, $row) === $primaryKey) { | |||
| $keys = array_intersect_key($row, $primaryKey); | |||
| if (count($keys) === $primaryCount) { | |||
| $conditions[] = $keys; | |||
| foreach ($keys as $key => $value) { | |||
| $conditions[][$assoc->alias() . '.' . $key] = $value; | |||
There was a problem hiding this comment.
You can do
$target = $assoc->target();
foreach ($keys as $key => $value) {
$conditions[$target->aliasfield($key)] = $value
}It saves a few __call() methods, and uses a method that people can customize if necessary.
This was referenced Jun 24, 2015
markstory
added a commit
that referenced
this pull request
Jun 25, 2015
Call target() fewer times when marshalling belongsToMany associations. Refs #6867
|
Thanks @patrickconroy |
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.
I tried making a test for this, but it'd involve overriding the
findAllforTestApp\Model\Table\TagsTable, which causes a bunch of failures and is probably too unexpected. I could duplicate everything and makeTags2TableandArticles2Table, but that seems bad.Refs #6866, #6826