@cap-js/db-service 1.13.0 → 1.14.0

package/CHANGELOG.md

@@ -4,6 +4,19 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.14.0](https://github.com/cap-js/cds-dbs/compare/db-service-v1.13.0...db-service-v1.14.0) (2024-10-15)
+
+
+### Added
+
+* assoc-like calc elements after exists predicate ([#831](https://github.com/cap-js/cds-dbs/issues/831)) ([05f7d75](https://github.com/cap-js/cds-dbs/commit/05f7d75837495d58cc4f72ad628077bdebb0acf6))
+
+
+### Fixed
+
+* Improved behavioral consistency between the database services ([#837](https://github.com/cap-js/cds-dbs/issues/837)) ([b6f7187](https://github.com/cap-js/cds-dbs/commit/b6f718701e48dfb1c4c3d98ee016ec45930f8e7b))
+* Treat assoc-like calculated elements as unmanaged assocs ([#830](https://github.com/cap-js/cds-dbs/issues/830)) ([cbe0df7](https://github.com/cap-js/cds-dbs/commit/cbe0df7a66fec0d421947767adc8621ed8bf236c))
+
 ## [1.13.0](https://github.com/cap-js/cds-dbs/compare/db-service-v1.12.1...db-service-v1.13.0) (2024-10-01)
 
 

package/lib/SQLService.js

@@ -466,6 +466,10 @@ const sqls = new (class extends SQLService {
   get factory() {
     return null
   }
+
+  get model() {
+    return cds.model
+  }
 })()
 cds.extend(cds.ql.Query).with(
   class {

package/lib/cql-functions.js

@@ -1,3 +1,5 @@
+const cds = require("@sap/cds")
+
 const StandardFunctions = {
   // OData: https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#sec_CanonicalFunctions
 
@@ -59,7 +61,7 @@ const StandardFunctions = {
    * @param {string} x
    * @returns {string}
    */
-  countdistinct: x => `count(distinct ${x || '*'})`,
+  countdistinct: x => `count(distinct ${x || cds.error`countdistinct requires a ref to be counted`})`,
   /**
    * Generates SQL statement that produces the index of the first occurrence of the second string in the first string
    * @param {string} x

package/lib/cqn2sql.js

@@ -18,8 +18,8 @@ const DEBUG = (() => {
   return cds.debug('sql|sqlite')
   //if (DEBUG) {
   //  return DEBUG
-    // (sql, ...more) => DEBUG (sql.replace(/(?:SELECT[\n\r\s]+(json_group_array\()?[\n\r\s]*json_insert\((\n|\r|.)*?\)[\n\r\s]*\)?[\n\r\s]+as[\n\r\s]+_json_[\n\r\s]+FROM[\n\r\s]*\(|\)[\n\r\s]*(\)[\n\r\s]+AS )|\)$)/gim,(a,b,c,d) => d || ''), ...more)
-    // FIXME: looses closing ) on INSERT queries
+  // (sql, ...more) => DEBUG (sql.replace(/(?:SELECT[\n\r\s]+(json_group_array\()?[\n\r\s]*json_insert\((\n|\r|.)*?\)[\n\r\s]*\)?[\n\r\s]+as[\n\r\s]+_json_[\n\r\s]+FROM[\n\r\s]*\(|\)[\n\r\s]*(\)[\n\r\s]+AS )|\)$)/gim,(a,b,c,d) => d || ''), ...more)
+  // FIXME: looses closing ) on INSERT queries
   //}
 })()
 
@@ -88,6 +88,7 @@ class CQN2SQLRenderer {
     this.values = [] // prepare values, filled in by subroutines
     this[kind]((this.cqn = q)) // actual sql rendering happens here
     if (vars?.length && !this.values?.length) this.values = vars
+    if (vars && Object.keys(vars).length && !this.values?.length) this.values = vars
     const sanitize_values = process.env.NODE_ENV === 'production' && cds.env.log.sanitize_values !== false
     DEBUG?.(
       this.sql,
@@ -116,8 +117,13 @@ class CQN2SQLRenderer {
    * @param {import('./infer/cqn').CREATE} q
    */
   CREATE(q) {
-    const { target } = q,
-      { query } = target
+    let { target } = q
+    let query = target?.query || q.CREATE.as
+    if (!target || target._unresolved) {
+      const entity = q.CREATE.entity
+      target = typeof entity === 'string' ? { name: entity } : q.CREATE.entity
+    }
+
     const name = this.name(target.name)
     // Don't allow place holders inside views
     delete this.values
@@ -203,8 +209,9 @@ class CQN2SQLRenderer {
    */
   DROP(q) {
     const { target } = q
-    const isView = target.query || target.projection
-    return (this.sql = `DROP ${isView ? 'VIEW' : 'TABLE'} IF EXISTS ${this.quote(this.name(target.name))}`)
+    const isView = target?.query || target?.projection || q.DROP.view
+    const name = target?.name || q.DROP.table?.ref?.[0] || q.DROP.view?.ref?.[0]
+    return (this.sql = `DROP ${isView ? 'VIEW' : 'TABLE'} IF EXISTS ${this.quote(this.name(name))}`)
   }
 
   // SELECT Statements ------------------------------------------------
@@ -223,7 +230,7 @@ class CQN2SQLRenderer {
 
     // REVISIT: When selecting from an entity that is not in the model the from.where are not normalized (as cqn4sql is skipped)
     if (!where && from?.ref?.length === 1 && from.ref[0]?.where) where = from.ref[0]?.where
-    let columns = this.SELECT_columns(q)
+    const columns = this.SELECT_columns(q)
     let sql = `SELECT`
     if (distinct) sql += ` DISTINCT`
     if (!_empty(columns)) sql += ` ${columns}`

package/lib/cqn4sql.js

@@ -4,7 +4,7 @@ const cds = require('@sap/cds')
 
 const infer = require('./infer')
 const { computeColumnsToBeSearched } = require('./search')
-const { prettyPrintRef } = require('./utils')
+const { prettyPrintRef, isCalculatedOnRead, isCalculatedElement } = require('./utils')
 
 /**
  * For operators of <eqOps>, this is replaced by comparing all leaf elements with null, combined with and.
@@ -317,10 +317,6 @@ function cqn4sql(originalQuery, model) {
     }
   }
 
-  function isCalculatedOnRead(def) {
-    return def?.value && !def.value.stored
-  }
-
   /**
    * Walks over a list of columns (ref's, xpr, subqueries, val), applies flattening on structured types and expands wildcards.
    *
@@ -809,7 +805,7 @@ function cqn4sql(originalQuery, model) {
     const subqueryBase = {}
     for (const [key, value] of Object.entries(column)) {
       if (!(key in { ref: true, expand: true })) {
-      subqueryBase[key] = value;
+        subqueryBase[key] = value
       }
     }
     const subquery = {
@@ -1365,20 +1361,17 @@ function cqn4sql(originalQuery, model) {
 
           const as = getNextAvailableTableAlias(getLastStringSegment(next.alias))
           next.alias = as
-          if (next.definition.value) {
-            throw new Error(
-              `Calculated elements cannot be used in “exists” predicates in: “exists ${tokenStream[i + 1].ref
-                .map(idOnly)
-                .join('.')}”`,
-            )
-          }
           if (!next.definition.target) {
+            let type = next.definition.type
+            if (isCalculatedElement(next.definition)) {
+              // try to infer the type at the leaf for better error message
+              const { $refLinks } = next.definition.value
+              type = $refLinks?.at(-1).definition.type || 'expression'
+            }
             throw new Error(
               `Expecting path “${tokenStream[i + 1].ref
                 .map(idOnly)
-                .join('.')}” following “EXISTS” predicate to end with association/composition, found “${
-                next.definition.type
-              }”`,
+                .join('.')}” following “EXISTS” predicate to end with association/composition, found “${type}”`,
             )
           }
           const { definition: fkSource } = next

package/lib/infer/index.js

@@ -4,6 +4,7 @@ const cds = require('@sap/cds')
 
 const JoinTree = require('./join-tree')
 const { pseudos } = require('./pseudos')
+const { isCalculatedOnRead } = require('../utils')
 const cdsTypes = cds.linked({
   definitions: {
     Timestamp: { type: 'cds.Timestamp' },
@@ -746,7 +747,7 @@ function infer(originalQuery, model) {
           joinTree.mergeColumn(colWithBase, originalQuery.outerQueries)
         }
       }
-      if (leafArt.value && !leafArt.value.stored) {
+      if (isCalculatedOnRead(leafArt)) {
         linkCalculatedElement(column, $baseLink, baseColumn)
       }
 
@@ -1054,7 +1055,7 @@ function infer(originalQuery, model) {
             if (element.type !== 'cds.LargeBinary') {
               queryElements[k] = element
             }
-            if (element.value) {
+            if (isCalculatedOnRead(element)) {
               linkCalculatedElement(element)
             }
           }
@@ -1071,7 +1072,7 @@ function infer(originalQuery, model) {
         if (exclude(name) || name in queryElements) return true
         const element = tableAliases[0].tableAlias.elements[name]
         if (element.type !== 'cds.LargeBinary') queryElements[name] = element
-        if (element.value) {
+        if (isCalculatedOnRead(element)) {
           linkCalculatedElement(element)
         }
       })

package/lib/utils.js

@@ -21,7 +21,26 @@ function prettyPrintRef(ref, model = null) {
   }, '')
 }
 
+/**
+ * Determines if a definition is calculated on read.
+ * - Stored calculated elements are not unfolded
+ * - Association like calculated elements have been re-written by the compiler
+ *   they essentially behave like unmanaged associations as their calculations
+ *   have been incorporated into an on-condition which is handled elsewhere
+ *
+ * @param {Object} def - The definition to check.
+ * @returns {boolean} - Returns true if the definition is calculated on read, otherwise false.
+ */
+function isCalculatedOnRead(def) {
+  return isCalculatedElement(def) && !def.value.stored && !def.on
+}
+function isCalculatedElement(def) {
+  return def?.value
+}
+
 // export the function to be used in other modules
 module.exports = {
   prettyPrintRef,
+  isCalculatedOnRead,
+  isCalculatedElement
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/db-service",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "CDS base database service",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/db-service#cds-base-database-service",
   "repository": {
@@ -22,7 +22,7 @@
     "CHANGELOG.md"
   ],
   "scripts": {
-    "test": "jest --silent"
+    "test": "cds-test"
   },
   "dependencies": {
     "generic-pool": "^3.9.0"