Skip to content
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

Jump to bottom

Model has-one-through relations #14511

Merged
merged 9 commits into from
Nov 4, 2019
Merged

Model has-one-through relations #14511

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f72ae8a
Tests for has-on-through relations
Nov 2, 2019
2c6a841
Add has-model-through to the exception message
Nov 3, 2019
3ec25eb
When has-one-through relations are updated and the intermediate row
zsilbi Nov 3, 2019
7eead4d
Typo fixed
Nov 3, 2019
6c15bc7
Model::__set() test for has-one-through relation
zsilbi Nov 3, 2019
833906e
Condition fixed
Nov 3, 2019
b90a891
Added has-one-through relations to the Model\Manager
Nov 3, 2019
ce2e7c7
Added has-one-through relations to the Model
Nov 3, 2019
0a98275
Changelog
Nov 3, 2019
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
Prev Previous commit
Next Next commit
Typo fixed
  • Loading branch information
Németh Balázs committed Nov 3, 2019
commit 7eead4d6bc835905966243a4e1d94edde55f4715
4 changes: 2 additions & 2 deletions phalcon/Mvc/Model.zep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4855,8 +4855,8 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
);

/**
* Has-one-thorugh relations can only use one intermediate model.
* If it already exist, it can be updated with the new referenced keys.
* Has-one-through relations can only use one intermediate model.
* If it already exist, it can be updated with the new referenced key.
*/
if relation->getType() == Relation::HAS_ONE_THROUGH {
let existingIntermediateModel = intermediateModel->findFirst(
Expand Down