fix: calculated elements in drafts

db-service/lib/cqn4sql.js

@@ -1812,7 +1812,9 @@ function cqn4sql(originalQuery, model, useTechnicalAlias = true) {
           // reject virtual elements in expressions as they will lead to a sql error down the line
           if (lhsDef?.virtual) throw new Error(`Virtual elements are not allowed in expressions`)
 
-          let result = is_regexp(token?.val) ? token : copy(token) // REVISIT: too expensive! //
+          let result = is_regexp(token?.val) ? token : copy(token) // REVISIT: too expensive!
+          // REVISIT: required because we copy the token above and lose the not enumerable "param: false"
+          if (typeof token === 'object' && 'val' in token && 'param' in token) Object.defineProperty(result, 'param', { value: token.param })
           if (token.ref) {
             const { definition } = token.$refLinks.at(-1)
             // Add definition to result

db-service/test/bookshop/srv/calc-elem-service.cds

@@ -0,0 +1,8 @@
+service CalcService {
+  @odata.draft.enabled
+  entity Orders {
+    key ID: Integer;
+    amount: Integer;
+    expensive: Integer = amount > 10 ? 1: 0;
+  }
+}

db-service/test/cqn4sql/calculated-elements.test.js

@@ -1216,3 +1216,75 @@ describe('calculated elements with exists accessed through association', () => {
   })
 })
 
+describe('calculated elements in draft enabled entities', () => {
+  let model
+  beforeAll(async () => {
+    model = cds.model = cds.compile.for.nodejs(await cds.load(__dirname + '/../bookshop/srv/calc-elem-service'))
+  })
+
+  it('keeps param: false for query against active entries', () => {
+    const transformed = cqn4sql(
+      cds.ql`SELECT from CalcService.Orders as Orders { ID, expensive }`,
+      model,
+    )
+    const expected = { SELECT: {
+          from: { ref: [ 'CalcService.Orders' ], as: 'Orders' },
+          columns: [
+            { ref: [ 'Orders', 'ID' ] },
+            {
+              xpr: [
+                'case',
+                'when',
+                { ref: [ 'Orders', 'amount' ] },
+                '>',
+                { val: 10 },
+                'then',
+                { val: 1 },
+                'else',
+                { val: 0 },
+                'end'
+              ],
+              as: 'expensive'
+            }
+          ]
+        }
+    }
+    expectCqn(transformed).to.equal(expected)
+    expect(transformed.SELECT.columns[1].xpr[4].param).to.be.false
+    expect(transformed.SELECT.columns[1].xpr[6].param).to.be.false
+    expect(transformed.SELECT.columns[1].xpr[8].param).to.be.false
+  })
+
+    it('keeps param: false for query against draft entries', () => {
+    const transformed = cqn4sql(
+      cds.ql`SELECT from CalcService.Orders.drafts as Orders { ID, expensive }`,
+      model,
+    )
+    const expected = { SELECT: {
+          from: { ref: [ 'CalcService.Orders.drafts' ], as: 'Orders' },
+          columns: [
+            { ref: [ 'Orders', 'ID' ] },
+            {
+              xpr: [
+                'case',
+                'when',
+                { ref: [ 'Orders', 'amount' ] },
+                '>',
+                { val: 10 },
+                'then',
+                { val: 1 },
+                'else',
+                { val: 0 },
+                'end'
+              ],
+              as: 'expensive'
+            }
+          ]
+        }
+    }
+    expectCqn(transformed).to.equal(expected)
+    expect(transformed.SELECT.columns[1].xpr[4].param).to.be.false
+    expect(transformed.SELECT.columns[1].xpr[6].param).to.be.false
+    expect(transformed.SELECT.columns[1].xpr[8].param).to.be.false
+  })
+})