@cap-js/db-service 1.16.2 → 1.17.1

package/CHANGELOG.md

@@ -4,6 +4,32 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.17.1](https://github.com/cap-js/cds-dbs/compare/db-service-v1.17.0...db-service-v1.17.1) (2025-02-04)
+
+
+### Fixed
+
+* deep update resulting in deep delete of sub-element ([#1006](https://github.com/cap-js/cds-dbs/issues/1006)) ([ef2f817](https://github.com/cap-js/cds-dbs/commit/ef2f8175df6fc7076fa8a9290e1863f44d267d8d))
+* nested $self reference to other column ([#1009](https://github.com/cap-js/cds-dbs/issues/1009)) ([41a76d8](https://github.com/cap-js/cds-dbs/commit/41a76d89a884ac8266ccbd2d087af435e8f26ccb))
+
+## [1.17.0](https://github.com/cap-js/cds-dbs/compare/db-service-v1.16.2...db-service-v1.17.0) (2025-01-28)
+
+
+### Added
+
+* support for cds.Map ([#889](https://github.com/cap-js/cds-dbs/issues/889)) ([cde7514](https://github.com/cap-js/cds-dbs/commit/cde7514df20396383e0179ffce838596e3706bb2))
+
+
+### Fixed
+
+* **`UPDATE`:** no assocs in list which matches subquery results ([4bcb88a](https://github.com/cap-js/cds-dbs/commit/4bcb88a1f40540e26cebd4907bdd33e90d08bb9d))
+* **`UPDATE`:** only perform subselect matching if necessary ([#989](https://github.com/cap-js/cds-dbs/issues/989)) ([4bcb88a](https://github.com/cap-js/cds-dbs/commit/4bcb88a1f40540e26cebd4907bdd33e90d08bb9d))
+* contains not evaluting to bool ([#980](https://github.com/cap-js/cds-dbs/issues/980)) ([760484b](https://github.com/cap-js/cds-dbs/commit/760484be4cf3d0c755254e90f7740ba0b34b9249))
+* nested ternary in calculated element ([#981](https://github.com/cap-js/cds-dbs/issues/981)) ([5f4a1fe](https://github.com/cap-js/cds-dbs/commit/5f4a1feed7b74bb1736f6140527e70b1e261f368))
+* reject virtual elements in all expressions ([#972](https://github.com/cap-js/cds-dbs/issues/972)) ([d0c949d](https://github.com/cap-js/cds-dbs/commit/d0c949d8a3a9851ccd70b3f998caec0b5f01ce0e))
+* starts endswith for null values ([#975](https://github.com/cap-js/cds-dbs/issues/975)) ([f0330bc](https://github.com/cap-js/cds-dbs/commit/f0330bc334fd3a8ed5377afcdd04b731baa8c753))
+* use "$$value$$" as internal column name for UPSERT ([#976](https://github.com/cap-js/cds-dbs/issues/976)) ([8c86b86](https://github.com/cap-js/cds-dbs/commit/8c86b863a69833d50cff91483150bf0314bb7258))
+
 ## [1.16.2](https://github.com/cap-js/cds-dbs/compare/db-service-v1.16.1...db-service-v1.16.2) (2024-12-18)
 
 

package/lib/cql-functions.js

@@ -49,7 +49,7 @@ const StandardFunctions = {
    * @param  {...string} args
    * @returns {string}
    */
-  contains: (...args) => `ifnull(instr(${args}),0)`,
+  contains: (...args) => `(ifnull(instr(${args}),0) > 0)`,
   /**
    * Generates SQL statement that produces the number of elements in a given collection
    * @param {string} x
@@ -75,7 +75,7 @@ const StandardFunctions = {
    * @param {string} y
    * @returns {string}
    */
-  startswith: (x, y) => `instr(${x},${y}) = 1`, // sqlite instr is 1 indexed
+  startswith: (x, y) => `coalesce(instr(${x},${y}) = 1,false)`, // sqlite instr is 1 indexed
   // takes the end of the string of the size of the target and compares it with the target
   /**
    * Generates SQL statement that produces a boolean value indicating whether the first string ends with the second string
@@ -83,7 +83,7 @@ const StandardFunctions = {
    * @param {string} y
    * @returns {string}
    */
-  endswith: (x, y) => `substr(${x}, length(${x}) + 1 - length(${y})) = ${y}`,
+  endswith: (x, y) => `coalesce(substr(${x}, length(${x}) + 1 - length(${y})) = ${y},false)`,
   /**
    * Generates SQL statement that produces the substring of a given string
    * @example

package/lib/cqn2sql.js

@@ -197,6 +197,7 @@ class CQN2SQLRenderer {
     Association: () => false,
     Composition: () => false,
     array: () => 'NCLOB',
+    Map: () => 'NCLOB',
     // HANA types
     'cds.hana.TINYINT': () => 'TINYINT',
     'cds.hana.REAL': () => 'REAL',
@@ -744,7 +745,10 @@ class CQN2SQLRenderer {
       .map(c => `${c.onInsert || c.sql} as ${this.quote(c.name)}`)
 
     const entity = this.name(q.target?.name || UPSERT.into.ref[0], q)
-    sql = `SELECT ${managed.map(c => c.upsert)} FROM (SELECT value, ${extractkeys} from json_each(?)) as NEW LEFT JOIN ${this.quote(entity)} AS OLD ON ${keyCompare}`
+    sql = `SELECT ${managed.map(c => c.upsert
+      .replace(/value->/g, '"$$$$value$$$$"->')
+      .replace(/json_type\(value,/g, 'json_type("$$$$value$$$$",'))
+      } FROM (SELECT value as "$$value$$", ${extractkeys} from json_each(?)) as NEW LEFT JOIN ${this.quote(entity)} AS OLD ON ${keyCompare}`
 
     const updateColumns = columns.filter(c => {
       if (keys.includes(c)) return false //> keys go into ON CONFLICT clause

package/lib/cqn4sql.js

@@ -134,7 +134,7 @@ function cqn4sql(originalQuery, model) {
         const primaryKey = { list: [] }
         for (const k of Object.keys(queryTarget.elements)) {
           const e = queryTarget.elements[k]
-          if (e.key === true && !e.virtual) {
+          if (e.key === true && !e.virtual && e.isAssociation !== true) {
             subquery.SELECT.columns.push({ ref: [e.name] })
             primaryKey.list.push({ ref: [transformedFrom.as, e.name] })
           }
@@ -1286,7 +1286,7 @@ function cqn4sql(originalQuery, model) {
         }
       }
       return flatColumns
-    } else if (element.elements) {
+    } else if (element.elements && element.type !== 'cds.Map') {
       const flatRefs = []
       Object.values(element.elements).forEach(e => {
         const alias = columnAlias ? `${columnAlias}_${e.name}` : null
@@ -1450,7 +1450,7 @@ function cqn4sql(originalQuery, model) {
         transformedTokenStream.push({ ...token })
       } else {
         // expand `struct = null | struct2`
-        const { definition } = token.$refLinks?.[token.$refLinks.length - 1] || {}
+        const definition = token.$refLinks?.at(-1).definition
         const next = tokenStream[i + 1]
         if (allOps.some(([firstOp]) => firstOp === next) && (definition?.elements || definition?.keys)) {
           const ops = [next]
@@ -1477,6 +1477,9 @@ function cqn4sql(originalQuery, model) {
         } else {
           // reject associations in expression, except if we are in an infix filter -> $baseLink is set
           assertNoStructInXpr(token, $baseLink)
+          // reject virtual elements in expressions as they will lead to a sql error down the line
+          if(definition?.virtual)
+            throw new Error(`Virtual elements are not allowed in expressions`)
 
           let result = is_regexp(token?.val) ? token : copy(token) // REVISIT: too expensive! //
           if (token.ref) {
@@ -1620,10 +1623,10 @@ function cqn4sql(originalQuery, model) {
       rejectStructInExpression()
 
     function rejectAssocInExpression() {
-      throw new Error("An association can't be used as a value in an expression")
+      throw new Error(`An association can't be used as a value in an expression`)
     }
     function rejectStructInExpression() {
-      throw new Error("A structured element can't be used as a value in an expression")
+      throw new Error(`A structured element can't be used as a value in an expression`)
     }
   }
 

package/lib/deep-queries.js

@@ -51,7 +51,7 @@ async function onDeep(req, next) {
   // - deletes never trigger unique constraints, but can prevent them -> execute first
   // - updates can trigger and prevent unique constraints -> execute second
   // - inserts can only trigger unique constraints -> execute last
-  await Promise.all(Array.from(queries.deletes.values()).map(query => this.onSIMPLE({ query })))
+  await Promise.all(Array.from(queries.deletes.values()).map(query => this.onDELETE({ query, target: query._target })))
   await Promise.all(queries.updates.map(query => this.onUPDATE({ query })))
 
   const rootQuery = queries.inserts.get(ROOT)

package/lib/infer/index.js

@@ -207,12 +207,12 @@ function infer(originalQuery, model) {
           if (as === undefined) cds.error`Expecting expression to have an alias name`
           if (queryElements[as]) cds.error`Duplicate definition of element “${as}”`
           if (col.xpr || col.SELECT) {
-            queryElements[as] = getElementForXprOrSubquery(col, queryElements)
+            queryElements[as] = getElementForXprOrSubquery(col, queryElements, dollarSelfRefs)
           }
           if (col.func) {
             if (col.args) {
               // {func}.args are optional
-              applyToFunctionArgs(col.args, inferArg, [false])
+              applyToFunctionArgs(col.args, inferArg, [false, null, {dollarSelfRefs}])
             }
             queryElements[as] = getElementForCast(col)
           }
@@ -287,7 +287,7 @@ function infer(originalQuery, model) {
     if (having) walkTokenStream(having)
     if (_.with)
       // consider UPDATE.with
-      Object.values(_.with).forEach(val => inferArg(val, queryElements, null, { inExpr: true }))
+      Object.values(_.with).forEach(val => inferArg(val, queryElements, null, { inXpr: true }))
 
     return queryElements
 
@@ -299,7 +299,7 @@ function infer(originalQuery, model) {
      *
      * @param {array} tokenStream
      */
-    function walkTokenStream(tokenStream, inExpr = false) {
+    function walkTokenStream(tokenStream, inXpr = false) {
       let skipJoins
       const processToken = t => {
         if (t === 'exists') {
@@ -309,7 +309,7 @@ function infer(originalQuery, model) {
           // don't miss an exists within an expression
           t.xpr.forEach(processToken)
         } else {
-          inferArg(t, queryElements, null, { inExists: skipJoins, inExpr, inQueryModifier: true })
+          inferArg(t, queryElements, null, { inExists: skipJoins, inXpr, inQueryModifier: true })
           skipJoins = false
         }
       }
@@ -329,11 +329,12 @@ function infer(originalQuery, model) {
         const unprocessedColumns = []
 
         for (const currentDollarSelfColumn of dollarSelfColumns) {
-          const { ref } = currentDollarSelfColumn
+          const { ref, inXpr } = currentDollarSelfColumn
           const stepToFind = ref[1]
 
           const referencesOtherDollarSelfColumn = dollarSelfColumns.find(
             otherDollarSelfCol =>
+              !(stepToFind in queryElements) &&
               otherDollarSelfCol !== currentDollarSelfColumn &&
               (otherDollarSelfCol.as
                 ? stepToFind === otherDollarSelfCol.as
@@ -343,7 +344,7 @@ function infer(originalQuery, model) {
           if (referencesOtherDollarSelfColumn) {
             unprocessedColumns.push(currentDollarSelfColumn)
           } else {
-            handleRef(currentDollarSelfColumn)
+            handleRef(currentDollarSelfColumn, inXpr)
           }
         }
 
@@ -351,8 +352,8 @@ function infer(originalQuery, model) {
       } while (dollarSelfColumns.length > 0)
     }
 
-    function handleRef(col) {
-      inferArg(col, queryElements)
+    function handleRef(col, inXpr) {
+      inferArg(col, queryElements, null,  { inXpr })
       const { definition } = col.$refLinks[col.$refLinks.length - 1]
       if (col.cast)
         // final type overwritten -> element not visible anymore
@@ -379,7 +380,7 @@ function infer(originalQuery, model) {
    * @param {object} [context={}] - Contextual information for element inference.
    * @param {boolean} [context.inExists=false] - Flag to control the creation of joins for non-association path traversals.
    * for `exists <assoc>` paths we do not need to create joins for path expressions as they are part of the semi-joined subquery.
-   * @param {boolean} [context.inExpr=false] - Flag to signal whether the element is part of an expression.
+   * @param {boolean} [context.inXpr=false] - Flag to signal whether the element is part of an expression.
    * Used to ignore non-persisted elements.
    * @param {boolean} [context.inNestedProjection=false] - Flag to signal whether the element is part of a nested projection.
    *
@@ -401,11 +402,11 @@ function infer(originalQuery, model) {
    */
 
   function inferArg(arg, queryElements = null, $baseLink = null, context = {}) {
-    const { inExists, inExpr, inCalcElement, baseColumn, inInfixFilter, inQueryModifier, inFrom } = context
+    const { inExists, inXpr, inCalcElement, baseColumn, inInfixFilter, inQueryModifier, inFrom, dollarSelfRefs } = context
     if (arg.param || arg.SELECT) return // parameter references are only resolved into values on execution e.g. :val, :1 or ?
     if (arg.args) applyToFunctionArgs(arg.args, inferArg, [null, $baseLink, context])
     if (arg.list) arg.list.forEach(arg => inferArg(arg, null, $baseLink, context))
-    if (arg.xpr) arg.xpr.forEach(token => inferArg(token, queryElements, $baseLink, { ...context, inExpr: true })) // e.g. function in expression
+    if (arg.xpr) arg.xpr.forEach(token => inferArg(token, queryElements, $baseLink, { ...context, inXpr: true })) // e.g. function in expression
 
     if (!arg.ref) {
       if (arg.expand && queryElements) queryElements[arg.as] = resolveExpand(arg)
@@ -426,6 +427,11 @@ function infer(originalQuery, model) {
       firstStepIsSelf = !firstStepIsTableAlias && arg.ref.length > 1 && ['$self', '$projection'].includes(arg.ref[0])
       expandOnTableAlias = arg.ref.length === 1 && arg.ref[0] in sources && (arg.expand || arg.inline)
     }
+    if(dollarSelfRefs && firstStepIsSelf) {
+      Object.defineProperty(arg, 'inXpr', { value: true, writable: true })
+      dollarSelfRefs.push(arg)
+      return
+    }
     const nameSegments = []
     // if a (segment) of a (structured) foreign key is renamed, we must not include
     // the aliased ref segments into the name of the final foreign key which is e.g. used in
@@ -564,7 +570,7 @@ function infer(originalQuery, model) {
           } else if (token.ref || token.xpr || token.list) {
             inferArg(token, false, arg.$refLinks[i], {
               inExists: skipJoinsForFilter || inExists,
-              inExpr: !!token.xpr,
+              inXpr: !!token.xpr,
               inInfixFilter: true,
               inFrom,
             })
@@ -573,7 +579,7 @@ function infer(originalQuery, model) {
               applyToFunctionArgs(token.args, inferArg, [
                 false,
                 arg.$refLinks[i],
-                { inExists: skipJoinsForFilter || inExists, inExpr: true, inInfixFilter: true, inFrom },
+                { inExists: skipJoinsForFilter || inExists, inXpr: true, inInfixFilter: true, inFrom },
               ])
             }
           }
@@ -641,7 +647,7 @@ function infer(originalQuery, model) {
       }
     }
     const leafArt = arg.$refLinks[arg.$refLinks.length - 1].definition
-    const virtual = (leafArt.virtual || !isPersisted) && !inExpr
+    const virtual = (leafArt.virtual || !isPersisted) && !inXpr
     // check if we need to merge the column `ref` into the join tree of the query
     if (!inFrom && !inExists && !virtual && !inCalcElement) {
       // for a ref inside an `inline` we need to consider the column `ref` which has the `inline` prop
@@ -658,7 +664,7 @@ function infer(originalQuery, model) {
     }
 
     function insertIntoQueryElements() {
-      return queryElements && !inExpr && !inInfixFilter && !inQueryModifier
+      return queryElements && !inXpr && !inInfixFilter && !inQueryModifier
     }
 
     /**
@@ -686,7 +692,7 @@ function infer(originalQuery, model) {
       }
       let elements = {}
       inline.forEach(inlineCol => {
-        inferArg(inlineCol, null, $leafLink, { inExpr: true, baseColumn: col })
+        inferArg(inlineCol, null, $leafLink, { inXpr: true, baseColumn: col })
         if (inlineCol === '*') {
           const wildCardElements = {}
           // either the `.elements´ of the struct or the `.elements` of the assoc target
@@ -762,7 +768,7 @@ function infer(originalQuery, model) {
           if (e === '*') {
             elements = { ...elements, ...$leafLink.definition.elements }
           } else {
-            inferArg(e, false, $leafLink, { inExpr: true })
+            inferArg(e, false, $leafLink, { inXpr: true })
             if (e.expand) elements[e.as || e.flatName] = resolveExpand(e)
             if (e.inline) elements = { ...elements, ...resolveInline(e) }
             else elements[e.as || e.flatName] = e.$refLinks ? e.$refLinks[e.$refLinks.length - 1].definition : e
@@ -859,7 +865,7 @@ function infer(originalQuery, model) {
       } else if (arg.xpr || arg.args) {
         const prop = arg.xpr ? 'xpr' : 'args'
         arg[prop].forEach(step => {
-          const subPath = { $refLinks: [...basePath.$refLinks], ref: [...basePath.ref] }
+          let subPath = { $refLinks: [...basePath.$refLinks], ref: [...basePath.ref] }
           if (step.ref) {
             step.$refLinks.forEach((link, i) => {
               const { definition } = link
@@ -874,6 +880,10 @@ function infer(originalQuery, model) {
           } else if (step.args || step.xpr) {
             const nestedProp = step.xpr ? 'xpr' : 'args'
             step[nestedProp].forEach(a => {
+              // reset sub path for each nested argument
+              // e.g. case when <path> then <otherPath> else <anotherPath> end
+              if(!a.ref)
+                subPath = { $refLinks: [...basePath.$refLinks], ref: [...basePath.ref] }
               mergePathsIntoJoinTree(a, subPath)
             })
           }
@@ -959,7 +969,8 @@ function infer(originalQuery, model) {
           if (element.type !== 'cds.LargeBinary') {
             queryElements[k] = element
           }
-          if (isCalculatedOnRead(element)) {
+          // only relevant if we actually select the calculated element
+          if (originalQuery.SELECT && isCalculatedOnRead(element)) {
             linkCalculatedElement(element)
           }
         }
@@ -1003,7 +1014,7 @@ function infer(originalQuery, model) {
    * @param {object} col
    * @returns object
    */
-  function getElementForXprOrSubquery(col, queryElements) {
+  function getElementForXprOrSubquery(col, queryElements, dollarSelfRefs) {
     const { xpr } = col
     let skipJoins = false
     xpr?.forEach(token => {
@@ -1011,7 +1022,7 @@ function infer(originalQuery, model) {
         // no joins for infix filters along `exists <path>`
         skipJoins = true
       } else {
-        inferArg(token, queryElements, null, { inExists: skipJoins, inExpr: true })
+        inferArg(token, queryElements, null, { inExists: skipJoins, inXpr: true, dollarSelfRefs })
         skipJoins = false
       }
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/db-service",
-  "version": "1.16.2",
+  "version": "1.17.1",
   "description": "CDS base database service",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/db-service#cds-base-database-service",
   "repository": {