yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ctm/tests

Browse Source
This commit is contained in:
cyril lopez 2019-08-19 12:03:48 +02:00 committed by GitHub
commit 13f3f2db4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
packages/strapi-hook-bookshelf/lib/mount-models.js
View File

@ -220,7 +220,9 @@ module.exports = ({ models, target, plugin = false }, ctx) => {
details.attribute = singular(details.collection);
details.column = targetModel.primaryKey;
let options = [];
// Set this info to be able to see if this field is a real database's field.
details.isVirtual = true;
if (nature === 'manyWay') {
const joinTableName = `${definition.collectionName}__${_.snakeCase(
name
@ -232,7 +234,21 @@ module.exports = ({ models, target, plugin = false }, ctx) => {
const otherKey = `${details.attribute}_${details.column}`;
options = [joinTableName, foreignKey, otherKey];
loadedModel[name] = function() {
const targetBookshelfModel = GLOBALS[globalId];
let collection = this.belongsToMany(
targetBookshelfModel,
joinTableName,
foreignKey,
otherKey
);
if (Array.isArray(details.withPivot)) {
return collection.withPivot(details.withPivot);
}
return collection;
};
} else {
const joinTableName =
_.get(details, 'collectionName') ||
@ -256,28 +272,27 @@ module.exports = ({ models, target, plugin = false }, ctx) => {
relationship.attribute = singular(details.via);
}
const foreignKey = `${relationship.attribute}_${relationship.column}`;
const otherKey = `${details.attribute}_${details.column}`;
loadedModel[name] = function() {
const targetBookshelfModel = GLOBALS[globalId];
options = [joinTableName, foreignKey, otherKey];
const foreignKey = `${relationship.attribute}_${relationship.column}`;
const otherKey = `${details.attribute}_${details.column}`;
let collection = this.belongsToMany(
targetBookshelfModel,
joinTableName,
foreignKey,
otherKey
);
if (Array.isArray(details.withPivot)) {
return collection.withPivot(details.withPivot);
}
return collection;
};
}
// Set this info to be able to see if this field is a real database's field.
details.isVirtual = true;
loadedModel[name] = function() {
const targetBookshelfModel = GLOBALS[globalId];
let collection = this.belongsToMany(
targetBookshelfModel,
...options
);
if (Array.isArray(details.withPivot)) {
return collection.withPivot(details.withPivot);
}
return collection;
};
break;
}
case 'morphOne': {