yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3152 from strapi/fix/relation-column

Browse Source 
Fix column name for many to many relations
This commit is contained in:
Jim LAURIE 2019-04-17 17:55:45 +02:00 committed by GitHub
commit 34baf02602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-hook-bookshelf/lib/buildQuery.js
View File

@ -83,7 +83,7 @@ const buildJoinsAndFilter = (qb, model, whereClauses) => {
const joinTableAlias = generateAlias(assoc.tableCollectionName);
qb.leftJoin(
`${assoc.tableCollectionName} AS ${joinTableAlias}`,
`${joinTableAlias}.${singular(originInfo.model.collectionName)}_${
`${joinTableAlias}.${singular(originInfo.model.globalId.toLowerCase())}_${
originInfo.model.attributes[assoc.alias].column
}`,
`${originInfo.alias}.${originInfo.model.primaryKey}`
@ -91,7 +91,7 @@ const buildJoinsAndFilter = (qb, model, whereClauses) => {
qb.leftJoin(
`${destinationInfo.model.collectionName} AS ${destinationInfo.alias}`,
`${joinTableAlias}.${singular(destinationInfo.model.collectionName)}_${
`${joinTableAlias}.${singular(destinationInfo.model.globalId.toLowerCase())}_${
destinationInfo.model.primaryKey
}`,
`${destinationInfo.alias}.${destinationInfo.model.primaryKey}`