From 90dff41ac41a6cc6b644249370ca6f12873e0e65 Mon Sep 17 00:00:00 2001 From: D050513 Date: Wed, 29 May 2024 10:45:08 +0200 Subject: [PATCH 1/5] update does not return deep --- sqlite/test/deep/deepInputProcessing.test.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sqlite/test/deep/deepInputProcessing.test.js b/sqlite/test/deep/deepInputProcessing.test.js index 3ff549b92..24396e0da 100644 --- a/sqlite/test/deep/deepInputProcessing.test.js +++ b/sqlite/test/deep/deepInputProcessing.test.js @@ -1,6 +1,6 @@ const cds = require('../../../test/cds') -const { POST, PUT } = cds.test(__dirname, 'deep.cds') +const { POST, PUT, GET } = cds.test(__dirname, 'deep.cds') describe('UUID Generation', () => { test('generate UUID on insert', async () => { @@ -55,10 +55,12 @@ describe('UUID Generation', () => { }) expect(resUpdate.status).toBe(200) + const resRead = await GET(`/bla/RootUUID(${uuid})?$expand=toOneChild($expand=toManySubChild)`) + // foreign keys are set correctly (deep) - expect(resUpdate.data.toOneChild.ID).toEqual(resUpdate.data.toOneChild_ID) - expect(resUpdate.data.toOneChild.ID).toEqual(resUpdate.data.toOneChild.toManySubChild[0].backlink_ID) - expect(resUpdate.data.toOneChild.ID).toEqual(resUpdate.data.toOneChild.toManySubChild[1].backlink_ID) + expect(resRead.data.toOneChild.ID).toEqual(resRead.data.toOneChild_ID) + expect(resRead.data.toOneChild.ID).toEqual(resRead.data.toOneChild.toManySubChild[0].backlink_ID) + expect(resRead.data.toOneChild.ID).toEqual(resRead.data.toOneChild.toManySubChild[1].backlink_ID) }) test('generate UUID on update programmatically', async () => { From c5bb94fdaae89766966ae2b9be5718e2a9c7ccb2 Mon Sep 17 00:00:00 2001 From: D050513 Date: Wed, 29 May 2024 11:26:43 +0200 Subject: [PATCH 2/5] one more --- sqlite/test/deep/deepInputProcessing.test.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sqlite/test/deep/deepInputProcessing.test.js b/sqlite/test/deep/deepInputProcessing.test.js index 24396e0da..3cd8d0fee 100644 --- a/sqlite/test/deep/deepInputProcessing.test.js +++ b/sqlite/test/deep/deepInputProcessing.test.js @@ -126,11 +126,17 @@ describe('UUID Generation', () => { toOneChild: null, }) expect(resUpdate.status).toBe(200) - expect(resUpdate.data).toMatchObject({ '@odata.context': '$metadata#RootUUID/$entity', ID: uuid, name: null, + }) + + const resRead = await GET(`/bla/RootUUID(${uuid})?$expand=toOneChild`) + expect(resRead.data).toMatchObject({ + '@odata.context': '$metadata#RootUUID/$entity', + ID: uuid, + name: null, toOneChild: null, }) }) From 5b843688f95605b74ee5cfe0d0efda3fe87cddd4 Mon Sep 17 00:00:00 2001 From: D050513 Date: Wed, 29 May 2024 11:27:30 +0200 Subject: [PATCH 3/5] better --- sqlite/test/deep/deepInputProcessing.test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/sqlite/test/deep/deepInputProcessing.test.js b/sqlite/test/deep/deepInputProcessing.test.js index 3cd8d0fee..08557f047 100644 --- a/sqlite/test/deep/deepInputProcessing.test.js +++ b/sqlite/test/deep/deepInputProcessing.test.js @@ -134,7 +134,6 @@ describe('UUID Generation', () => { const resRead = await GET(`/bla/RootUUID(${uuid})?$expand=toOneChild`) expect(resRead.data).toMatchObject({ - '@odata.context': '$metadata#RootUUID/$entity', ID: uuid, name: null, toOneChild: null, From 4834bb8199005f214fbef61977a4bb276d9024e0 Mon Sep 17 00:00:00 2001 From: D050513 Date: Wed, 29 May 2024 12:04:50 +0200 Subject: [PATCH 4/5] fix lean draft test --- sqlite/test/lean-draft.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqlite/test/lean-draft.test.js b/sqlite/test/lean-draft.test.js index 40d6c7fbf..e4b3a4e74 100644 --- a/sqlite/test/lean-draft.test.js +++ b/sqlite/test/lean-draft.test.js @@ -692,7 +692,7 @@ describe('draft tests', () => { Price: null, CurrencyCode_code: null, to_Booking_BookingUUID: BookingUUID, - to_Travel_TravelUUID: null, // Should be TravelUUID! + to_Travel_TravelUUID: TravelUUID, to_Supplement_SupplementID: null, HasActiveEntity: false, IsActiveEntity: false, From b148f18c292684e2726d651f79d371fbea8d66d6 Mon Sep 17 00:00:00 2001 From: sjvans <30337871+sjvans@users.noreply.github.com> Date: Wed, 29 May 2024 12:10:10 +0200 Subject: [PATCH 5/5] Update sqlite/test/lean-draft.test.js --- sqlite/test/lean-draft.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqlite/test/lean-draft.test.js b/sqlite/test/lean-draft.test.js index e4b3a4e74..b3c898ea5 100644 --- a/sqlite/test/lean-draft.test.js +++ b/sqlite/test/lean-draft.test.js @@ -692,7 +692,7 @@ describe('draft tests', () => { Price: null, CurrencyCode_code: null, to_Booking_BookingUUID: BookingUUID, - to_Travel_TravelUUID: TravelUUID, + to_Travel_TravelUUID: cds.env.features.odata_new_adapter ? TravelUUID : null, // Should be TravelUUID! to_Supplement_SupplementID: null, HasActiveEntity: false, IsActiveEntity: false,