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

Fix strategy option description and add missing ones. #4469

Merged
merged 1 commit into from
Nov 16, 2016
Merged

Fix strategy option description and add missing ones. #4469

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion en/orm/associations.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ Possible keys for hasOne association arrays include:
associated table into the source table results. By default this is the
underscored & singular name of the association so ``address`` in our example.
- **strategy**: Defines the query strategy to use. Defaults to 'join'. The other
valid value is 'select', which utilizes sub-queries instead.
valid value is 'select', which utilizes a separate query instead.
- **finder**: The finder method to use when loading associated records.

Once this association has been defined, find operations on the Users table can
Expand Down Expand Up @@ -291,6 +291,8 @@ Possible keys for belongsTo association arrays include:
- **propertyName**: The property name that should be filled with data from the
associated table into the source table results. By default this is the
underscored & singular name of the association so ``user`` in our example.
- **strategy**: Defines the query strategy to use. Defaults to 'join'. The other
valid value is 'select', which utilizes a separate query instead.
- **finder**: The finder method to use when loading associated records.

Once this association has been defined, find operations on the User table can
Expand Down
7 changes: 5 additions & 2 deletions fr/orm/associations.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ Les clés possibles pour une association hasOne sont:
un nom en underscore et singulier de l'association, donc ``address`` dans
notre exemple.
- **strategy**: Définit la stratégie de requête à utiliser. Par défaut à
'join'. L'autre valeur valide est 'select', qui utilise les sous-requêtes à la
place.
'join'. L'autre valeur valide est 'select', qui utilise une requête distincte
à la place.
- **finder**: La méthode finder à utiliser lors du chargement des
enregistrements associés.

Expand Down Expand Up @@ -306,6 +306,9 @@ Les clés possibles pour les tableaux d'association belongsTo sont:
données de la table associée dans les résultats de la table source. Par défaut
il s'agit du nom singulier avec des underscores de l'association donc
``user`` dans notre exemple.
- **strategy**: Définit la stratégie de requête à utiliser. Par défaut à
'join'. L'autre valeur valide est 'select', qui utilise une requête distincte
à la place.
- **finder**: La méthode finder à utiliser lors du chargement des
enregistrements associés.

Expand Down