@sap/cds 5.9.8 → 6.0.1

package/libx/_runtime/common/utils/cqn2cqn4sql.js

@@ -6,7 +6,7 @@ const Query = require('../../../../lib/ql/Query')
 
 const { resolveView } = require('./resolveView')
 const { ensureNoDraftsSuffix, getDraftColumnsCQNForDraft } = require('./draft')
-const { flattenStructuredSelect } = require('./structured')
+const { flattenStructuredSelect, OPERATIONS_MAP } = require('./structured')
 const search2cqn4sql = require('./search2cqn4sql')
 const { getEntityNameFromCQN } = require('./entityFromCqn')
 const getError = require('../../common/error')
@@ -16,11 +16,7 @@ const { removeIsActiveEntityRecursively } = require('../../fiori/utils/where')
 const { addRefToWhereIfNecessary } = require('../../../odata/afterburner')
 const { addAliasToExpression, PARENT_ALIAS, FOREIGN_ALIAS } = require('../../db/utils/generateAliases')
 const { getColumns } = require('../../cds-services/services/utils/columns')
-
-const OPERATIONS_MAP = ['=', '>', '<', '!=', '<>', '>=', '<=', 'like', 'between', 'in', 'not in'].reduce((acc, cur) => {
-  acc[cur] = 1
-  return acc
-}, {})
+const { handleStreamProperties } = require('./streamProp')
 
 const _elementFromRef = (name, entity) => {
   if (!entity) return
@@ -30,9 +26,7 @@ const _elementFromRef = (name, entity) => {
   }
 }
 
-const _getTargetFromRef = ref => {
-  return ref.id || ref
-}
+const _getTargetFromRef = ref => ref.id || ref
 
 const _getEntityName = (fromClause, entity, i) => {
   const targetName = _getTargetFromRef(fromClause.ref[i])
@@ -41,6 +35,7 @@ const _getEntityName = (fromClause, entity, i) => {
 
 const convertPathExpressionToWhere = (fromClause, model, options) => {
   if (!fromClause.ref) return
+
   if (fromClause.ref.length === 1) {
     const target = _getTargetFromRef(fromClause.ref[0])
     const alias = fromClause.as
@@ -124,9 +119,7 @@ const _convertPathExpressionForInsert = (intoClause, model) => {
   }, '')
 }
 
-const _getBottomTopRefOrVal = (func, refVal) => {
-  return func.args.filter(el => el[refVal])
-}
+const _getBottomTopRefOrVal = (func, refVal) => func.args.filter(el => el[refVal])
 
 const _getWindowWhere = (where, bottomTop) => {
   const windWhere = where || []
@@ -163,24 +156,16 @@ const _getWindowXpr = (groupBy, bottomTop) => {
         return acc
       }, [])
     )
+
   xpr.push('ORDER BY', _getOrderByForWindowFn(bottomTop))
   xpr.push(')')
   return { xpr: xpr, as: 'rowNumber' }
 }
 
 const _isNavCountFunc = el => el.func && el.func === 'count' && el.args[0] !== '*'
-
-const _isCountNavigation = columns => {
-  return columns.some(_isNavCountFunc)
-}
-
-const _isBottomTop = columns => {
-  return columns.some(el => el.func && (el.func === 'topcount' || el.func === 'bottomcount'))
-}
-
-const _getWindColumns = (columns, groupBy, bottomTop) => {
-  return [].concat(columns, _getWindowXpr(groupBy, bottomTop))
-}
+const _isCountNavigation = columns => columns.some(_isNavCountFunc)
+const _isBottomTop = columns => columns.some(el => el.func && (el.func === 'topcount' || el.func === 'bottomcount'))
+const _getWindColumns = (columns, groupBy, bottomTop) => [].concat(columns, _getWindowXpr(groupBy, bottomTop))
 
 const _convertCountNavigation = (SELECT, target) => {
   const newWhere = []
@@ -192,6 +177,7 @@ const _convertCountNavigation = (SELECT, target) => {
       continue
     }
 
+    if (SELECT.from.as && SELECT.from.as === element.args[0].ref[0]) element.args[0].ref.shift()
     const navigations = element.args[0].ref
     const navigationName = navigations[0].id || navigations[0]
     if (target.elements[navigationName]) {
@@ -218,6 +204,7 @@ const _convertCountNavigation = (SELECT, target) => {
         const nestedNavigationName = nextNavigation.id || nextNavigation
         if (j === navigations.length - 1) {
           nestedExistsQuery.columns('count(1) as counted')
+
           if (lastQuery) {
             lastQuery.where([nestedExistsQuery, SELECT.where[i + 1], SELECT.where[i + 2]])
             newWhere.push('exists', topQuery)
@@ -235,6 +222,7 @@ const _convertCountNavigation = (SELECT, target) => {
       i += 2
     }
   }
+
   SELECT.where = newWhere
 }
 
@@ -243,9 +231,11 @@ const _addTableName = (where, tableName) => {
     if (whereEl.xpr) {
       return { xpr: _addTableName(whereEl.xpr, tableName) }
     }
+
     if (whereEl.ref) {
       whereEl.ref.unshift(tableName)
     }
+
     return whereEl
   })
 }
@@ -261,7 +251,6 @@ const _buildExistsQuery = (entity, navigation, currentAlias, nextAlias) => {
   }
 
   const onCond = entity.elements[navigation.id || navigation]._relations.join(nextAlias, currentAlias)
-
   return existsQuery.where(onCond)
 }
 
