fix: combination of groupby and orderby (#825)

Co-authored-by: Patrice Bender <[email protected]>
cap-js · Oct 15, 2024 · 10e0534 · 10e0534
1 parent 6306d5c
commit 10e0534
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/hana/lib/HANAService.js b/hana/lib/HANAService.js
@@ -510,7 +510,7 @@ class HANAService extends SQLService {
                         let curPar = parent
                         while (curPar) {
                           if (curPar.SELECT.from?.args?.some(a => a.as === col.ref[0])) {
-                            curPar.SELECT.columns.push({ __proto__: col, ref: col.ref, as })
+                            if (!curPar.SELECT.columns.find(c => c.as === as)) curPar.SELECT.columns.push({ __proto__: col, ref: col.ref, as })
                             break
                           } else {
                             curPar.SELECT.columns.push({ __proto__: col, ref: [curPar.SELECT.parent.as, as], as })

diff --git a/test/scenarios/bookshop/read.test.js b/test/scenarios/bookshop/read.test.js
@@ -71,6 +71,14 @@ describe('Bookshop - Read', () => {
     expect(res.data.value[0].genre.parent.name).to.be.eq('Fiction')
   })
 
+  test('pseudo expand using groupby and orderby on same column', async () => {
+    const res = await GET(
+      '/admin/Books?$apply=groupby((author/name))&$orderby=author/name',
+      admin,
+    )
+    expect(res.data.value.every(row => row.author.name)).to.be.true
+  })
+
   test('Path expression', async () => {
     const q = CQL`SELECT title, author.name as author FROM sap.capire.bookshop.Books where author.name LIKE '%a%'`
     const res = await cds.run(q)