fix: nested ternary in calculated element

db-service/lib/infer/index.js

@@ -859,7 +859,7 @@ function infer(originalQuery, model) {
       } else if (arg.xpr || arg.args) {
         const prop = arg.xpr ? 'xpr' : 'args'
         arg[prop].forEach(step => {
-          const subPath = { $refLinks: [...basePath.$refLinks], ref: [...basePath.ref] }
+          let subPath = { $refLinks: [...basePath.$refLinks], ref: [...basePath.ref] }
           if (step.ref) {
             step.$refLinks.forEach((link, i) => {
               const { definition } = link
@@ -874,6 +874,10 @@ function infer(originalQuery, model) {
           } else if (step.args || step.xpr) {
             const nestedProp = step.xpr ? 'xpr' : 'args'
             step[nestedProp].forEach(a => {
+              // reset sub path for each nested argument
+              // e.g. case when <path> then <otherPath> else <anotherPath> end
+              if(!a.ref)
+                subPath = { $refLinks: [...basePath.$refLinks], ref: [...basePath.ref] }
               mergePathsIntoJoinTree(a, subPath)
             })
           }

db-service/test/bookshop/db/booksWithExpr.cds

@@ -99,3 +99,13 @@ entity VariableReplacements {
   // with variable replacements
   authorAlive = author[dateOfBirth <= $now and dateOfDeath >= $now and $user.unknown.foo.bar = 'Bob'];
 }
+
+entity Ternary {
+  key ID        : Integer;
+      value     : Integer;
+      book      : Association to Books;
+      nestedTernary : Integer = (1 > 0 ? 1 : (book.stock > 10 ? value : 3));
+      nestedTernaryWithTwoJoins : Integer = (1 > 0 ? 1 : (book.stock > book.author.age ? value : 3));
+      nestedTernaryWithNestedXpr : Integer = (1 > 0 ? 1 : (((10 + book.stock) in (1, 2, 3 , 4)) ? value : 3));
+      calculatedElementInNestedTernary : Integer = (1 > 0 ? 1 : (book.stock > nestedTernaryWithTwoJoins ? value : 3));
+}

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

@@ -46,6 +46,39 @@ describe('Unfolding calculated elements in select list', () => {
     expect(query).to.deep.equal(expected)
   })
 
+  it('in ternary', () => {
+    let query = cqn4sql(CQL`SELECT from booksCalc.Ternary { ID, nestedTernary }`, model)
+    const expected = CQL`SELECT from booksCalc.Ternary as Ternary
+      left join booksCalc.Books as book on book.ID = Ternary.book_ID
+      {
+        Ternary.ID,
+        (case when 1 > 0 then 1 else (case when book.stock > 10 then Ternary.value else 3 end) end) as nestedTernary
+      }`
+    expect(query).to.deep.equal(expected)
+  })
+
+  it('calcualted element in nested ternary', () => {
+    let query = cqn4sql(CQL`SELECT from booksCalc.Ternary { ID, calculatedElementInNestedTernary }`, model)
+    const expected = CQL`SELECT from booksCalc.Ternary as Ternary
+      left join booksCalc.Books as book on book.ID = Ternary.book_ID
+      left join booksCalc.Authors as author on author.ID = book.author_ID
+      {
+        Ternary.ID,
+        (case when 1 > 0 then 1 else (case when book.stock > (case when 1 > 0 then 1 else (case when book.stock > years_between(author.dateOfBirth, author.dateOfDeath) then Ternary.value else 3 end) end) then Ternary.value else 3 end) end) as calculatedElementInNestedTernary
+      }`
+    //                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    expect(query).to.deep.equal(expected)
+  })
+  it('list in ternary', () => {
+    let query = cqn4sql(CQL`SELECT from booksCalc.Ternary { ID, nestedTernaryWithNestedXpr }`, model)
+    const expected = CQL`SELECT from booksCalc.Ternary as Ternary
+      left join booksCalc.Books as book on book.ID = Ternary.book_ID
+      {
+        Ternary.ID,
+        (case when 1 > 0 then 1 else (case when ( (10 + book.stock) in (1, 2, 3, 4) ) then Ternary.value else 3 end) end) as nestedTernaryWithNestedXpr
+      }`
+    expect(query).to.deep.equal(expected)
+  })
   it('in function', () => {
     let query = cqn4sql(CQL`SELECT from booksCalc.Books { ID, round(area, 2) as f }`, model)
     const expected = CQL`SELECT from booksCalc.Books as Books {