@sap/cds 6.3.1 → 6.4.0

package/lib/dbs/cds-deploy.js

@@ -1,4 +1,4 @@
-const cds = require('../index'), { local, inspect } = cds.utils
+const cds = require('../index'), { local, inspect } = cds.utils, { UPSERT } = cds.ql
 const DEBUG = cds.debug('deploy')
 
 const colors = !!process.stdout.isTTY && !!process.stderr.isTTY
@@ -14,7 +14,7 @@ const term = {
  * deploy create tables and views in case of a SQL database, then fills
  * in initial data, if present.
  */
-exports = module.exports = function cds_deploy (model,options) { return {
+exports = module.exports = function cds_deploy (model,options,csvs) { return {
 
   /** @param {cds.Service} db */
   async to (db, o = options || cds.options || {}) {
@@ -40,10 +40,10 @@ exports = module.exports = function cds_deploy (model,options) { return {
 
     // create tables & views...
     const any = await exports.create (db,model,o)
-    if (!any) return db
+    if (!any && !csvs) return db
 
     // fill in initial data...
-    await exports.init (db,model, file => LOG(
+    await exports.init (db,model,o,csvs, file => LOG(
       term.info(` > init from ${local(file)}`)
     ))
 
@@ -105,55 +105,113 @@ exports.exclude_external_entities_in = function (csn) { // NOSONAR
   }
 }
 
-
-exports.create = async function (db, csn=db.model, o) {
-  if (!db.deploy || o.lean) {
-    const creates = cds.compile.to.sql (csn,o); if (!creates || creates.length === 0) return
-    const drops = creates.map (each => {
+function getSqls(db, csn, o, beforeCsn) {
+  const schemaEvo = (db.options?.schema_evolution === 'auto' || o.schema_evolution === 'auto')
+  const creds = db.options?.credentials 
+  const in_memory = (creds?.url || creds?.database) === ':memory:';
+  if (!in_memory && schemaEvo) {
+    const { afterImage: afterCsn, drops, createsAndAlters: creas } = cds.compile.to.sql.delta (csn, o, beforeCsn);
+    if(beforeCsn === undefined) {
+      // If this is the first deployment done with automatic schema evolution, generate everything as if it was a drop create
+      // but set the afterCsn in the db so we can calculate a delta going forward
+      return { afterCsn, drops: creas.map (each => {
+        let [, kind, entity] = each.match(/^CREATE (TABLE|VIEW) "?([^\s"(]+)/im) || []
+        return `DROP ${kind} IF EXISTS ${entity};`
+      }).reverse(), creas };
+    }
+    return { afterCsn, drops, creas };
+  } else {
+    const creas = cds.compile.to.sql(csn, o);
+    const drops = creas.map (each => {
       let [, kind, entity] = each.match(/^CREATE (TABLE|VIEW) "?([^\s"(]+)/im) || []
       return `DROP ${kind} IF EXISTS ${entity};`
-    }).reverse()
-    if (o.dry) {
-      console.log(); for (let each of drops) console.log(each)
-      console.log(); for (let each of creates) console.log(each,'\n')
-      return
-    } else return db.run (async tx => {
-      await tx.run(drops)
-      await tx.run(creates)
-      return true
-    })
+    }).reverse();
+    return { afterCsn: {}, drops, creas };
   }
-  else return db.deploy (csn,o)
 }
 
+exports.create = async function (db, csn=db.model, o) {
+  const schemaEvo = (db.options?.schema_evolution === 'auto' || o.schema_evolution === 'auto')
+  if(db.deploy && !schemaEvo) {
+    // reset CSN state saved in db - if there is any
+    await db.run('DROP table if exists cds_Model;');
+    return db.deploy(csn, o);
+  }
 
-exports.init = (db, csn=db.model, log=()=>{}) => db.run (async tx => {
+  const in_memory = db.options?.credentials?.url === ':memory:';
+  let beforeCsn
+  if (!in_memory && schemaEvo) try {
+    const [{ csn }] = await db.read('cds.Model')
+    beforeCsn = JSON.parse(csn);
+  } catch(e) {
+    if (e.message.includes('no such table: cds_Model')) {
+      await db.run('CREATE table cds_Model ( csn CLOB )')
+      await db.insert({csn:''}).into('cds.Model')
+    }
+  }
+
+  const { afterCsn, drops, creas } = getSqls(db, csn, o, beforeCsn);
+
+  if (!creas || creas.length === 0) return
+  if (o.dry) {
+    console.log(); for (let each of drops) console.log(each,'\n')
+    console.log(); for (let each of creas) console.log(each,'\n')
+    return
+  } else return db.run (async tx => {
+    await tx.run(drops)
+    await tx.run(creas)
+    if (!in_memory && schemaEvo) {
+      await tx.update('cds.Model').with({ csn: JSON.stringify(afterCsn) })
+    }
+    return true
+  })
+}
+
+
+exports.init = (db, csn=db.model, o, csvs, log=()=>{}) => db.run (async tx => {
   const resources = await exports.resources(csn, {testdata: cds.env.features.test_data})
   const inits=[]
-  for (let [file,e] of Object.entries(resources)) {
-    if (e === '*') { // init.js/ts
-      let x = await cds.utils._import(file);  if (!x) continue
-      if (x.default)  x = x.default  // default ESM export
-      inits.push (!x.then && typeof x === 'function' ? x(db,csn) : x)
-      log (file)
-    } else { // from .csv or .json
-      const INSERT_into = _from_csv_or_json [path.extname(file)]
-      const src = await read(file,'utf8'); if (!src) continue
-      const q = INSERT_into (e,src); if (!q) continue
+  const schemaEvo = (db.options?.schema_evolution === 'auto' || o?.schema_evolution === 'auto')
+
+
+  if (csvs) {
+    const ccsn = cds.compile.for['nodejs'](csn) // compile to calculate keys for newly added entities
+    for(let [e,src] of Object.entries(csvs)) {
+      const q = INSERT_from_csv (e,src,schemaEvo); if (!q) continue
       if (db.kind === 'better-sqlite') _add_missing_pks2(q)
-      log (file,e)
+      q._target = ccsn.definitions[e]
       inits.push (tx.run(q) .catch (e => {
         throw Object.assign (e, { message: 'in cds.deploy(): ' + e.message +'\n'+ inspect(q) })
       }))
     }
+  } else {
+    for (let [file,e] of Object.entries(resources)) {
+      if (e === '*') { // init.js/ts
+        let x = await cds.utils._import(file);  if (!x) continue
+        if (x.default)  x = x.default  // default ESM export
+        inits.push (!x.then && typeof x === 'function' ? x(db,csn) : x)
+        log (file)
+      } else { // from .csv or .json
+        const INSERT_into = _from_csv_or_json [path.extname(file)]
+        const src = await read(file,'utf8'); if (!src) continue
+        const q = INSERT_into (e,src,schemaEvo); if (!q) continue
+        if (db.kind === 'better-sqlite') _add_missing_pks2(q)
+        if (cds.requires['cds.xt.ModelProviderService']?.kind === 'in-sidecar') q._target = csn.definitions[e]
+        log (file,e)
+        inits.push (tx.run(q) .catch (e => {
+          throw Object.assign (e, { message: 'in cds.deploy(): ' + e.message +'\n'+ inspect(q) })
+        }))
+      }
+    }
   }
+
   await Promise.all (inits)
 
   function _add_missing_pks2 (q) {
-    const {columns,rows} = q.INSERT // REVISIT: .entries are covered by current runtime. Should eventually also be handled here, as we likely don't do so in new db services
+    const {columns,rows} =  q.UPSERT || q.INSERT // REVISIT: .entries are covered by current runtime. Should eventually also be handled here, as we likely don't do so in new db services
     if (columns) {
       const entity = csn.definitions[q._target.name], {uuid} = cds.utils
-      for (let k in entity.keys) if (!columns.includes(k)) {
+      for (let k in entity.keys) if (!columns.includes(k) && !entity.keys[k].isAssociation) {
         columns.push(k)
         const t = entity.keys[k]._type, pk = t === 'cds.UUID' ? uuid : index => index+1
         rows.forEach ((row,index) => row.push(pk(index)))
@@ -216,7 +274,7 @@ const _entity4 = (file,csn) => {
   if (!entity) {
     if (/(.+)[._]texts_?/.test(name)) { // 'Books.texts', 'Books.texts_de'
       const base = csn.definitions [RegExp.$1]
-      return base && _entity4 (base.elements.texts.target,csn)
+      return base?.elements?.texts && _entity4 (base.elements.texts.target, csn)
     }
     else return DEBUG && DEBUG (`warning: ${name} not in model`)
   }
@@ -228,16 +286,14 @@ const _entity4 = (file,csn) => {
   return entity.name ? entity : { name, __proto__:entity }
 }
 
-const INSERT_from_csv = (entity, csv) => {
+const INSERT_from_csv = (entity, csv, schemaEvo) => {
   let [ cols, ...rows ] = cds.parse.csv (csv)
-  if (rows.length > 0) return INSERT.into (entity) .columns (cols) .rows (rows)
-  // if (rows.length > 0) return UPSERT.into (entity) .columns (cols) .rows (rows)
+  if (rows.length > 0) return (schemaEvo ? UPSERT : INSERT).into (entity) .columns (cols) .rows (rows)
 }
 
-const INSERT_from_json = (entity, json) => {
+const INSERT_from_json = (entity, json, schemaEvo) => {
   let records = JSON.parse (json)
-  if (records.length > 0) return INSERT.into (entity) .entries (records)
-  // if (records.length > 0) return UPSERT.into (entity) .entries (records)
+  if (records.length > 0) return (schemaEvo ? UPSERT : INSERT).into (entity) .entries (records)
 }
 
 const _from_csv_or_json = { '.json': INSERT_from_json, '.csv': INSERT_from_csv, }

package/lib/env/cds-env.js

@@ -64,19 +64,16 @@ class Config {
       }
     }
 
-    // 4. link dependent services (through kind/use)
-    this._link_required_services()
-
-    // 5. add process env
+    // 4. add process env before linking to allow things like CDS_requires_db=sql
     this._add_process_env(_context, _home)
 
-    // 6. link dependent services again -> e.g. to allow things like CDS_requires_db=sql
+    // 5. link dependent services
     this._link_required_services()
 
-    // 7. complete service configurations from cloud service bindings
+    // 6. complete service configurations from cloud service bindings
     this._add_cloud_service_bindings(process.env)
 
-    // 8. Add compatibility for mtx
+    // 7. Add compatibility for mtx
     if (this.requires && this.requires.db) {
       if (this.requires.multitenancy !== undefined) {
         Object.defineProperty(this.requires.db, 'multiTenant', { value: !!this.requires.multitenancy })
@@ -84,7 +81,7 @@ class Config {
       else if (this.requires.db.multiTenant !== undefined) this.requires.multitenancy = this.requires.db.multiTenant
     }
 
-    // 9. apply presets
+    // 8. apply presets
     presets (this)
 
     // Only if feature is enabled
@@ -230,10 +227,12 @@ class Config {
     if (!config) config = {}
     const pref_ = RegExp('^'+prefix+'[._]','i')
     for (let p in env) if (!(p in my) && pref_.test(p)) {
-      const key = /[a-z]/.test(p) ? p : p.toLowerCase() //> CDS_FOO_BAR -> cds_foo_bar
-      const path = key.slice(prefix.length+1) .split (key[prefix.length]) //> ['foo','bar']
+      const pEsc = p.replace(/__/g, '!!') // escaping of _ by __ :  protect __ so that it's not split below
+      const key = /[a-z]/.test(pEsc) ? pEsc : pEsc.toLowerCase() //> CDS_FOO_BAR -> cds_foo_bar
+      let path = key.slice(prefix.length+1) .split (key[prefix.length]) //> ['foo','bar']
       for (var o=config,next;;) {
         next = path.shift()
+        next = next.replace(/!!/g, '_')  // undo !! protection and reduce __ to _
         if (!path.length) break
         if (!path[0]) next = next+'-'+path.shift()+path.shift() // foo__bar -> foo-bar
         o = o[next] || (o[next] = {})

package/lib/env/cds-requires.js

@@ -7,6 +7,10 @@ exports = module.exports = {
     middlewares: true
   },
 
+  "[schevo]": {
+    db: { schema_evolution: 'auto' },
+  },
+
   db: undefined,
   messaging: undefined,
   multitenancy: undefined,
@@ -251,8 +255,10 @@ require = (id) => { // eslint-disable-line no-global-assign
 }
 
 // REVISIT: we should have a real modular plugin technique for cds.env
-// eslint-disable-next-line cds/no-missing-dependencies
-const _mtxs = !process.env.OLD_MTX && require('@sap/cds-mtxs/lib/env-requires') || {
+const utils = require ('../utils/cds-utils')
+const _mtxs = !utils._oldMtx()
+  // eslint-disable-next-line cds/no-missing-dependencies
+  && require('@sap/cds-mtxs/lib/env-requires') || {
   "toggles": {
     model: "@sap/cds/srv/mtx"
   },

package/lib/env/defaults.js

@@ -12,10 +12,6 @@ module.exports = {
   },
 
   features: {
-    "[schevo]": {
-      schema_evolution: true,
-    },
-    schema_evolution: false,
     folders: 'fts/*', // where to find feature toggles -> switch on by default when released
     cls: major > 12 || major == 12 && minor >= 18,
     live_reload: !production,

package/lib/env/schemas/cds-rc.json

@@ -237,6 +237,10 @@
             }
           ]
         },
+        "middlewares": {
+          "type": "boolean",
+          "description": "Enables new middlewares support (experimental)."
+        },
         "multitenancy": {
           "type": "boolean",
           "description": "Shortcut to enable multitenancy."
@@ -360,6 +364,40 @@
           ]
         }
       }
+    },
+    "protocols": {
+      "type": "object",
+      "description": "List protocols to enable in addition to the default protocol adaptors.",
+      "additionalProperties": true,
+      "patternProperties": {
+        ".+": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "description": "Enables a built-in protocol adapter with defaults"
+            },
+            {
+              "type": "string",
+              "description": "The endpoint to serve this protocol at."
+            },
+            {
+              "type": "object",
+              "default": {},
+              "additionalProperties": true,
+              "properties": {
+                "path": {
+                  "type": "string",
+                  "description": "The endpoint to serve this protocol at."
+                },
+                "impl": {
+                  "type": "string",
+                  "description": "The module pathname of the protocol adapter implementation."
+                }
+              }
+            }
+          ]
+        }
+      }
     }
   },
   "$defs": {

package/lib/ql/SELECT.js

@@ -6,16 +6,22 @@ module.exports = class Query extends Whereable {
   static _api() {
     const $ = Object.assign
     return $((..._)       => new this()._select_or_from(..._), {
-      one: $((...x)       => new this({one:true})._select_or_from(...x),{
-        columns: (..._)   => new this({one:true}).columns(..._),
-        from: (..._)      => new this({one:true}).from(..._),
+      localized: $((...x) => new this({localized:true})._select_or_from(...x),{
+        columns: (..._)   => new this({localized:true}).columns(..._),
+        from: (..._)      => new this({localized:true}).from(..._),
       }),
       distinct: $((...x)  => new this({distinct:true})._select_or_from(...x),{
         columns: (..._)   => new this({distinct:true}).columns(..._),
         from: (..._)      => new this({distinct:true}).from(..._),
       }),
+      one: $((...x)       => new this({one:true})._select_or_from(...x),{
+        columns: (..._)   => new this({one:true}).columns(..._),
+        from: (..._)      => new this({one:true}).from(..._),
+      }),
+      from: $((..._)      => new this().from(..._), {
+        localized: (..._) => new this({localized:true}).from(..._)
+      }),
       columns: (..._)     => new this().columns(..._),
-      from: (..._)        => new this().from(..._),
     })
   }
 

package/lib/srv/bindings.js

@@ -12,7 +12,7 @@ module.exports = class Bindings {
     static get registry(){ return registry }
 
     static then(r,e) {
-        const LOG = cds.log('serve', { prefix:'cds' })
+        const LOG = cds.log('cds.serve', { prefix:'cds' })
         const bindings = new Bindings
         cds.prependOnceListener ('connect', ()=> LOG._info && LOG.info ('connect using bindings from:', { registry }))
         cds.once('listening', ({url})=> bindings.export (cds.service.providers, url))

package/lib/srv/factory.js

@@ -1,6 +1,6 @@
 const cds = require('..'), { path, isfile } = cds.utils
 const paths = Array.from (new Set ([ cds.root, ...require.resolve.paths('x') ]))
-const DEBUG = cds.debug('srv.factory'); DEBUG && DEBUG ({ 'cds.root':cds.root, paths })
+const DEBUG = cds.debug('cds.service.factory',); DEBUG && DEBUG ({ 'cds.root':cds.root, paths })
 
 /** @typedef {import('./srv-api')} Service @type { (()=>Service) & (new()=>Service) } */
 const ServiceFactory = function (name, model, options) { //NOSONAR

package/lib/srv/protocols/index.js

@@ -10,7 +10,9 @@ class ProtocolAdapter {
     for (let [k,o] of Object.entries(protocols)) if (typeof o === 'string') protocols[k] = {path:o}
     if (!protocols.odata) protocols.odata = { impl: join(__dirname,'odata-v4') }
     if (!protocols.rest) protocols.rest = { impl: join(__dirname,'rest') }
-    return this.protocols = protocols
+    
+    // odata must always be first for fallback
+    return this.protocols = { odata: protocols.odata, ...protocols }
   }
 
   /**

package/lib/srv/srv-methods.js

@@ -1,5 +1,5 @@
 const cds = require('..')
-const LOG = cds.log('cds-app-service-methods')
+const LOG = cds.log('cds.serve',{label:'cds'})
 
 
 module.exports = (srv) => {

package/lib/utils/cds-utils.js

@@ -176,6 +176,17 @@ exports.find = function find (base, patterns='*', filter=()=>true) {
   return files
 }
 
+// TODO find a better place
+exports._oldMtx = function _oldMtx() {
+  function _hasMtxDependency() {
+    try {
+      return require(join(cds.root, 'package.json'))?.dependencies?.['@sap/cds-mtx']
+    } catch(e) {
+      return false
+    }
+  }
+  return (_hasMtxDependency() || process.env.OLD_MTX?.toLowerCase() === 'true') ?? false
+}
 
 /**
  * Internal utility to load a file through ESM or CommonJs.  TODO find a better place.

package/lib/utils/inflect.js

@@ -1,24 +1,25 @@
-const last = /\w+$/
 
-exports.singular4 = (dn,stripped) => {
+this.singular4 = (dn,stripped) => {
 	let n = dn.name || dn; if (stripped) n = n.match(last)[0]
 	return dn['@singular'] || (
-		/.*species|news$/i.test(n) ? n  :
-		/.*ess$/.test(n) ?  n :      							// Address
-		/.*ees$/.test(n) ? n.slice(0, -1) : 			// Employees --> Employee
-		/.*[sz]es$/.test(n) ?  n.slice(0, -2) :
-		/.*[^aeiou]ies$/.test(n) ? n.slice(0, -3) + 'y' :     // Deliveries --> Delivery
-		/.*s$/.test(n) ?  n.slice(0, -1) :
+		/species|news$/i.test(n) ? n  :
+		/ess$/.test(n) ? n :      							// Address
+		/ees$/.test(n) ? n.slice(0, -1) : 			// Employees --> Employee
+		/[sz]es$/.test(n) ?  n.slice(0, -2) :
+		/[^aeiou]ies$/.test(n) ? n.slice(0, -3) + 'y' :     // Deliveries --> Delivery
+		/s$/.test(n) ?  n.slice(0, -1) :
 		n
 	)
 }
 
-exports.plural4 = (dn,stripped) => {
+this.plural4 = (dn,stripped) => {
 	let n = dn.name || dn; if (stripped) n = n.match(last)[0]
 	return dn['@plural'] || (
-		/.*analysis|status|species|news$/i.test(n) ? n  :
-		/.*[^aeiou]y$/.test(n) ? n.slice(0,-1) + 'ies'  :
-		/.*(s|x|z|ch|sh)$/.test(n) ? n + 'es' :
+		/analysis|status|species|sheep|news$/i.test(n) ? n  :
+		/[^aeiou]y$/.test(n) ? n.slice(0,-1) + 'ies'  :
+		/(s|x|z|ch|sh)$/.test(n) ? n + 'es' :
 		n + 's'
 	)
 }
+
+const last = /\w+$/

package/lib/utils/tar.js

@@ -5,7 +5,7 @@ const spawn = /\btar\b/.test(process.env.DEBUG) ? (cmd, args, options) => {
   return child_process.spawn(cmd, args, options)
 } : child_process.spawn
 
-const cds = require('../index'), { fs, path, mkdirp } = cds.utils
+const cds = require('../index'), { fs, path, mkdirp, exists, rimraf } = cds.utils
 const _resolve = (...x) => path.resolve (cds.root,...x)
 
 // tar does not work properly on Windows (by npm/jest tests) w/o this change
@@ -15,6 +15,21 @@ const win = path => {
   if (Array.isArray(path)) return path.map(el => win(el))
 }
 
+// Copy files to temp dir on Windows and pack temp dir.
+// cli tar has a size limit on Windows.
+const createTemp = async (root, files) => {
+  const temp = await fs.promises.mkdtemp(`${fs.realpathSync(require('os').tmpdir())}${path.sep}tar-`)    
+  for (const file of files) {
+      const fname = path.relative(root, file)
+      const destination = path.join(temp, fname)
+      const dirname = path.dirname(destination)
+      if (!await exists(dirname)) await fs.promises.mkdir(dirname, { recursive: true })
+      await fs.promises.copyFile(file, destination)          
+  }
+
+  return temp
+}
+
 /**
  * Creates a tar archive, to an in-memory Buffer, or piped to write stream or file.
  * @example ```js
@@ -39,15 +54,31 @@ const win = path => {
  * - `.then()` collects the tar output into an in-memory `Buffer`
  * - `.to()` is a convenient shortcut to pipe the output into a write stream
  */
-exports.create = (dir='.', ...args) => {
+exports.create = async (dir='.', ...args) => {
 
   if (typeof dir === 'string') dir = _resolve(dir)
   if (Array.isArray(dir)) [ dir, ...args ] = [ cds.root, dir, ...args ]
-  if (Array.isArray(args[0])) args.push (...args.shift().map (f => path.isAbsolute(f) ? path.relative(dir,f) : f))
-  else args.push('.')
-  const c = process.platform === 'linux' 
-    ? spawn (`tar c -C ${dir}`, args, { shell:true })
-    : spawn (`tar cf - -C ${win(dir)}`, args, { shell:true })
+
+  let c, temp
+  if (process.platform === 'win32') {
+    const spawnDir = (dir, args) => {      
+      if (args.some(arg => arg === '-f')) return spawn ('tar', ['c', '-C', win(dir), ...win(args)])
+      else return spawn ('tar', ['cf', '-', '-C', win(dir), ...win(args)])
+    }
+    args.push('.')
+    if (Array.isArray(args[0])) {
+      temp = await createTemp(dir, args[0])
+      args.shift()
+      c = spawnDir(temp, args)
+    } else {
+      c = spawnDir(dir, args)
+    }
+  } else {
+    if (Array.isArray(args[0])) args.push (...args.shift().map (f => path.isAbsolute(f) ? path.relative(dir,f) : f))
+    else args.push('.')
+  
+    c = spawn ('tar', ['c', '-C', dir, ...args])
+  }
 
   return {__proto__:c, // returning a thenable + fluent ChildProcess...
 
@@ -57,9 +88,21 @@ exports.create = (dir='.', ...args) => {
      * @example const buffer = await tar.c('src/dir')
      */
     then (r,e) {
-      const bb=[]; c.stdout.on('data', b => bb.push(b))
-      c.on('close', ()=>r(Buffer.concat(bb)))
+      const bb=[]
+      const eb=[]
+      c.stdout.on('data', b => bb.push(b))
+      c.stderr.on('data', b => eb.push(b))
+      c.on('close', (code) => {
+        if (code === 0) {
+          return r(Buffer.concat(bb))
+        }
+        e(new Error('tar: ' + Buffer.concat(eb)))
+      })
       c.on('error', e)
+      if (process.platform === 'win32') {
+        c.on('close', async () => temp && exists(temp) && await rimraf(temp))
+        c.on('error', async () => temp && exists(temp) && await rimraf(temp))
+      }
     },
 
     /**
@@ -107,7 +150,7 @@ exports.extract = (archive, ...args) => ({
   to (...dest) {
     if (typeof dest === 'string') dest = _resolve(...dest)
     const input = typeof archive !== 'string' || archive == '-' ? '-' : _resolve(archive)
-    const x = spawn(`tar xf ${win(input)} -C ${win(dest)}`, args, { shell:true })
+    const x = spawn('tar', ['xf', win(input), '-C', win(dest), ...args])
     if (archive === '-') return x.stdin
     if (Buffer.isBuffer(archive)) archive = require('stream').Readable.from (archive)
     if (typeof archive !== 'string') archive.pipe (x.stdin)

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

@@ -162,10 +162,10 @@ class ODataRequest extends cds.Request {
        * super
        */
       const { user } = req
-
+      const tenant = req.tenant || user?.tenant
       // REVISIT: public API for query options (express style req.query already in use)?
       const _queryOptions = odataReq.getQueryOptions()
-      super({ event, target, data, query, user, method, headers, req, res, _queryOptions })
+      super({ event, target, data, query, user, method, headers, req, res, _queryOptions, tenant })
     }
 
     /*

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

@@ -82,7 +82,7 @@ const action = service => {
         await tx.rollback(e).catch(() => {})
       }
     } finally {
-      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req._.req))
+      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req.http.req))
 
       if (err) next(err)
       else next(null, toODataResult(result, req))

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

@@ -68,7 +68,7 @@ const create = service => {
         await tx.rollback(e).catch(() => {})
       }
     } finally {
-      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req._.req))
+      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req.http.req))
 
       if (err) next(err)
       else next(null, toODataResult(result, req))

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

@@ -49,7 +49,7 @@ const del = service => {
         await tx.rollback(e).catch(() => {})
       }
     } finally {
-      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req._.req))
+      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req.http.req))
 
       if (err) next(err)
       else next(null, null)

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

@@ -20,20 +20,6 @@ const metadata = service => {
 
     try {
       const { 'cds.xt.ModelProviderService': mps } = cds.services
-      // REVISIT: The following block should replaced with the one commented bellow after the next release of cds-mtxs.
-      // Currently lkg tests fail w/o the try-catch.
-      let edmx
-      try {
-        if (mps) edmx = await mps.getEdmx({ tenant, model: service.model, service: service.definition.name, locale })
-        // eslint-disable-next-line no-empty
-      } catch (_) {}
-      if (!edmx)
-        edmx = cds.localize(
-          service.model,
-          locale,
-          cds.compile.to.edmx(service.model, { service: service.definition.name })
-        )
-      /*      
       let edmx = mps
         ? await mps.getEdmx({ tenant, model: service.model, service: service.definition.name, locale })
         : cds.localize(
@@ -41,7 +27,7 @@ const metadata = service => {
             locale,
             // REVISIT: we could cache this in model._cached
             cds.compile.to.edmx(service.model, { service: service.definition.name })
-          ) */
+          )
       return next(null, toODataResult(edmx))
     } catch (e) {
       if (LOG._error) {

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

@@ -491,7 +491,7 @@ const read = service => {
         await tx.rollback(e).catch(() => {})
       }
     } finally {
-      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req._.req))
+      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req.http.req))
 
       if (err) next(err)
       else next(null, result, additional)