@@ -332,6 +321,7 @@ const _getWhereExistsSubSelect = (queryTarget, outerAlias, innerAlias, ref, mode
     if (subSelect.SELECT.from.as) {
       for (let i = 0; i < condition.length; i++) {
         if (!condition[i].ref) continue
+
         if (
           condition[i].ref.length > 1 &&
           condition[i].ref.every(r => typeof r === 'string') &&
@@ -343,6 +333,7 @@ const _getWhereExistsSubSelect = (queryTarget, outerAlias, innerAlias, ref, mode
         }
       }
     }
+
     // skip for where: [{ val: 1 }]
     // where: [{ func: 'contains', args: [] }] must be evaluated
     if (condition.length > 1 || (condition.length === 1 && !('val' in condition[0]))) subSelect.where(condition)
@@ -356,7 +347,6 @@ const _getWhereExistsSubSelect = (queryTarget, outerAlias, innerAlias, ref, mode
 
   // nested where exists needs recursive conversion
   options.lambdaIteration++
-
   return _convertSelect(subSelect, model, options)
 }
 
@@ -369,6 +359,7 @@ const _ensureExpandedNestedWhereExists = ({ ref }, aliases) => {
   const acc = {}
   let cur = acc
   let alias
+
   for (const r of ref) {
     if (Array.isArray(cur)) {
       if (cur.length > 1) {
@@ -381,6 +372,7 @@ const _ensureExpandedNestedWhereExists = ({ ref }, aliases) => {
         cur = cur[1].ref[0]
       }
     }
+
     if (typeof r === 'string' && aliases.includes(r)) {
       alias = r
     } else {
@@ -390,6 +382,7 @@ const _ensureExpandedNestedWhereExists = ({ ref }, aliases) => {
       cur = cur.where
     }
   }
+
   if (alias) return { ref: [alias, acc] }
   return { ref: [acc] }
 }
@@ -437,16 +430,18 @@ const convertWhereExists = (query, model, options, currentTarget) => {
     (query.from &&
       ((query.from.ref && query.from) || (query.from.args && query.from.args[0].ref && query.from.args[0]))) ||
     {}
+
   if (!ref) return
 
   if (!options.lambdaIteration) options.lambdaIteration = 1
   const lambdaIteration = options.lambdaIteration
-  if (!currentTarget) {
+
+  if (currentTarget) {
+    queryTarget = getEntityFromPath({ ref }, currentTarget)
+  } else {
     queryTarget = getEntityFromPath(getPathFromRef(ref), model)
     outerAlias = as || PARENT_ALIAS + lambdaIteration
     innerAlias = FOREIGN_ALIAS + lambdaIteration
-  } else {
-    queryTarget = getEntityFromPath({ ref }, currentTarget)
   }
 
   if (where) {
@@ -471,6 +466,7 @@ const convertWhereExists = (query, model, options, currentTarget) => {
       } else if (element.SELECT) {
         convertWhereExists(element.SELECT, model, options)
       }
+
       options.lambdaIteration = lambdaIteration
     }
   }
@@ -478,18 +474,20 @@ const convertWhereExists = (query, model, options, currentTarget) => {
   if (columns) {
     columns.forEach(column => _convertWhereExistsColumn(column, model, options, queryTarget))
   }
+
   if (expand && expand !== '*') {
     expand.forEach(column => _convertWhereExistsColumn(column, model, options, queryTarget))
   }
 }
 
 const _convertNotEqual = (container, partName = 'where') => {
+  const NOT_EQUAL = { '!=': 1, '<>': 1 }
   const where = container[partName]
 
   if (where) {
     for (let index = 0; index < where.length; index++) {
       const el = where[index]
-      if (el === '!=') {
+      if (el in NOT_EQUAL) {
         const refIndex = _getRefIndex(where, index)
         if (refIndex !== undefined) {
           where[index - 1] = {
@@ -500,9 +498,12 @@ const _convertNotEqual = (container, partName = 'where') => {
         }
       }
 
-      if (el) {
-        if (el.SELECT) _convertNotEqual(el.SELECT, partName)
-        if (el.xpr) _convertNotEqual(el, 'xpr')
+      if (el && el.SELECT) {
+        _convertNotEqual(el.SELECT, partName)
+      }
+
+      if (el && el.xpr) {
+        _convertNotEqual(el, 'xpr')
       }
     }
   }
@@ -512,7 +513,10 @@ const _convertNotEqual = (container, partName = 'where') => {
       if (typeof col === 'object') {
         if (col.SELECT) {
           _convertNotEqual(col.SELECT, partName)
-        } else if (col.where) {
+          return
+        }
+
+        if (col.where) {
           _convertNotEqual(col, partName)
         }
       }
@@ -560,6 +564,7 @@ const _convertOrderByOrWhereCQN = (orderByOrWhereCQN, target, model, alias, proc
       _convertOrderByOrWhereCQN(el.xpr, target, model, alias, processFn)
       return
     }
+
     if (el.ref && _skip(queryTarget, el.ref, alias, model)) processFn(orderByOrWhereCQN, index)
   })
 }
@@ -581,10 +586,12 @@ const _convertExpand = expand => {
       if (expandElement.ref[0].where) {
         expandElement.where = expandElement.ref[0].where
       }
+
       if (expandElement.ref[0].id) {
         expandElement.ref[0] = expandElement.ref[0].id
       }
     }
+
     if (expandElement.expand) {
       _convertExpand(expandElement.expand)
     }
@@ -592,13 +599,13 @@ const _convertExpand = expand => {
 }
 
 const _convertRefWhereInExpand = columns => {
-  if (columns) {
-    columns.forEach(col => {
-      if (col.expand && typeof col.expand !== 'string') {
-        _convertExpand(col.expand)
-      }
-    })
-  }
+  if (!columns) return
+
+  columns.forEach(col => {
+    if (col.expand && typeof col.expand !== 'string') {
+      _convertExpand(col.expand)
+    }
+  })
 }
 
 const _convertPathExpression = (query, model, options = {}) => {
@@ -606,6 +613,7 @@ const _convertPathExpression = (query, model, options = {}) => {
   for (const whereEl of query.SELECT.where || []) {
     if (typeof whereEl === 'object' && whereEl.SELECT) _convertPathExpression(whereEl, model)
   }
+
   const conversion = convertPathExpressionToWhere(query.SELECT.from, model, options)
   if (!conversion) return
   const { target, alias, where, cardinality, columns, args } = conversion
@@ -617,12 +625,14 @@ const _convertPathExpression = (query, model, options = {}) => {
   } else {
     query.SELECT.from = { ref: [target] }
   }
+
   if (alias) {
     query.SELECT.from.as = alias
     if (query.SELECT.where && alias !== prevAlias) {
       query.SELECT.where = addAliasToExpression(query.SELECT.where, alias)
     }
   }
+
   if (columns) {
     // TODO: use streaming as outer property
     if (options.isStreaming) query.SELECT.columns = columns
@@ -642,15 +652,17 @@ const _convertPathExpression = (query, model, options = {}) => {
       query.SELECT.columns.push(...columns)
     }
   }
+
   if (cardinality && cardinality.max === 1) {
     query.SELECT.one = true
   }
+
   // TODO: REVISIT: We need to add alias to subselect in .where, .columns, .from, ... etc
   if (where) {
     if (options._4fiori) {
       query.where(where)
     } else {
-      query.where(removeIsActiveEntityRecursively(where))
+      query.where({ xpr: removeIsActiveEntityRecursively(where) })
     }
   }
 }
@@ -664,10 +676,12 @@ const _convertToOneEqNullInFilter = (query, target) => {
     if (w.xpr) {
       _convertToOneEqNullInFilter({ where: w.xpr }, target)
     }
+
     const w2 = query.where[i + 2]
     if (!w2 || !w.ref || w2.val !== null) {
       continue
     }
+
     const element = target.elements[w.ref[w.ref.length - 1]]
     if (element && element.is2one && !element.on) {
       const foreignKeys = Object.values(element.parent.elements).filter(e => e._foreignKey4 === element.name)
@@ -679,33 +693,31 @@ const _convertToOneEqNullInFilter = (query, target) => {
         return arr
       }, [])
 
-      query.where.splice(i, 3, '(', ...replacedKeys, ')')
-      i += replacedKeys.length + 2
+      query.where.splice(i, 3, { xpr: [...replacedKeys] })
+      i++
     }
   }
 }
 
 // eslint-disable-next-line complexity
 const _convertSelect = (query, model, _options) => {
-  const options = Object.assign(
-    {
-      _4db: _options.service instanceof cds.DatabaseService,
-      isStreaming: query._streaming
-    },
-    _options
-  )
+  const _4db = _options.service instanceof cds.DatabaseService
+  const options = Object.assign({ _4db, isStreaming: query._streaming }, _options)
 
   // ensure query is ql enabled
   if (!(query instanceof Query)) Object.setPrototypeOf(query, Object.getPrototypeOf(SELECT()))
   if (query.SELECT.from && query.SELECT.from.SELECT) {
     if (query.SELECT._4odata) query.SELECT.from.SELECT._4odata = true
     query.SELECT.from = _convertSelect(query.SELECT.from, model, options)
+    if (!query.SELECT.columns || !query.SELECT.columns.length) {
+      query.SELECT.columns = query.SELECT.from.SELECT.columns.map(c => (c.as ? { ref: [c.as] } : c))
+    }
   }
 
   // lambda functions
   convertWhereExists(query.SELECT, model, options)
 
-  // add 'or is null' in case of '!='
+  // add 'or is null' in case of not equal: '!=' or '<>'
   if (query.SELECT._4odata) {
     _convertNotEqual(query.SELECT, 'where')
     _convertNotEqual(query.SELECT, 'having')
@@ -713,13 +725,16 @@ const _convertSelect = (query, model, _options) => {
 
   _convertPathExpression(query, model, options)
   rewriteAsterisks(query, model, options)
+  const entity =
+    (query.SELECT.from.ref && (query.SELECT.from.ref[0].id || query.SELECT.from.ref[0])) || query.SELECT.from
+  const target = entity && model.definitions[entity]
+  handleStreamProperties(target, query, model)
+
   if (query.SELECT.where) {
-    const entityName =
-      (query.SELECT.from.ref && (query.SELECT.from.ref[0].id || query.SELECT.from.ref[0])) || query.SELECT.from
-    const target = model.definitions[entityName]
     if (_isCountNavigation(query.SELECT.where)) {
       _convertCountNavigation(query.SELECT, target)
     }
+
     _convertToOneEqNullInFilter(query.SELECT, target)
   }
 
@@ -737,6 +752,25 @@ const _convertSelect = (query, model, _options) => {
     search2cqn4sql(query, model, { ...query._searchOptions, ...{ entityName, alias } })
   }
 
+  if (target && query.SELECT.columns) {
+    // clean up associations / compositions from columns, if not expanded
+    const cleanedUpColumns = []
+    for (const col of query.SELECT.columns) {
+      if (!col.expand) {
+        const ref = col.ref && col.ref[col.ref.length - 1]
+        const refElement = target.elements[ref]
+        if (refElement && refElement.isAssociation) {
+          // ignore
+          continue
+        }
+      }
+
+      cleanedUpColumns.push(col)
+    }
+
+    query.SELECT.columns = cleanedUpColumns
+  }
+
   if (query.SELECT.columns && (cds.env.effective.odata.structs || cds.env.features.ucsn_struct_conversion)) {
     flattenStructuredSelect(query, model)
   }
@@ -752,6 +786,7 @@ const _convertSelect = (query, model, _options) => {
     if (target && target._unresolved && typeof target.name === 'string') {
       target = model.definitions[ensureNoDraftsSuffix(target.name)] || target
     }
+
     if (target && !Object.prototype.hasOwnProperty.call(target, '_unresolved')) {
       const cols = getColumns(target, { onlyNames: true, filterVirtual: true })
       query.columns(cols)
@@ -765,7 +800,7 @@ const _convertSelect = (query, model, _options) => {
   return query
 }
 
-const _convertInsert = (query, model, options) => {
+const _convertInsert = (query, model) => {
   // resolve path expression
   const resolvedIntoClause = _convertPathExpressionForInsert(query.INSERT.into, model)
 
@@ -787,6 +822,7 @@ const _convertInsert = (query, model, options) => {
 
 function _modifyNavigationInWhere(whereClause, target) {
   if (!whereClause) return
+
   whereClause.forEach(e => {
     if (e.ref && e.ref.length > 1 && target.elements[e.ref[0]]) {
       const element = target.elements[e.ref[0]]
@@ -853,7 +889,6 @@ function _plainUpdate(cqn, model) {
   }
 
   if (!target) return cqn
-
   return resolveView(cqn, model, cds.db)
 }
 
@@ -885,7 +920,6 @@ const _convertUpdate = (query, model, options) => {
   }
 
   if (!targetEntity) return update
-
   return resolveView(update, model, cds.db)
 }
 
@@ -909,7 +943,7 @@ const cqn2cqn4sql = (query, model, options = { suppressSearch: false }) => {
   }
 
   if (query.INSERT) {
-    return _convertInsert(query, model, options)
+    return _convertInsert(query, model)
   }
 
   if (query.DELETE) {