do not render an on-condition if none is provided

cap-js · Nov 18, 2024 · 2e439b1 · 2e439b1
1 parent 7fd4859
commit 2e439b1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/db-service/lib/cqn2sql.js b/db-service/lib/cqn2sql.js
@@ -363,8 +363,10 @@ class CQN2SQLRenderer {
       return _aliased(this.quote(this.name(z)))
     }
     if (from.SELECT) return _aliased(`(${this.SELECT(from)})`)
-    if (from.join)
-      return `${this.from(from.args[0])} ${from.join} JOIN ${this.from(from.args[1])} ON ${this.where(from.on)}`
+    if (from.join) {
+      const joinCondition = from.on ? ` ON ${this.where(from.on)}` : '';
+      return `${this.from(from.args[0])} ${from.join} JOIN ${this.from(from.args[1])}${joinCondition}`;
+    }
   }
 
   /**

diff --git a/test/scenarios/bookshop/read.test.js b/test/scenarios/bookshop/read.test.js
@@ -400,13 +400,13 @@ describe('Bookshop - Read', () => {
     }
   })
 
-  it('cross joins w/o on condition', async () => {
+  it('cross joins without on condition', async () => {
     const query = SELECT.from('sap.capire.bookshop.Books as Books, sap.capire.bookshop.Authors as Authors')
       .columns('Books.title', 'Authors.name as author')
       .where('Books.author_ID = Authors.ID')
-    const queryWithPaths = SELECT.from('sap.capire.bookshop.Books').columns('title', 'author.name as author')
-    const res = await cds.db.run(query)
-    const resWithPaths = await cds.db.run(queryWithPaths)
-    expect(res).to.deep.eq(resWithPaths)
+    const pathExpressionQuery = SELECT.from('sap.capire.bookshop.Books').columns('title', 'author.name as author')
+    const crossJoinResult = await cds.db.run(query)
+    const pathExpressionResult = await cds.db.run(pathExpressionQuery)
+    expect(crossJoinResult).to.deep.eq(pathExpressionResult)
   })
 })