@sap/cds 5.5.3 → 5.6.1

package/libx/_runtime/cds-services/adapter/odata-v4/OData.js

@@ -159,6 +159,7 @@ class OData {
 
     this._odataService.on(ATOMICITY_GROUP_START, (odataContext, done) => {
       const data = odataContext.applicationData
+
       // start tx
       const txs = (data.txs = data.txs || {})
       const {
@@ -179,28 +180,14 @@ class OData {
     this._odataService.on(ATOMICITY_GROUP_END, async (odataErr, odataContext, done) => {
       const tx = odataContext.applicationData.txs[odataContext.id]
       let errors = odataErr || odataContext.failedRequests.length > 0
-      if (!errors) {
-        try {
-          await tx.commit(odataContext.applicationData.results[odataContext.id])
-          done()
-        } catch (e) {
-          // tx gets rolled back automatically
-          // set error on each request of changeset, if commit failed
-          const changesetResults = odataContext.applicationData.results[odataContext.id]
-          const failedRequests = changesetResults.reduce((obj, resultEntry) => {
-            const requestId = resultEntry.req._.odataReq.getOdataRequestId()
-            const { error, statusCode } = normalizeError(e, resultEntry.req)
-            obj[requestId] = Object.assign(error, { statusCode })
-            return obj
-          }, {})
-          done(e, { failedRequests })
-        }
-      } else {
+
+      if (errors) {
         // rollback without errors to not trigger srv.on('error') with array
         await tx.rollback()
         // invoke srv.on('error') for each error and build failedRequests that reflects error modifications
         errors = odataContext.applicationData.errors[odataContext.id]
         const failedRequests = {}
+
         for (const e of errors) {
           const { error: err, req } = e
           for (const each of cdsService._handlers._error) each.handler.call(cdsService, err, req)
@@ -208,7 +195,26 @@ class OData {
           const { error, statusCode } = normalizeError(err, req)
           failedRequests[requestId] = Object.assign(error, { statusCode })
         }
+
         done(new Error(`Atomicity group "${odataContext.id}" failed`), { failedRequests })
+        return
+      }
+
+      try {
+        await tx.commit(odataContext.applicationData.results[odataContext.id])
+        done()
+      } catch (e) {
+        // tx gets rolled back automatically
+        // set error on each request of changeset, if commit failed
+        const changesetResults = odataContext.applicationData.results[odataContext.id]
+        const failedRequests = changesetResults.reduce((obj, resultEntry) => {
+          const requestId = resultEntry.req._.odataReq.getOdataRequestId()
+          const { error, statusCode } = normalizeError(e, resultEntry.req)
+          obj[requestId] = Object.assign(error, { statusCode })
+          return obj
+        }, {})
+
+        done(e, { failedRequests })
       }
     })
 
@@ -233,37 +239,33 @@ class OData {
   /**
    * Process request.
    *
-   * @param req
-   * @param res
+   * @param {http.IncomingMessage} req
+   * @param {http.ServerResponse} res
    * @private
    */
   // REVISIT: Remove this when we replaced Okra
   process(req, res) {
+    const headers = req.headers
+    const acceptHeader = headers && headers.accept
+
     // default to combination [...];IEEE754Compatible=true;ExponentialDecimals=true if one is omitted
-    if (req.headers && req.headers.accept && req.headers.accept.startsWith('application/json')) {
-      if (
-        req.headers.accept.includes('IEEE754Compatible=true') &&
-        !req.headers.accept.includes('ExponentialDecimals')
-      ) {
+    if (acceptHeader && acceptHeader.startsWith('application/json')) {
+      if (acceptHeader.includes('IEEE754Compatible=true') && !acceptHeader.includes('ExponentialDecimals')) {
         req.headers.accept += ';ExponentialDecimals=true'
-      } else if (
-        req.headers.accept.includes('ExponentialDecimals=true') &&
-        !req.headers.accept.includes('IEEE754Compatible')
-      ) {
+      } else if (acceptHeader.includes('ExponentialDecimals=true') && !acceptHeader.includes('IEEE754Compatible')) {
         req.headers.accept += ';IEEE754Compatible=true'
       }
 
+      const contentType = headers['content-type']
+
       // add IEEE754Compatible=true if !strict_numbers
       if (
         !cds.env.features.strict_numbers &&
-        req.headers['content-type'] &&
-        req.headers['content-type'].includes('application/json') &&
-        !req.headers['content-type'].includes('IEEE754Compatible')
+        contentType &&
+        contentType.includes('application/json') &&
+        !contentType.includes('IEEE754Compatible')
       ) {
-        req.headers['content-type'] = req.headers['content-type'].replace(
-          'application/json',
-          'application/json;IEEE754Compatible=true'
-        )
+        req.headers['content-type'] = contentType.replace('application/json', 'application/json;IEEE754Compatible=true')
       }
     }
 

package/libx/_runtime/cds-services/adapter/odata-v4/ODataRequest.js

@@ -206,7 +206,7 @@ class ODataRequest extends cds.Request {
     })
 
     // req.attr
-    const attr = { identityZone: this.user.tenant }
+    const attr = { identityZone: this.tenant }
     Object.defineProperty(this, 'attr', {
       get() {
         if (!cds._deprecationWarningForAttr) {

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/create.js

@@ -9,7 +9,7 @@ const { getSapMessages } = require('../../../../common/error/frontend')
 const { validateResourcePath } = require('../utils/request')
 const { isReturnMinimal } = require('../utils/handlerUtils')
 const readAfterWrite = require('../utils/readAfterWrite')
-const { toODataResult, postProcess } = require('../utils/result')
+const { toODataResult, postProcess, postProcessMinimal } = require('../utils/result')
 const { mergeJson } = require('../../../services/utils/compareJson')
 
 /**
@@ -44,6 +44,8 @@ const create = service => {
         }
 
         postProcess(req, odataRes, service, result)
+      } else {
+        postProcessMinimal(req, result)
       }
 
       if (changeset) {

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/error.js

@@ -93,6 +93,11 @@ const getErrorHandler = (crashOnError = true, srv) => {
       req = odataReq.getIncomingRequest()
     }
 
+    if (err.getRootCause && typeof err.getRootCause === 'function') {
+      // > an OKRA error
+      err = _betterOkraError(err)
+    }
+
     // invoke srv.on('error', function (err, req) { ... }) here in special situations
     // REVISIT: if for compat reasons, remove once cds^5.1
     if (srv._handlers._error) {
@@ -107,11 +112,6 @@ const getErrorHandler = (crashOnError = true, srv) => {
       }
     }
 
-    if (err.getRootCause && typeof err.getRootCause === 'function') {
-      // > an OKRA error
-      err = _betterOkraError(err)
-    }
-
     // add content id if not generated by okra ("~...")
     const contentId = odataReq.getOdataRequestId()
     if (contentId && !contentId.match(/^~/)) err['@Core.ContentID'] = contentId

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/metadata.js

@@ -36,7 +36,7 @@ const metadata = service => {
     try {
       const req = odataReq.getIncomingRequest()
 
-      const tenant = req.user && req.user.tenant
+      const tenant = req.tenant
       // REVISIT: can we take locale from user, or is there some odata special wrt metadata?
       const locale = odataRes.getContract().getLocale()
 

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/read.js

@@ -1,6 +1,7 @@
 const cds = require('../../../../cds')
 const { SELECT } = cds.ql
 const ODataRequest = require('../ODataRequest')
+const { rewriteExpandAsterisk } = require('../../../../common/utils/rewriteAsterisks')
 
 const {
   QueryOptions,
@@ -78,7 +79,7 @@ const _getCount = async (tx, readReq) => {
 
   // Copy CQN including from and where and changing columns
   const select = SELECT.from(readReq.query.SELECT.from)
-  select.SELECT.columns = [{ func: 'count', args: [{ val: '1' }], as: '_counted_' }]
+  select.SELECT.columns = [{ func: 'count', args: [{ val: '1' }], as: '$count' }]
 
   if (readReq.query.SELECT.where) select.SELECT.where = readReq.query.SELECT.where
   if (readReq.query.SELECT.search) select.SELECT.search = readReq.query.SELECT.search
@@ -92,13 +93,13 @@ const _getCount = async (tx, readReq) => {
 
   // Define new CQN
   req.query = select
+  // todo check limit
+  const result = await tx.dispatch(req)
 
-  let result = await tx.dispatch(req)
+  const count = (result[0] && (result[0].$count || result[0]._counted_)) || 0
 
   // Transform into scalar result
-  result = result[0] && result[0]._counted_ ? result[0]._counted_ : 0
-
-  return toODataResult(result)
+  return toODataResult(count)
 }
 
 /**
@@ -318,6 +319,7 @@ const _readStream = async (tx, req, segments) => {
   if (
     headers &&
     headers.accept &&
+    contentType &&
     !headers.accept.includes('*/*') &&
     !headers.accept.includes(contentType) &&
     !headers.accept.includes(contentType.split('/')[0] + '/*')
@@ -327,7 +329,7 @@ const _readStream = async (tx, req, segments) => {
 
   if (contentType) streamObj['*@odata.mediaContentType'] = contentType
   if (contentDisposition) {
-    req._.odataRes.setHeader('Content-Disposition', `attachment; filename="${contentDisposition}"`)
+    req._.odataRes.setHeader('Content-Disposition', `attachment; filename="${encodeURIComponent(contentDisposition)}"`)
   }
   return streamObj
 }
@@ -381,6 +383,7 @@ const _readAndTransform = (tx, req, odataReq) => {
         break
       }
     }
+
     return _readStream(tx, req, segments)
   }
 
@@ -431,11 +434,13 @@ const _getTarget = (ref, target, definitions) => {
 }
 
 const _getRestrictedExpand = (columns, target, definitions) => {
-  if (!columns || !target) return
+  if (!columns || !target || columns === '*') return
 
   const annotation = target['@Capabilities.ExpandRestrictions.NonExpandableProperties']
   const restrictions = annotation && annotation.map(element => element['='])
 
+  rewriteExpandAsterisk(columns, target)
+
   for (const col of columns) {
     if (col.expand) {
       if (restrictions && restrictions.length !== 0) {
@@ -473,6 +478,7 @@ const read = service => {
       return next(e)
     }
 
+    // REVISIT: this should be in common/generic/auth.js with the rest of the access control stuff
     const restricted = _getRestrictedExpand(
       req.query.SELECT && req.query.SELECT.columns,
       req.target,

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/update.js

@@ -9,12 +9,18 @@ const {
 const { getSapMessages } = require('../../../../common/error/frontend')
 const { validateResourcePath } = require('../utils/request')
 const { isReturnMinimal } = require('../utils/handlerUtils')
-const { foreignKeyPropagations } = require('../../../../common/utils/foreignKeyPropagations')
 const readAfterWrite = require('../utils/readAfterWrite')
-const { toODataResult, postProcess } = require('../utils/result')
+const { toODataResult, postProcess, postProcessMinimal } = require('../utils/result')
 const { hasOmitValuesPreference } = require('../utils/omitValues')
 const { mergeJson } = require('../../../services/utils/compareJson')
 
+/*
+const { isStreaming } = require('../utils/stream')
+const { findCsnTargetFor } = require('../../../../common/utils/csn')
+const { isActiveEntityRequested, removeIsActiveEntityRecursively } = require('../../../../fiori/utils/where')
+const { ensureDraftsSuffix } = require('../../../../fiori/utils/handler')
+*/
+
 const _isUpsertAllowed = target => {
   return !(cds.env.runtime && cds.env.runtime.allow_upsert === false) && !(target && target._isDraftEnabled)
 }
@@ -36,53 +42,41 @@ const _infoForeignKeyInParent = (req, odataReq, odataRes, tx) => {
   }
 
   const navID = typeof nav === 'string' ? nav : nav.id
-  const elementNav = tx.model.definitions[parent].elements[navID]
+  const navElement = tx.model.definitions[parent].elements[navID]
 
   // not a containment
-  if (!elementNav['@odata.contained']) {
+  if (!navElement['@odata.contained']) {
     return info
   }
 
   const where = req.query.INSERT.into.ref[0].where
-  return { parent, nav, where }
-}
-
-const _getParentKey = (parentKeyObj, parentKey, childKey, req) => {
-  let parentKeyVal, parentUpdateRequired
-
-  if (parentKeyObj.length !== 0 && parentKeyObj[0][parentKey] !== null) {
-    parentKeyVal = parentKeyObj[0][parentKey]
-  } else if (req.target.keys[childKey].type === 'cds.UUID') {
-    parentUpdateRequired = true
-    parentKeyVal = cds.utils.uuid()
-  } else {
-    throw new Error('Only keys of type UUID can be generated: ' + childKey)
-  }
-
-  return { parentKeyVal, parentUpdateRequired }
+  return { parent, navElement, where }
 }
 
 const _create = async (req, odataReq, odataRes, tx) => {
   let result
 
-  const { parent, nav, where } = _infoForeignKeyInParent(req, odataReq, odataRes, tx)
-  if (parent && nav && where) {
-    const onKeys = foreignKeyPropagations(tx.model.definitions[parent].elements[nav])
-    const parentKeys = onKeys.map(key => key.parentFieldName)
+  const { parent, navElement, where } = _infoForeignKeyInParent(req, odataReq, odataRes, tx)
+  if (parent && navElement && where) {
+    const onKeys = navElement._foreignKeys
+    const parentKeys = onKeys.filter(key => key.parentElement).map(key => key.parentElement.name)
     const parentKeyObj = await tx.run(SELECT.from(parent).columns(parentKeys).where(where))
 
     const parentUpdateObj = {}
     onKeys.forEach(key => {
-      const { parentKeyVal, parentUpdateRequired } = _getParentKey(
-        parentKeyObj,
-        key.parentFieldName,
-        key.childFieldName,
-        req
-      )
-      odataReq.getBody()[key.childFieldName] = parentKeyVal
+      let parentKeyVal, parentUpdateRequired
+      if (parentKeyObj.length !== 0 && parentKeyObj[0][key.parentElement.name] !== null) {
+        parentKeyVal = parentKeyObj[0][key.parentElement.name]
+      } else if (key.childElement.type === 'cds.UUID' && key.childElement.key) {
+        parentUpdateRequired = true
+        parentKeyVal = cds.utils.uuid()
+      } else {
+        throw new Error('Only keys of type UUID can be generated: ' + key.childFieldName)
+      }
+      odataReq.getBody()[key.childElement.name] = parentKeyVal
 
       if (parentUpdateRequired) {
-        parentUpdateObj[key.parentFieldName] = parentKeyVal
+        parentUpdateObj[key.parentElement.name] = parentKeyVal
       }
     })
 
@@ -107,7 +101,7 @@ const _updateThenCreate = async (req, odataReq, odataRes, tx) => {
   try {
     result = await tx.dispatch(req)
   } catch (e) {
-    if (e.code === 404 && _isUpsertAllowed(req.target)) {
+    if ((e.code === 404 || e.status === 404 || e.statusCode === 404) && _isUpsertAllowed(req.target)) {
       // REVISIT: remove error (and child?) from tx.context? -> would require a unique req.id
       ;[result, req] = await _create(req, odataReq, odataRes, tx)
     } else {
@@ -127,6 +121,58 @@ const _readAfterWriteAndVirtuals = async (req, service, result) => {
 const _shouldReadPreviousResult = req =>
   req.event === 'UPDATE' && !isReturnMinimal(req) && hasOmitValuesPreference(req.headers.prefer, 'defaults')
 
+/*
+const _getEntity = (segments, model) => {
+  let entityName, namespace
+  const previous = segments[segments.length - 2]
+  if (previous.getKind() === 'ENTITY') {
+    entityName = previous.getEntitySet().getName()
+    namespace = previous.getEdmType().getFullQualifiedName().namespace
+  } else if (previous.getKind() === 'NAVIGATION.TO.ONE') {
+    entityName = previous.getTarget().getName()
+    namespace = previous.getTarget().getEntityType().getFullQualifiedName().namespace
+  }
+
+  if (entityName) {
+    return findCsnTargetFor(entityName, model, namespace)
+  }
+}
+
+const _getMediaType = entity => {
+  if (entity._hasPersistenceSkip) return
+
+  return Object.values(entity.elements).find(ele => ele['@Core.IsMediaType'])
+}
+
+const _getMediaTypeCQN = (mediaType, contentType, entity, req) => {
+  const where = req.query.UPDATE.entity.ref[0].where
+  const isActive = isActiveEntityRequested(where)
+  const data = {}
+  data[mediaType.name] = contentType
+  const cqn = UPDATE(entity).set(data)
+  cqn.UPDATE.where = removeIsActiveEntityRecursively(where)
+  if (!isActive) {
+    cqn.UPDATE.entity = ensureDraftsSuffix(entity.name)
+  }
+
+  return cqn
+}
+
+const _handleMediaType = async (odataReq, model, tx, req) => {
+  const segments = odataReq.getUriInfo().getPathSegments()
+  const contentType = odataReq._inRequest.headers['content-type']
+  if (isStreaming(segments) && contentType) {
+    const entity = _getEntity(segments, model)
+    if (entity && !entity['@cds.persistence.skip']) {
+      const mediaType = _getMediaType(entity)
+      if (mediaType) {
+        await tx.run(_getMediaTypeCQN(mediaType, contentType, entity, req))
+      }
+    }
+  }
+}
+*/
+
 /**
  * The handler that will be registered with odata-v4.
  *
@@ -155,8 +201,10 @@ const update = service => {
 
     let result, err, commit
     try {
-      let previousResult
+      // // REVISIT: should be handled somewhere else
+      // await _handleMediaType(odataReq, service.model, tx, req)
 
+      let previousResult
       if (_shouldReadPreviousResult(req)) {
         previousResult = await _readAfterWriteAndVirtuals(req, service, result)
       }
@@ -171,6 +219,8 @@ const update = service => {
         }
 
         postProcess(req, odataRes, service, result, previousResult)
+      } else {
+        postProcessMinimal(req, result)
       }
 
       if (changeset) {

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/ExpressionToCQN.js

@@ -42,10 +42,16 @@ class ExpressionToCQN {
       case EdmPrimitiveTypeKind.Double:
         return { val: parseFloat(value) }
       case EdmPrimitiveTypeKind.DateTimeOffset: {
-        let val = new Date(value).toISOString()
-        // cut off ms if cds.DateTime
-        if (expression._cdsType === 'cds.DateTime') val = val.replace(/\.\d\d\dZ$/, 'Z')
-        return { val }
+        try {
+          let val = new Date(value).toISOString()
+          // cut off ms if cds.DateTime
+          if (expression._cdsType === 'cds.DateTime') val = val.replace(/\.\d\d\dZ$/, 'Z')
+          return { val }
+        } catch (e) {
+          throw Object.assign(new Error(`The type 'Edm.DateTimeOffset' is not compatible with '${value}'`), {
+            status: 400
+          })
+        }
       }
       default:
         return { val: value }

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/applyToCQN.js

@@ -195,17 +195,23 @@ const applyToCQN = (transformations, entity, model) => {
           _handleTransformation(transformation, entity, res)
         }
         for (const item of transformation.getGroupByItems()) {
-          if (item.getPathSegments()[0].getKind() === 'COMPLEX.PROPERTY') {
+          const pathSegment = item.getPathSegments().length > 0 && item.getPathSegments()[0]
+          if (!pathSegment) {
+            throw getFeatureNotSupportedError(
+              'Transformation "groupby" with query option $apply does not support this request'
+            )
+          }
+          if (pathSegment.getKind() === 'COMPLEX.PROPERTY') {
             throw getFeatureNotSupportedError(
               'Transformation "groupby" with query option $apply does not support complex properties'
             )
             // TODO support annotations Groupable
             // Odata spec: http://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/cs01/odata-data-aggregation-ext-v4.0-cs01.html#_Toc378326318
             // res.groupBy.push(_complexProperty(item.getPathSegments()))
-          } else if (item.getPathSegments()[0].getProperty()) {
+          } else if (pathSegment.getProperty()) {
             const name = item.getPathSegments()[0].getProperty().getName()
             res.groupBy.push(name)
-          } else if (item.getPathSegments()[0].getNavigationProperty()) {
+          } else if (pathSegment.getNavigationProperty()) {
             res.groupBy.push(_createNavGroupBy(item.getPathSegments()))
           }
         }

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/expandToCQN.js

@@ -98,7 +98,7 @@ const _getInnerSelect = expandItem => {
  * @returns {Array}
  * @private
  */
-const _getSelectedElements = (expandItem, targetType, relatedEntity) => {
+const _getSelectedElements = (expandItem, targetType, relatedEntity, options) => {
   if (cds.env.effective.odata.proxies || cds.env.effective.odata.xrefs) {
     // proxy target?
     let proxy = true
@@ -113,7 +113,9 @@ const _getSelectedElements = (expandItem, targetType, relatedEntity) => {
   let innerSelectItems = _getInnerSelect(expandItem)
 
   if (innerSelectItems.length === 0 || innerSelectItems.some(item => item.isAll())) {
-    return _getColumnsFromTargetType(targetType, relatedEntity, true)
+    // REVISIT: Remove once we clean up our draft handling
+    if (options && options.rewriteAsterisks) return _getColumnsFromTargetType(targetType, relatedEntity, true)
+    return ['*']
   }
 
   // remove navigations from select clause
@@ -166,7 +168,7 @@ const _filter = (item, expression) => {
   item.where = SELECT.from('a').where(expressionToCQN.parse(expression)).SELECT.where
 }
 
-const _getItemCQN = (model, name, navigationProperty, expandItem) => {
+const _getItemCQN = (model, name, navigationProperty, expandItem, options) => {
   _notSupported(expandItem)
 
   const targetType = navigationProperty.getEntityType()
@@ -176,7 +178,7 @@ const _getItemCQN = (model, name, navigationProperty, expandItem) => {
   const relatedEntity = findCsnTargetFor(entityName, model, namespace)
   const item = {
     ref: name, // ['structured', 'nested_', nestedAssocToOne] if expand on structured
-    expand: _getSelectedElements(expandItem, targetType, relatedEntity)
+    expand: _getSelectedElements(expandItem, targetType, relatedEntity, options)
   }
 
   item.expand.push(..._getInnerExpandItems(model, expandItem, targetType))
@@ -222,7 +224,7 @@ const _name = expandItem =>
  * @param type
  * @returns {Array}
  */
-const expandToCQN = (model, expandItems, type) => {
+const expandToCQN = (model, expandItems, type, options) => {
   const allElements = []
   const isAll = expandItems.some(item => item.isAll())
 
@@ -230,7 +232,7 @@ const expandToCQN = (model, expandItems, type) => {
     const expandItem = _getExpandItem(isAll, expandItems, name)
 
     if (isAll || expandItem) {
-      allElements.push(_getItemCQN(model, [name], navigationProperty, expandItem))
+      allElements.push(_getItemCQN(model, [name], navigationProperty, expandItem, options))
     }
   }
 

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/index.js

@@ -1,7 +1,5 @@
 const cds = require('../../../../cds')
 
-const { _newReadToCQN } = require('../../../../odata/readToCqn')
-
 const {
   Components: { DATA_CREATE_HANDLER, DATA_DELETE_HANDLER, DATA_READ_HANDLER, DATA_UPDATE_HANDLER }
 } = require('../okra/odata-server')
@@ -32,7 +30,7 @@ module.exports = (component, service, target, data, odataReq, upsert) => {
     case DATA_DELETE_HANDLER:
       return deleteToCQN(service, odataReq)
     case DATA_READ_HANDLER:
-      return odata2cqn ? _newReadToCQN(service, target, odataReq) : readToCQN(service, target, odataReq)
+      return odata2cqn ? cds.odata.parse(odataReq, { service }) : readToCQN(service, target, odataReq)
     case DATA_UPDATE_HANDLER:
       return updateToCQN(service, data, odataReq)
     case 'BOUND.ACTION':

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/readToCQN.js

@@ -2,9 +2,8 @@ const cds = require('../../../../cds')
 const { SELECT } = cds.ql
 
 const QueryOptions = require('../okra/odata-server').QueryOptions
-const { getColumns } = require('../../../services/utils/columns')
 const { isNavigation, isPathSupported } = require('./selectHelper')
-const { isViewWithParams, validationQuery } = require('./selectHelper')
+const { isViewWithParams, getValidationQuery } = require('./selectHelper')
 const { ensureUnlocalized } = require('../../../../fiori/utils/handler')
 const ExpressionToCQN = require('./ExpressionToCQN')
 const orderByToCQN = require('./orderByToCQN')
@@ -16,6 +15,7 @@ const { resolveStructuredName } = require('../utils/handlerUtils')
 const { isStreaming } = require('../utils/stream')
 const { convertUrlPathToCqn, getAllKeys } = require('./utils')
 const { getMaxPageSize } = require('../../../../common/utils/page')
+const { isAsteriskColumn } = require('../../../../common/utils/rewriteAsterisks')
 
 const {
   COUNT,
@@ -200,8 +200,10 @@ const _cleanupForApply = (apply, cqn) => {
     const selectColumns = cqn.SELECT.columns.map(c => c.as || (c.ref && c.ref[c.ref.length - 1]))
     if (cqn.SELECT.orderBy) {
       // include path expressions
-      const newOrderBy = cqn.SELECT.orderBy.filter(o => _containsSelectedColumn(o, selectColumns))
-      cqn.SELECT.orderBy = newOrderBy
+      if (!cqn.SELECT.columns.some(c => isAsteriskColumn(c))) {
+        const newOrderBy = cqn.SELECT.orderBy.filter(o => _containsSelectedColumn(o, selectColumns))
+        cqn.SELECT.orderBy = newOrderBy
+      }
     }
 
     if (!cqn.SELECT.orderBy || !cqn.SELECT.orderBy.length) {
@@ -229,16 +231,16 @@ const _checkViewWithParamCall = (isView, segments, kind, name) => {
   }
 }
 
-const enhanceCqnForNavigation = (segments, isView, cqn, service, SELECT, kind) => {
+const addValidationQueryIfRequired = (segments, isView, cqn, service, kind) => {
   if (isNavigation(segments) && !isView && (kind === NAVIGATION_TO_MANY || kind === NAVIGATION_TO_ONE)) {
-    cqn._validationQuery = validationQuery(segments, service.model, SELECT)
+    cqn._validationQuery = getValidationQuery(cqn.SELECT.from.ref, service.model)
     cqn._validationQuery.__navToManyWithKeys =
       kind === NAVIGATION_TO_ONE && segments[segments.length - 1].getKeyPredicates().length !== 0
   }
 }
 
 const _addKeysToSelectIfNoStreaming = (entity, select, streaming) => {
-  // might also be signleton w/o keys
+  // might also be singleton w/o keys
   if (!streaming && entity.keys) {
     for (const k of Object.values(entity.keys)) {
       // REVISIT: !select.includes(k.name) needed?
@@ -370,9 +372,7 @@ const readToCQN = (service, target, odataReq) => {
   }
 
   if (select.length === 0) {
-    select.push(
-      ...getColumns(entity, { onlyNames: true, removeIgnore: true, filterDraft: false }).map(col => ({ ref: [col] }))
-    )
+    select.push('*')
   }
 
   if (expand.length) {
@@ -388,7 +388,7 @@ const readToCQN = (service, target, odataReq) => {
 
   // keep target as input because of localized view
   const cqn = SELECT.from(isView ? _convertUrlPathToViewCqn(segments) : convertUrlPathToCqn(segments, service), select)
-  enhanceCqnForNavigation(segments, isView, cqn, service, SELECT, kind)
+  addValidationQueryIfRequired(segments, isView, cqn, service, kind)
 
   if (Object.keys(apply).length) {
     _extendCqnWithApply(cqn, apply, entity)
@@ -409,6 +409,8 @@ const readToCQN = (service, target, odataReq) => {
   }
 
   _cleanupForApply(apply, cqn)
+  // just like in new parser
+  if (cqn.SELECT.columns.length === 1 && cqn.SELECT.columns[0] === '*') delete cqn.SELECT.columns
   return cqn
 }