@sap/cds 5.9.7 → 6.0.2

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

@@ -1,6 +1,5 @@
 const { computeColumnsToBeSearched } = require('../../../../libx/_runtime/cds-services/services/utils/columns')
 const searchToLike = require('./searchToLike')
-const { ensureNoDraftsSuffix } = require('./draft')
 const { getEntityNameFromCQN } = require('./entityFromCqn')
 
 const _targetFrom = (cqn, options) => {
@@ -8,12 +7,14 @@ const _targetFrom = (cqn, options) => {
   return getEntityNameFromCQN(cqn)
 }
 
-const _search2cqn4sql = (query, model, options = {}) => {
+// convert $search system query option to WHERE/HAVING clause using
+// the operator LIKE or CONTAINS
+const search2cqn4sql = (query, model, options = {}) => {
   const cqnSearchPhrase = query.SELECT.search
   if (!cqnSearchPhrase) return
   const { search2cqn4sql } = options
   const { entityName, alias } = _targetFrom(query.SELECT.from, options)
-  const entity = model.definitions[ensureNoDraftsSuffix(entityName)]
+  const entity = model.definitions[entityName]
   const columns = computeColumnsToBeSearched(query, entity, alias)
 
   // Call custom (optimized search to cqn for sql implementation) that tries
@@ -30,14 +31,4 @@ const _search2cqn4sql = (query, model, options = {}) => {
   query._aggregated || /* if new parser */ query.SELECT.groupBy ? query.having(expression) : query.where(expression)
 }
 
-const search2cqn4sql = (query, model, options) => {
-  if (query.SELECT.from.SET) {
-    return query.SELECT.from.SET.args.forEach(arg => _search2cqn4sql(arg, model, options))
-  }
-
-  return _search2cqn4sql(query, model, options)
-}
-
-// convert $search system query option to WHERE/HAVING clause using
-// the operator LIKE or CONTAINS
 module.exports = search2cqn4sql

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

@@ -1,19 +1,17 @@
 const _createLikeComparison = (searchXpr, columns, excludeSearch) => {
-  const likeExpression = []
+  const likeExpression = { xpr: [] }
 
   columns.forEach((column, index, columns) => {
     // if negated search, we need to add is null check
+    let currentExpression = likeExpression
     if (excludeSearch) {
-      likeExpression.push('(', column, 'IS NULL', 'OR')
+      currentExpression = { xpr: [column, 'IS NULL', 'OR'] }
     }
 
     const searchStringEscaped = searchXpr.val.toLowerCase().replace(/(\^|_|%)/g, '^$1')
 
-    likeExpression.push(
-      'lower',
-      '(',
-      column,
-      ')',
+    currentExpression.xpr.push(
+      { func: 'lower', args: [column] },
       excludeSearch ? 'NOT LIKE' : 'LIKE',
       { val: `%${searchStringEscaped}%` },
       'ESCAPE',
@@ -21,11 +19,11 @@ const _createLikeComparison = (searchXpr, columns, excludeSearch) => {
     )
 
     if (excludeSearch) {
-      likeExpression.push(')')
+      likeExpression.xpr.push(currentExpression)
     }
 
     if (index !== columns.length - 1) {
-      likeExpression.push(excludeSearch ? 'AND' : 'OR')
+      likeExpression.xpr.push(excludeSearch ? 'AND' : 'OR')
     }
   })
 
@@ -43,15 +41,13 @@ const searchToLike = (cqnSearchPhrase, columns, expression = []) => {
     }
 
     if (element.xpr) {
-      expression.push('(')
-      searchToLike(element.xpr, columns, expression)
-      expression.push(')')
+      expression.push({ xpr: searchToLike(element.xpr, columns) })
       return
     }
 
     const excludeSearch = cqnSearchPhrase[index - 1] === 'not'
     const likeComparison = _createLikeComparison(element, columns, excludeSearch)
-    expression.push('(', ...likeComparison, ')')
+    expression.push(likeComparison)
   })
 
   return expression

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

@@ -0,0 +1,35 @@
+const { ensureNoDraftsSuffix, ensureUnlocalized } = require('../../fiori/utils/handler')
+
+const _changeStreamProperties = (target, columns, model) => {
+  for (let index = 0; index < columns.length; index++) {
+    const col = columns[index]
+    const name = col.ref && col.ref[col.ref.length - 1]
+    const element = name && target.elements[name]
+    const type = element && !element['@Core.IsURL'] && element['@Core.MediaType']
+
+    if (col.ref && type) {
+      if (typeof type === 'object') {
+        columns[index] = {
+          ref: [...col.ref.slice(0, -1), type['=']],
+          as: `${name}@odata.mediaContentType`
+        }
+      } else {
+        columns[index] = { val: type, as: `${name}@odata.mediaContentType` }
+      }
+    } else if (col.expand && col.ref) {
+      const tgt = target.elements[col.ref] && target.elements[col.ref].target
+      tgt && _changeStreamProperties(model.definitions[ensureUnlocalized(ensureNoDraftsSuffix(tgt))], col.expand, model)
+    }
+  }
+}
+
+const handleStreamProperties = (target, select, model) => {
+  const columns = select.SELECT.columns
+  if (!columns || !target || !model) return
+  if (!select.SELECT._4odata) return
+  if (select._streaming) return
+
+  _changeStreamProperties(target, columns, model)
+}
+
+module.exports = { handleStreamProperties }

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

@@ -1,12 +1,14 @@
 const resolveStructured = require('./resolveStructured')
 const { ensureNoDraftsSuffix } = require('../../common/utils/draft')
 const { traverseFroms } = require('../../common/utils/entityFromCqn')
-// TODO move to commons as also used in cqn2cqn4sql
+
 const OPERATIONS_MAP = ['=', '>', '<', '!=', '<>', '>=', '<=', 'like', 'between', 'in', 'not in'].reduce((acc, cur) => {
   acc[cur] = 1
   return acc
 }, {})
 
+const NOT_EQUAL = { '!=': 1, '<>': 1 }
+
 const _getEntityNamesAndIds = from => {
   const nameAndIds = []
   traverseFroms(from, from => {
@@ -34,12 +36,7 @@ const _flattenStructuredInExpand = (column, { _target: expandedEntity }) => {
 
     if (element._isStructured) {
       toBeDeleted.push(propertyName)
-      flattenedElements.push(
-        ...resolveStructured(
-          { structName: element.name, structProperties: expandElement.ref.slice(1) },
-          element.elements
-        )
-      )
+      flattenedElements.push(...resolveStructured({ element, structProperties: expandElement.ref.slice(1) }))
     }
   }
 
@@ -64,10 +61,7 @@ const _flattenStructuredOrderBy = (orderBy, csnEntity) => {
       }
 
       if (element._isStructured) {
-        const flattenedStructOrder = resolveStructured(
-          { structName: order.ref[0], structProperties: order.ref.slice(1) },
-          element.elements
-        )
+        const flattenedStructOrder = resolveStructured({ element, structProperties: order.ref.slice(1) })
         newOrder.push(...flattenedStructOrder.map(element => ({ ref: element.ref, sort: order.sort })))
       } else {
         newOrder.push(order)
@@ -91,7 +85,7 @@ const _getVal = (data, name) => {
 
 const _filterForStructProperty = (structElement, structData, op, prefix = '', nav = []) => {
   const filterArray = []
-  const andOr = op === '!=' ? 'or' : 'and'
+  const andOr = op in NOT_EQUAL ? 'or' : 'and'
 
   for (const elementName in structElement.elements) {
     const element = structElement.elements[elementName]
@@ -161,7 +155,7 @@ const _transformStructToFlatWhereHaving = ([first, op, second], resArray, struct
   const structName = ref[structIdx]
   const structProperties = ref.slice(structIdx + 1)
   const nav = structIdx > 0 ? ref.slice(0, structIdx) : []
-  const flattenedElements = resolveStructured({ structName, structProperties }, structElement.elements)
+  const flattenedElements = resolveStructured({ element: structElement, structProperties })
   const flattenedElement = flattenedElements.find(el => el.ref[0] === [structName, ...structProperties].join('_'))
   let structData = val
   try {
@@ -178,7 +172,7 @@ const _transformStructToFlatWhereHaving = ([first, op, second], resArray, struct
     const filterForStructProperty = _filterForStructProperty(nestedElement, structData, op, prefix, nav)
     if (filterForStructProperty.length) {
       filterForStructProperty.pop() // last and/or
-      if (op === '!=') resArray.push('(', ...filterForStructProperty, ')')
+      if (op in NOT_EQUAL) resArray.push({ xpr: [...filterForStructProperty] })
       else resArray.push(...filterForStructProperty)
     }
   }
@@ -210,6 +204,7 @@ const flattenStructuredWhereHaving = (filterArray, csnEntity, model) => {
       newFilterArray.push({ xpr: flattenStructuredWhereHaving(filterArray[i].xpr, csnEntity, model) })
       continue
     }
+
     if (filterArray[i + 1] in OPERATIONS_MAP) {
       const refElement = filterArray[i].ref ? filterArray[i] : filterArray[i + 2]
 
@@ -268,9 +263,7 @@ const _flattenColumns = (SELECT, flattenedElements, toBeDeleted, csnEntity, tabl
 
     if (element._isStructured) {
       toBeDeleted.push(structName) // works with aliases?
-      flattenedElements.push(
-        ...resolveStructured({ structName, structProperties: cleanedUpRef.slice(1) }, element.elements)
-      )
+      flattenedElements.push(...resolveStructured({ element, structProperties: cleanedUpRef.slice(1) }))
     }
     if (cleanedUpRef.length < column.ref.length) {
       flattenedElements.forEach(e => e.ref.unshift(tableId))
@@ -315,5 +308,6 @@ const flattenStructuredSelect = ({ SELECT }, model) => {
 module.exports = {
   flattenStructuredSelect,
   flattenStructuredWhereHaving,
-  getNavigationIfStruct
+  getNavigationIfStruct,
+  OPERATIONS_MAP
 }

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

@@ -114,6 +114,7 @@ function _getTemplate(model, cache, targetEntity, callbacks, parent = null, _ent
       _addSubTemplate(templateElements, elementName, subTemplate)
     }
   }
+
   return template
 }
 
@@ -143,12 +144,9 @@ module.exports = (usecase, tx, target, ...args) => {
   const root = (model && model.definitions[target.name]) || target
   if (!root) return
 
-  // tx could be the service itself
-  // prefer ApplicationService (i.e., tx.context._tx.__proto__)
+  // tx could be the service itself -> prefer ApplicationService
   // REVISIT: context._tx is not a stable API -> pls do not rely on that
-  const service = tx.context
-    ? (tx.context._tx && Object.getPrototypeOf(tx.context._tx)) || Object.getPrototypeOf(tx)
-    : tx
+  const service = tx.context ? (tx.context.tx && Object.getPrototypeOf(tx.context.tx)) || Object.getPrototypeOf(tx) : tx
   if (!service) return
 
   // cache templates at service for garbage collection

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

@@ -6,18 +6,18 @@ const _formatRowContext = (tKey, keyNames, row) => {
   return `${tKey}(${keyValuePairsSerialized})`
 }
 
-const _processElement = (processFn, row, key, target, picked = {}, isRoot, path) => {
+const _processElement = (processFn, row, key, target, picked = {}, isRoot, pathSegments) => {
   const element = (target.elements || target.params)[key]
   const { plain } = picked
 
   if (!plain) return
   /**
-   * @type import('../../types/api').templateProcessorProcessFnArgs
+   * @type import('../../types/api').templateElementInfo
    */
-  const elementInfo = { row, key, element, target, plain, isRoot, path }
-  if (!element && target._flat2struct && target._flat2struct[key]) {
-    elementInfo.path = path.slice(0)
-    elementInfo.path.push(...target._flat2struct[key].map(key => ({ key })))
+  const elementInfo = { row, key, element, target, plain, isRoot, pathSegments }
+  if (!element && target._flat2struct && target._flat2struct[key] && elementInfo.pathSegments) {
+    elementInfo.pathSegments = pathSegments.slice(0)
+    elementInfo.pathSegments.push(...target._flat2struct[key])
   }
   processFn(elementInfo)
 }
@@ -26,7 +26,7 @@ const _processRow = (processFn, row, template, tKey, tValue, isRoot, pathOptions
   const { template: subTemplate, picked } = tValue
   const key = tKey.split(DELIMITER).pop()
 
-  _processElement(processFn, row, key, template.target, picked, isRoot, pathOptions.path)
+  _processElement(processFn, row, key, template.target, picked, isRoot, pathOptions.pathSegments)
 
   // process deep
   if (subTemplate && typeof row === 'object' && row) {
@@ -34,29 +34,37 @@ const _processRow = (processFn, row, template, tKey, tValue, isRoot, pathOptions
   }
 }
 
+const _getTargetKeyNames = target => {
+  const keyNames = []
+  for (const keyName in target.keys) {
+    if (target.keys[keyName].__isAssociationStrict) continue
+    keyNames.push(keyName)
+  }
+  return keyNames
+}
+
 const _processComplex = (processFn, row, template, key, pathOptions) => {
   const value = row && row[key]
-  const _is2many = Array.isArray(value)
-  const rows = _is2many ? value : [value]
+  const rows = Array.isArray(value) ? value : [value]
   if (rows.length === 0) return
-  const keyNames = (template.target.keys && Object.keys(template.target.keys)) || []
+  const keyNames = _getTargetKeyNames(template.target)
 
   for (let idx = 0; idx < rows.length; idx++) {
     const row = rows[idx]
     if (row == null) continue
     const args = { processFn, row, template, isRoot: false, pathOptions }
 
-    let url
+    let rowContext
     if (pathOptions.includeKeyValues) {
       if (pathOptions.rowKeysGenerator) pathOptions.rowKeysGenerator(keyNames, row, template)
-      url = _formatRowContext(key, keyNames, Object.assign({}, row, pathOptions.extraKeys))
+      rowContext = _formatRowContext(key, keyNames, Object.assign({}, row, pathOptions.extraKeys))
     }
 
-    if (pathOptions.path) pathOptions.path.push({ key, idx: _is2many && idx, url })
+    if (pathOptions.pathSegments) pathOptions.pathSegments.push(rowContext || key)
 
     templateProcessor(args)
 
-    if (pathOptions.path) pathOptions.path.pop()
+    if (pathOptions.pathSegments) pathOptions.pathSegments.pop()
   }
 }
 

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

@@ -96,7 +96,7 @@ module.exports = {
                         val: 1
                       }
                     ],
-                    where: ['(', '%%KEYS%%', ')']
+                    where: [{ xpr: ['%%KEYS%%'] }]
                   },
                   as: 'HasDraftEntity',
                   cast: {
@@ -125,7 +125,7 @@ module.exports = {
                     ref: ['DraftAdministrativeData_DraftUUID']
                   }
                 ],
-                where: ['(', '%%KEYS%%', ')']
+                where: [{ xpr: ['%%KEYS%%'] }]
               }
             }
           ],
@@ -160,19 +160,9 @@ module.exports = {
                   }
                 ],
                 where: [
-                  '(',
-                  {
-                    ref: ['filterAdmin', 'InProcessByUser']
-                  },
-                  '=',
-                  {
-                    val: '%%USER%%'
-                  },
-                  ')',
+                  { xpr: [{ ref: ['filterAdmin', 'InProcessByUser'] }, '=', { val: '%%USER%%' }] },
                   'and',
-                  '(',
-                  '%%KEYS%%',
-                  ')'
+                  { xpr: ['%%KEYS%%'] }
                 ]
               }
             }

package/libx/_runtime/db/Service.js

@@ -30,7 +30,8 @@ class DatabaseService extends cds.Service {
         // if the tx was initiated in messaging, then this.context._model is not unfolded
         //   -> use this.context._model._4odata if present
         const { _model } = this.context
-        this.model = (_model && _model._4odata) || _model || req._model
+        if (_model) this.model = _model._4odata || _model
+        else this.model = req._model
       }
     }
     this._ensureModel._initial = true

package/libx/_runtime/db/expand/expand-v2.js

@@ -14,7 +14,7 @@ const _removeParentKeysFromRow = (row, prefix, keys) => {
 const _autoExpandNavsAndAttachToResult = async (entity, previousResult, depth, options) => {
   for (const nav in entity._associations) {
     const navigation = entity._associations[nav]
-    if (options.onlyCompositions && navigation._isAssociationEffective) continue
+    if (options.onlyCompositions && navigation._isAssociationStrict) continue
 
     // do not expand backlinks
     if (navigation._isBacklink) continue
@@ -94,7 +94,7 @@ const _fkForOnCOnd = (onCond, requiredFks) => {
 const _foreignKeysOfTopLevelNavs = (entity, options) => {
   const requiredFks = new Set()
   for (const nav in entity._associations) {
-    if (options.onlyCompositions && entity._associations[nav]._isAssociationEffective) continue
+    if (options.onlyCompositions && entity._associations[nav]._isAssociationStrict) continue
     const onCond = entity._relations[nav].join('child', 'parent')
     _fkForOnCOnd(onCond, requiredFks)
   }

package/libx/_runtime/db/expand/expandCQNToJoin.js

@@ -317,7 +317,9 @@ class JoinCQNFromExpanded {
    */
   _adaptWhereOrderBy(cqn, tableAlias) {
     if (cqn.where) {
-      cqn.where = cqn.where.map(element => this._adaptWhereElement(element, cqn, tableAlias))
+      cqn.where = cqn.where.map(element => {
+        return this._adaptWhereElement(element, cqn, tableAlias)
+      })
     }
 
     if (cqn.having) {
@@ -603,7 +605,7 @@ class JoinCQNFromExpanded {
     return {
       args: [cqn, { ref: [draftTable], as: `${tableAlias}_drafts` }],
       join: 'left',
-      on: ['(', ...on, ')']
+      on: [{ xpr: [...on] }]
     }
   }
 
@@ -982,8 +984,7 @@ class JoinCQNFromExpanded {
 
     if (!column[SKIP_MAPPING]) {
       mappings[column[IDENTIFIER] || identifier] = as
-      // REVISIT: remove flag cds.env.features.auto_fetch_expand_keys after two month grace period
-      if (column[CLEANUP_KEYS] && !cds.env.features.auto_fetch_expand_keys) {
+      if (column[CLEANUP_KEYS]) {
         delete aliasedElement[CLEANUP_KEYS]
         if (!mappings[CLEANUP_KEYS]) mappings[CLEANUP_KEYS] = {}
         mappings[CLEANUP_KEYS][column[IDENTIFIER] || identifier] = as
@@ -1599,7 +1600,7 @@ class JoinCQNFromExpanded {
   }
 
   _isNotIncludedIn(columns) {
-    if (columns.some(column => isAsteriskColumn(column))) return _ => false
+    if (columns.some(column => isAsteriskColumn(column))) return () => false
     return entry =>
       !columns.some(
         column =>
@@ -1614,7 +1615,7 @@ class JoinCQNFromExpanded {
    * @private
    */
 
-  _addMissingJoinElements(columns, joinColumns, keys) {
+  _addMissingJoinElements(columns, joinColumns) {
     const isNotIncludedInColumns = this._isNotIncludedIn(columns)
     for (const joinColumn of joinColumns) {
       if (isNotIncludedInColumns(joinColumn.ref[1])) {

package/libx/_runtime/db/generic/input.js

@@ -32,8 +32,8 @@ const _processComplexCategory = ({ row, key, val, category, req, element }) => {
   category = category.category
 
   // propagate keys
-  if (category === 'propagateForeignKeys' && row[key]) {
-    propagateForeignKeys(key, row, element._foreignKeys, element._isCompositionEffective)
+  if (category === 'propagateForeignKeys' && key in row) {
+    propagateForeignKeys(key, row, element._foreignKeys, element.isComposition)
     return
   }
 
@@ -41,12 +41,12 @@ const _processComplexCategory = ({ row, key, val, category, req, element }) => {
   if (val === undefined && _isManaged(category, req.event)) {
     if (typeof categoryArgs === 'object') {
       const val = categoryArgs['=']
-      if (val.match(/^\$/)) row[key] = val
-      else row[key] = row[val]
+      if (val.match(/^\$/)) {
+        row[key] = val === '$uuid' ? cds.utils.uuid() : val
+      } else row[key] = row[val]
     } else {
       row[key] = categoryArgs
     }
-    return
   }
 
   // not null with default for rest response body and ensure utc
@@ -62,7 +62,9 @@ const _processComplexCategory = ({ row, key, val, category, req, element }) => {
   }
 }
 
-const _processCategory = ({ category, row, key, element, val, req }) => {
+const _processCategory = (req, category, { row, key, element }) => {
+  const val = row[key]
+
   // use args only inside this if (sonar type error warning)
   if (typeof category === 'object') {
     _processComplexCategory({ category, row, key, val, req, element })
@@ -106,16 +108,11 @@ const _processCategory = ({ category, row, key, element, val, req }) => {
   }
 }
 
-const processorFn =
-  req =>
-  ({ row, key, element, plain }) => {
-    const categories = plain.categories
-    const val = row[key]
-
-    for (const category of categories) {
-      _processCategory({ category, row, key, element, val, req })
-    }
+const _processorFn = req => elementInfo => {
+  for (const category of elementInfo.plain.categories) {
+    _processCategory(req, category, elementInfo)
   }
+}
 
 const _isVirtualOrCalculated = element => {
   if (element.virtual) return true
@@ -155,7 +152,7 @@ const _pickCRUD = element => {
     categories.push({ category: '@cds.on.update', args: element['@cds.on.update'] })
   }
 
-  if (element._isAssociationEffective && !element._target._hasPersistenceSkip) {
+  if (element._isAssociationStrict && !element._target._hasPersistenceSkip) {
     categories.push('associationEffective')
   }
 
@@ -223,7 +220,7 @@ function _handler(req) {
 
   const data = Array.isArray(req.data) ? req.data : [req.data]
   for (const row of data) {
-    templateProcessor({ processFn: processorFn(req), row, template })
+    templateProcessor({ processFn: _processorFn(req), row, template })
   }
 }
 

package/libx/_runtime/db/generic/integrity.js

@@ -54,8 +54,7 @@ const _runtimeShallCheckIntegrityFor = (assoc, inclComps) => {
 
   // here, no disqualification and no @assert.integrity specified -> global setting
   const { assert_integrity: ai, assert_integrity_type: ait } = cds.env.features
-  if (typeof ai === 'string' && ai.match(/individual/i)) return false
-  if (ait && ait.match(/db/i)) return false
+  if (ai && ait && ait.match(/db/i)) return false
   return true
 }
 

package/libx/_runtime/db/generic/update.js

@@ -1,8 +1,21 @@
 // REVISIT: UpdateResult
 // const UpdateResult = require('../result/UpdateResult')
 
-const { allKeysAreProvided } = require('../../cds-services/services/utils/handlerUtils')
 const onlyKeysRemain = require('../../common/utils/onlyKeysRemain')
+const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
+
+const allKeysAreProvided = req => {
+  const data = req.data && (Array.isArray(req.data) ? req.data : [req.data])
+  for (const key of Object.values(req.target.keys || {})) {
+    if (key._isAssociationStrict || key.name in DRAFT_COLUMNS_MAP) {
+      continue
+    }
+    for (const d of data) {
+      if (d[key.name] === undefined) return false
+    }
+  }
+  return true
+}
 
 const _enrichKeysFromOldData = (req, oldData) => {
   const data = req.data && (Array.isArray(req.data) ? req.data : [req.data])

package/libx/_runtime/db/query/read.js

@@ -1,5 +1,4 @@
 const { timestampToISO } = require('../data-conversion/timestamp')
-
 const { deepCopyObject } = require('../../common/utils/copy')
 
 function _arrayWithCount(a, count) {

package/libx/_runtime/db/query/update.js

@@ -29,7 +29,7 @@ const _getFilteredCqns = (cqns, model) => {
     )
     if (moreThanManaged) continue
 
-    const comps = Object.values(entity.associations || {}).filter(assoc => assoc._isCompositionEffective)
+    const comps = Object.values(entity.associations || {}).filter(assoc => assoc.isComposition)
     for (const comp of comps) {
       if (_includesCompositionTarget(cqns, comp.target)) {
         moreThanManaged = true

package/libx/_runtime/db/sql-builder/BaseBuilder.js

@@ -56,7 +56,7 @@ class BaseBuilder {
   _getDatabaseName(entity) {
     return this._quotingStyle === 'plain'
       ? entity
-      : getArtifactCdsPersistenceName(entity, this._quotingStyle, this._csn)
+      : getArtifactCdsPersistenceName(entity, this._quotingStyle, this._csn, 'hana') // FIXME: SQL dialect instead of hardcoded 'hana'
   }
 
   _validateQuotingStyle() {

package/libx/_runtime/db/sql-builder/ExpressionBuilder.js

@@ -138,6 +138,7 @@ class ExpressionBuilder extends BaseBuilder {
    */
   // eslint-disable-next-line complexity
   _reseverdKeyWords(objects, i) {
+    const NOT_EQUAL = { '!=': 1, '<>': 1 }
     if (objects[i] === 'not' && objects[i + 1].func) {
       objects[i + 1].func = `not ${objects[i + 1].func}`
       return 1
@@ -160,35 +161,19 @@ class ExpressionBuilder extends BaseBuilder {
       return 0
     }
 
-    if ((objects[i + 1] === '=' || objects[i + 1] === '!=') && objects[i + 2] && objects[i + 2].val === null) {
+    if ((objects[i + 1] === '=' || objects[i + 1] in NOT_EQUAL) && objects[i + 2] && objects[i + 2].val === null) {
       this._addNullOrNotNull(objects[i], objects[i + 1])
       return 3
     }
 
-    if (objects[i].val === null && (objects[i + 1] === '=' || objects[i + 1] === '!=') && objects[i + 2]) {
+    if (objects[i].val === null && (objects[i + 1] === '=' || objects[i + 1] in NOT_EQUAL) && objects[i + 2]) {
       this._addNullOrNotNull(objects[i + 2], objects[i + 1])
       return 3
     }
 
     if (/^(not )?in+/i.test(objects[i + 1])) {
-      if (objects[i + 2] !== '(') {
-        this._addInOrNotIn(objects[i], objects[i + 1].toUpperCase(), objects[i + 2])
-        return 3
-      }
-
-      // map other notation to current notation
-      const arr = []
-      let skip = 3
-      for (let j = i + 3; j < objects.length; j++) {
-        skip++
-        if (objects[j] === ')') {
-          break
-        } else if (objects[j].val) {
-          arr.push(objects[j].val)
-        }
-      }
-      this._addInOrNotIn(objects[i], objects[i + 1].toUpperCase(), { val: arr })
-      return skip
+      this._addInOrNotIn(objects[i], objects[i + 1].toUpperCase(), objects[i + 2])
+      return 3
     }
 
     return 0
@@ -226,17 +211,6 @@ class ExpressionBuilder extends BaseBuilder {
    * @private
    */
   _addInOrNotIn(reference, operator, values) {
-    if (values.val === null) {
-      this._addToOutputObj(new this.ReferenceBuilder(reference, this._options, this._csn).build(), false)
-      this._outputObj.sql.push('is null')
-      return true
-    }
-
-    if (Array.isArray(values.val)) {
-      this._addArrayForInQuery(reference, operator, values.val)
-      return true
-    }
-
     if (Array.isArray(values.list)) {
       this._expressionElementToSQL(reference)
       this._outputObj.sql.push(operator)

package/libx/_runtime/db/sql-builder/InsertBuilder.js

@@ -297,7 +297,7 @@ class InsertBuilder extends BaseBuilder {
   _entries(annotatedColumns) {
     const columns = []
     const valuesArray = []
-    const insertAnnotatedColumns = (annotatedColumns && annotatedColumns.insertAnnotatedColumns) || []
+    const insertAnnotatedColumns = (annotatedColumns && annotatedColumns.insertAnnotatedColumns) || new Map()
     const flattenColumnMap = this._getFlattenColumnMap(this._obj.INSERT.entries, { annotatedColumns })
     const purelyManagedColumns = this._getAnnotatedInsertColumnNames(annotatedColumns).filter(
       colName => !flattenColumnMap.has(colName)