Skip to content

Fix eager load relations with complex foreign/local keys #1798

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

Merged
CodeDredd merged 4 commits into from
May 1, 2024
Merged

Fix eager load relations with complex foreign/local keys #1798

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b15f4b
release: pinia-orm@1.7.2
CodeDredd Sep 18, 2023
31357b8
Fix HasMany relation with complex keys
max-kut Apr 14, 2024
93cbaac
Merge commit '31357b80222e011f97e0965af4de976456dc51be'
max-kut Apr 14, 2024
d44a638
fix isArray import
max-kut Apr 14, 2024
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
15 changes: 12 additions & 3 deletions packages/pinia-orm/src/model/attributes/relations/HasMany.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { Collection, Element } from '../../../data/Data'
import type { Query } from '../../../query/Query'
import type { Model, PrimaryKey } from '../../Model'
import type { Dictionary } from './Relation'
import { isArray } from '../../../support/Utils'
import { Relation } from './Relation'

export class HasMany extends Relation {
Expand Down Expand Up @@ -76,7 +77,11 @@ export class HasMany extends Relation {
const dictionary = this.buildDictionary(query.get(false))

models.forEach((model) => {
const key = model[this.getKey(this.localKey)]
const key = this.getKey(
isArray(this.localKey)
? this.localKey.map(key => model[key])
: model[this.localKey]
)

dictionary[key]
? model.$setRelation(relation, dictionary[key])
Expand All @@ -89,8 +94,12 @@ export class HasMany extends Relation {
*/
protected buildDictionary (results: Collection): Dictionary {
return this.mapToDictionary(results, (result) => {
const key = this.getKey(this.foreignKey)
return [result[key], result]
const key = this.getKey(
isArray(this.foreignKey)
? this.foreignKey.map(key => result[key])
: result[this.foreignKey]
)
return [key, result]
})
}

Expand Down