yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix undefined pk (#8260)

Browse Source 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
This commit is contained in:
Alexandre BODIN 2020-10-09 17:08:37 +02:00 committed by GitHub
parent 7545f9501a
commit b91059a522
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/strapi-connector-bookshelf/lib/build-database-schema.js
View File

@ -10,6 +10,7 @@ module.exports = async ({ ORM, loadedModel, definition, connection, model }) =>
if (!definitionDidChange) { if (!definitionDidChange) {
return; return;
} }
const draftAndPublishMigrationWay = await getDraftAndPublishMigrationWay({ definition, ORM }); const draftAndPublishMigrationWay = await getDraftAndPublishMigrationWay({ definition, ORM });
if (draftAndPublishMigrationWay === 'disable') { if (draftAndPublishMigrationWay === 'disable') {
await migrateDraftAndPublish({ definition, ORM, way: 'disable' }); await migrateDraftAndPublish({ definition, ORM, way: 'disable' });

2
packages/strapi-connector-bookshelf/lib/mount-models.js
View File

@ -237,7 +237,7 @@ module.exports = async ({ models, target }, ctx, { selfFinalize = false } = {})
// Force singular foreign key // Force singular foreign key
details.attribute = singular(details.collection); details.attribute = singular(details.collection);
details.column = targetModel.primaryKey; details.column = 'id';
// Set this info to be able to see if this field is a real database's field. // Set this info to be able to see if this field is a real database's field.
details.isVirtual = true; details.isVirtual = true;