fix: insert on uuid with default value (#911)

cap-js · Nov 25, 2024 · 545e489 · 545e489
1 parent 50ebd10
commit 545e489
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/db-service/lib/fill-in-keys.js b/db-service/lib/fill-in-keys.js
@@ -35,7 +35,7 @@ const generateUUIDandPropagateKeys = (entity, data, event) => {
   if (event === 'CREATE') {
     const keys = entity.keys
     for (const k in keys)
-      if (keys[k].isUUID && !data[k] && !assoc4(keys[k])) //> skip key assocs, and foreign keys thereof
+      if (keys[k].isUUID && !data[k] && !assoc4(keys[k]) && !keys[k].default) //> skip key assocs, and foreign keys thereof
         data[k] = cds.utils.uuid()
   }
   for (const each in entity.elements) {

diff --git a/test/bookshop/db/schema.cds b/test/bookshop/db/schema.cds
@@ -68,4 +68,4 @@ entity C : managed {
       toB : Composition of many B
               on toB.ID = $self.B;
 };
-entity BooksAnnotated as projection on Books;
+entity BooksAnnotated as projection on Books;
diff --git a/test/compliance/resources/db/basic/common.cds b/test/compliance/resources/db/basic/common.cds
@@ -12,6 +12,7 @@ entity temporal : _cuid, _temporal {}
 
 // Set default values for all literals from ./literals.cds
 entity ![default] : _cuid {
+  uuidDflt  : UUID default '00000000-0000-0000-4000-000000000000';
   bool      : Boolean default false;
   integer8  : UInt8 default 8;
   integer16 : Int16 default 9;

diff --git a/test/compliance/resources/db/basic/common/basic.common.default.js b/test/compliance/resources/db/basic/common/basic.common.default.js
@@ -1,6 +1,7 @@
 const dstring = size => ({ d: 'default'.slice(0, size), o: 'not default'.slice(0, size) })
 
 const columns = {
+  uuidDflt: { d: '00000000-0000-0000-4000-000000000000', o: '11111111-1111-1111-4111-111111111111'},
   bool: { d: false, o: true },
   integer8: { d: 8, o: 18 },
   integer16: { d: 9, o: 19 },

diff --git a/test/scenarios/bookshop/insert.test.js b/test/scenarios/bookshop/insert.test.js
@@ -62,5 +62,4 @@ describe('Bookshop - Insert', () => {
       expect(written.price).to.be.eq(entry.price)
     }
   })
-
 })
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,5 +62,4 @@ describe('Bookshop - Insert', () => { @@
           expect(written.price).to.be.eq(entry.price)
         }
       })
     })