From b91059a522e7922ad3414da0b0aba31b3aeccbb8 Mon Sep 17 00:00:00 2001 From: Alexandre BODIN Date: Fri, 9 Oct 2020 17:08:37 +0200 Subject: [PATCH] Fix undefined pk (#8260) Signed-off-by: Alexandre Bodin --- .../strapi-connector-bookshelf/lib/build-database-schema.js | 1 + packages/strapi-connector-bookshelf/lib/mount-models.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/strapi-connector-bookshelf/lib/build-database-schema.js b/packages/strapi-connector-bookshelf/lib/build-database-schema.js index e874f005fc..c7860a7151 100644 --- a/packages/strapi-connector-bookshelf/lib/build-database-schema.js +++ b/packages/strapi-connector-bookshelf/lib/build-database-schema.js @@ -10,6 +10,7 @@ module.exports = async ({ ORM, loadedModel, definition, connection, model }) => if (!definitionDidChange) { return; } + const draftAndPublishMigrationWay = await getDraftAndPublishMigrationWay({ definition, ORM }); if (draftAndPublishMigrationWay === 'disable') { await migrateDraftAndPublish({ definition, ORM, way: 'disable' }); diff --git a/packages/strapi-connector-bookshelf/lib/mount-models.js b/packages/strapi-connector-bookshelf/lib/mount-models.js index 5056d9683f..a9ebda26aa 100644 --- a/packages/strapi-connector-bookshelf/lib/mount-models.js +++ b/packages/strapi-connector-bookshelf/lib/mount-models.js @@ -237,7 +237,7 @@ module.exports = async ({ models, target }, ctx, { selfFinalize = false } = {}) // Force singular foreign key 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. details.isVirtual = true;