fix: select without columns from unknown entity (#466)

cap-js · Feb 16, 2024 · eb857de · eb857de
1 parent fbd552f
commit eb857de
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/db-service/lib/SQLService.js b/db-service/lib/SQLService.js
@@ -114,7 +114,11 @@ class SQLService extends DatabaseService {
    * @type {Handler}
    */
   async onSELECT({ query, data }) {
-    query.SELECT.expand = 'root'
+    if (query.target && !query.target._unresolved) {
+      // Will return multiple rows with objects inside
+      query.SELECT.expand = 'root'
+    }
+
     const { sql, values, cqn } = this.cqn2sql(query, data)
     let ps = await this.prepare(sql)
     let rows = await ps.all(values)

diff --git a/hana/lib/HANAService.js b/hana/lib/HANAService.js
@@ -98,7 +98,12 @@ class HANAService extends SQLService {
     this.ensureDBC().set(variables)
   }
 
-  async onSELECT({ query, data }) {
+  async onSELECT(req) {
+    const { query, data } = req
+    if (!query.target || query.target._unresolved) {
+      return super.onSELECT(req)
+    }
+
     // REVISIT: disable this for queries like (SELECT 1)
     // Will return multiple rows with objects inside
     query.SELECT.expand = 'root'
@@ -249,7 +254,7 @@ class HANAService extends SQLService {
       this.temporary = this.temporary || []
       this.temporaryValues = this.temporaryValues || []
 
-      const { limit, one, orderBy, expand, columns, localized, count, parent } = q.SELECT
+      const { limit, one, orderBy, expand, columns = ['*'], localized, count, parent } = q.SELECT
 
       const walkAlias = q => {
         if (q.args) return q.as || walkAlias(q.args[0])
@@ -795,17 +800,17 @@ class HANAService extends SQLService {
       return false
     }
 
-    list(list) {
-      const first = list.list[0]
-      // If the list only contains of lists it is replaced with a json function and a placeholder
-      if (this.values && first.list && !first.list.find(v => !v.val)) {
-        const extraction = first.list.map((v, i) => `"${i}" ${this.constructor.InsertTypeMap[typeof v.val]()} PATH '$.V${i}'`)
-        this.values.push(JSON.stringify(list.list.map(l => l.list.reduce((l, c, i) => { l[`V${i}`] = c.val; return l }, {}))))
-        return `(SELECT * FROM JSON_TABLE(?, '$' COLUMNS(${extraction})))`
-      }
-      // Call super for normal SQL behavior
-      return super.list(list)
-    }
+        list(list) {
+          const first = list.list[0]
+          // If the list only contains of lists it is replaced with a json function and a placeholder
+          if (this.values && first.list && !first.list.find(v => !v.val)) {
+            const extraction = first.list.map((v, i) => `"${i}" ${this.constructor.InsertTypeMap[typeof v.val]()} PATH '$.V${i}'`)
+            this.values.push(JSON.stringify(list.list.map(l => l.list.reduce((l, c, i) => { l[`V${i}`] = c.val; return l }, {}))))
+            return `(SELECT * FROM JSON_TABLE(?, '$' COLUMNS(${extraction})))`
+          }
+          // Call super for normal SQL behavior
+          return super.list(list)
+        }
 
     quote(s) {
       // REVISIT: casing in quotes when reading from entities it uppercase

diff --git a/test/scenarios/bookshop/update.test.js b/test/scenarios/bookshop/update.test.js
@@ -53,7 +53,7 @@ describe('Bookshop - Update', () => {
     expect(update.data.footnotes).to.be.eql(['one'])
   })
 
-  test('programmatic insert/upsert/update/delete with unknown entity', async () => {
+  test('programmatic insert/upsert/update/select/delete with unknown entity', async () => {
     const books = 'sap_capire_bookshop_Books'
     const ID = 999
     let affectedRows = await INSERT.into(books)
@@ -96,7 +96,11 @@ describe('Bookshop - Update', () => {
         createdAt: (new Date()).toISOString(),
       })
     await expect(affectedRows).rejected
-
+
+    const result = await SELECT.from(books)
+      .where({ ID })
+    expect(result.length).to.be.eq(1)
+
     affectedRows = await DELETE(books)
       .where({ ID })
     expect(affectedRows | 0).to.be.eq(1)