fix: null as default value (#845)

even though modeling is weird as the db default is anyway null, our implementation should go along with it. closes #773
cap-js · Oct 15, 2024 · 0041ec0 · 0041ec0
1 parent 10e0534
commit 0041ec0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/hana/lib/HANAService.js b/hana/lib/HANAService.js
@@ -1051,8 +1051,8 @@ class HANAService extends SQLService {
         let extract = sql ?? `${this.quote(name)} ${this.insertType4(element)} PATH '$.${name}'`
         if (!isUpdate) {
           const d = element.default
-          if (d && (d.val !== undefined || d.ref?.[0] === '$now')) {
-            const defaultValue = d.val ?? (cds.context?.timestamp || new Date()).toISOString()
+          if (d && ('val' in d || d.ref?.[0] === '$now')) {
+            const defaultValue = 'val' in d ? d.val : (cds.context?.timestamp || new Date()).toISOString()
             managed = typeof defaultValue === 'string' ? this.string(defaultValue) : defaultValue
           }
         }

diff --git a/postgres/lib/PostgresService.js b/postgres/lib/PostgresService.js
@@ -470,7 +470,7 @@ GROUP BY k
     }
 
     defaultValue(defaultValue = this.context.timestamp.toISOString()) {
-      return this.string(`${defaultValue}`)
+      return typeof defaultValue === 'string' ? this.string(`${defaultValue}`) : defaultValue
     }
 
     static Functions = { ...super.Functions, ...require('./cql-functions') }

diff --git a/test/compliance/INSERT.test.js b/test/compliance/INSERT.test.js
@@ -1,6 +1,9 @@
-require('../cds')
+const cds = require('../cds')
 
 describe('INSERT', () => {
+  const { data, expect } = cds.test(__dirname + '/resources')
+  data.autoIsolation(true)
+
   describe('into', () => {
     test.skip('missing', () => {
       throw new Error('not supported')
@@ -32,4 +35,13 @@ describe('INSERT', () => {
       throw new Error('not supported')
     })
   })
+
+  describe('default values', () => {
+    test('default values are generated', async () => {
+      const { 'basic.literals.defaults': entity } = cds.db.entities
+      await cds.run(INSERT.into(entity).entries({ID: 1}))
+      const result = await cds.run(SELECT.from(entity, 1))
+      expect(result).to.deep.eq({ ID: 1, boolean: false, integer: 0, nulls: null, string: ''})
+    })
+  })
 })
diff --git a/test/compliance/resources/db/basic/literals.cds b/test/compliance/resources/db/basic/literals.cds
@@ -63,9 +63,17 @@ entity binaries {
     largebinary : LargeBinary;
 }
 
+entity defaults {
+    key ID      : Integer;
+        string  : String default '';
+        boolean : Boolean default false;
+        integer : Integer default 0;
+        nulls   : String default null;
+}
+
 
 /* Excluded from the tests until fully supported
 entity vectors {
     vector : Vector;
 }
-*/
+*/