@cap-js/db-service 1.9.2 → 1.10.2

package/CHANGELOG.md

@@ -4,6 +4,27 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.10.2](https://github.com/cap-js/cds-dbs/compare/db-service-v1.10.1...db-service-v1.10.2) (2024-06-25)
+
+
+### Fixed
+
+* **`expand`:** enable expanding from subquery ([#709](https://github.com/cap-js/cds-dbs/issues/709)) ([5ed03e5](https://github.com/cap-js/cds-dbs/commit/5ed03e5ed64eb46e6f22af120d7285fbcb127a7c)), closes [#708](https://github.com/cap-js/cds-dbs/issues/708)
+
+## [1.10.1](https://github.com/cap-js/cds-dbs/compare/db-service-v1.10.0...db-service-v1.10.1) (2024-06-19)
+
+
+### Fixed
+
+* Only check first row if no changes required ([#552](https://github.com/cap-js/cds-dbs/issues/552)) ([39b0b85](https://github.com/cap-js/cds-dbs/commit/39b0b85d5cb4807f63f10acea13fb4d688fa1dcd))
+
+## [1.10.0](https://github.com/cap-js/cds-dbs/compare/db-service-v1.9.2...db-service-v1.10.0) (2024-05-29)
+
+
+### Added
+
+* Add simple queries feature flag ([#660](https://github.com/cap-js/cds-dbs/issues/660)) ([3335202](https://github.com/cap-js/cds-dbs/commit/33352024201a96cc6bdfa30a0fe3fff4227dee10))
+
 ## [1.9.2](https://github.com/cap-js/cds-dbs/compare/db-service-v1.9.1...db-service-v1.9.2) (2024-05-28)
 
 

package/lib/SQLService.js

@@ -65,21 +65,22 @@ class SQLService extends DatabaseService {
       return
     }
 
+    let changes = false
     for (let col of columns) {
       const name = col.as || col.ref?.[col.ref.length - 1] || (typeof col === 'string' && col)
       if (col.element?.isAssociation) {
         if (one) this._changeToStreams(col.SELECT.columns, rows[0][name], false, compat)
         else
-          rows.forEach(row => {
-            this._changeToStreams(col.SELECT.columns, row[name], false, compat)
-          })
+          changes = rows.some(row => !this._changeToStreams(col.SELECT.columns, row[name], false, compat))
       } else if (col.element?.type === 'cds.LargeBinary') {
+        changes = true
         if (one) rows[0][name] = this._stream(rows[0][name])
         else
           rows.forEach(row => {
             row[name] = this._stream(row[name])
           })
       } else if (col.element?.type in BINARY_TYPES) {
+        changes = true
         if (one) rows[0][name] = this._buffer(rows[0][name])
         else
           rows.forEach(row => {
@@ -87,6 +88,7 @@ class SQLService extends DatabaseService {
           })
       }
     }
+    return changes
   }
 
   _stream(val) {
@@ -115,7 +117,7 @@ class SQLService extends DatabaseService {
    */
   async onSELECT({ query, data }) {
     if (!query.target) {
-      try { this.infer(query) } catch (e) { /**/ }
+      try { this.infer(query) } catch { /**/ }
     }
     if (query.target && !query.target._unresolved) {
       // Will return multiple rows with objects inside

package/lib/cqn2sql.js

@@ -1,6 +1,8 @@
 const cds = require('@sap/cds')
 const cds_infer = require('./infer')
 const cqn4sql = require('./cqn4sql')
+const _simple_queries = cds.env.features.sql_simple_queries
+const _strict_booleans = _simple_queries < 2
 
 const BINARY_TYPES = {
   'cds.Binary': 1,
@@ -257,18 +259,41 @@ class CQN2SQLRenderer {
     const SELECT = q.SELECT
     if (!SELECT.columns) return sql
 
-    let cols = SELECT.columns.map(x => {
-      const name = this.column_name(x)
-      let col = `'$."${name}"',${this.output_converter4(x.element, this.quote(name))}`
-      if (x.SELECT?.count) {
-        // Return both the sub select and the count for @odata.count
-        const qc = cds.ql.clone(x, { columns: [{ func: 'count' }], one: 1, limit: 0, orderBy: 0 })
-        return [col, `'${name}@odata.count',${this.expr(qc)}`]
+    const isRoot = SELECT.expand === 'root'
+    const isSimple = _simple_queries &&
+      isRoot && // Simple queries are only allowed to have a root
+      !ObjectKeys(q.elements).some(e =>
+        _strict_booleans && q.elements[e].type === 'cds.Boolean' || // REVISIT: Booleans require json for sqlite
+        q.elements[e].isAssociation || // Indicates columns contains an expand
+        q.elements[e].$assocExpand || // REVISIT: sometimes associations are structs
+        q.elements[e].items // Array types require to be inlined with a json result
+      )
+
+    let cols = SELECT.columns.map(isSimple
+      ? x => {
+        const name = this.column_name(x)
+        const escaped = `${name.replace(/"/g, '""')}`
+        let col = `${this.output_converter4(x.element, this.quote(name))} AS "${escaped}"`
+        if (x.SELECT?.count) {
+          // Return both the sub select and the count for @odata.count
+          const qc = cds.ql.clone(x, { columns: [{ func: 'count' }], one: 1, limit: 0, orderBy: 0 })
+          return [col, `${this.expr(qc)} AS "${escaped}@odata.count"`]
+        }
+        return col
       }
-      return col
-    }).flat()
+      : x => {
+        const name = this.column_name(x)
+        const escaped = `${name.replace(/"/g, '""')}`
+        let col = `'$."${escaped}"',${this.output_converter4(x.element, this.quote(name))}`
+        if (x.SELECT?.count) {
+          // Return both the sub select and the count for @odata.count
+          const qc = cds.ql.clone(x, { columns: [{ func: 'count' }], one: 1, limit: 0, orderBy: 0 })
+          return [col, `'$."${escaped}@odata.count"',${this.expr(qc)}`]
+        }
+        return col
+      }).flat()
 
-    const isRoot = SELECT.expand === 'root'
+    if (isSimple) return `SELECT ${cols} FROM (${sql})`
 
     // Prevent SQLite from hitting function argument limit of 100
     let obj = "'{}'"

package/lib/cqn4sql.js

@@ -787,7 +787,7 @@ function cqn4sql(originalQuery, model) {
     } else {
       outerAlias = transformedQuery.SELECT.from.as
       subqueryFromRef = [
-        ...transformedQuery.SELECT.from.ref,
+        ...(transformedQuery.SELECT.from.ref || /* subq in from */ [transformedQuery.SELECT.from.target.name]),
         ...(column.$refLinks[0].definition.kind === 'entity' ? column.ref.slice(1) : column.ref),
       ]
     }
@@ -1911,8 +1911,7 @@ function cqn4sql(originalQuery, model) {
                 result[i].ref = [targetSideRefLink.alias, lhs.ref.join('_')]
               }
             }
-          } else if (lhs.ref.length === 1)
-            result[i].ref.unshift(targetSideRefLink.alias)
+          } else if (lhs.ref.length === 1) result[i].ref.unshift(targetSideRefLink.alias)
         }
       }
       return result

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/db-service",
-  "version": "1.9.2",
+  "version": "1.10.2",
   "description": "CDS base database service",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/db-service#cds-base-database-service",
   "repository": {
@@ -21,10 +21,6 @@
     "lib",
     "CHANGELOG.md"
   ],
-  "engines": {
-    "node": ">=16",
-    "npm": ">=8"
-  },
   "scripts": {
     "test": "jest --silent"
   },