@sap/cds 6.1.2 → 6.2.1

package/libx/_runtime/hana/driver.js

@@ -129,9 +129,37 @@ function _connectHanaClient(creds, tenant) {
 
 let driver
 
-const _getHanaDriver = (name = 'hdb') => {
+const _getHanaDriver = name => {
   if (driver) return driver
 
+  let isConfigured = false
+  if (!name) {
+    let packageJson
+    try {
+      packageJson = require(cds.root + '/package.json')
+    } catch (e) {
+      LOG._debug && LOG.debug(`Could not find package.json. Trying to lookup hana driver automatically.`)
+      name = 'hdb'
+    }
+
+    if (packageJson?.dependencies?.hdb) {
+      LOG._debug && LOG.debug(`"hdb" found in dependencies of "${cds.root}".`)
+      name = 'hdb'
+      isConfigured = true
+    } else if (packageJson?.dependencies?.['@sap/hana-client']) {
+      LOG._debug && LOG.debug(`"@sap/hana-client" found in dependencies of "${cds.root}".`)
+      name = '@sap/hana-client'
+      isConfigured = true
+    } else if (!name) {
+      LOG._debug &&
+        LOG.debug(
+          `Neither "hdb" nor "@sap/hana-client" found in dependencies of "${cds.root}". Trying to lookup hana driver automatically.`
+        )
+      // fallback to hdb in case both are not provided, which will fallback to @sap/hana-client if hdb is not installed
+      name = 'hdb'
+    }
+  }
+
   try {
     driver = Object.assign({ name }, require(name))
 
@@ -161,9 +189,11 @@ const _getHanaDriver = (name = 'hdb') => {
 
     return driver
   } catch (e) {
-    if (name === 'hdb') {
+    if (name === 'hdb' && !isConfigured) {
       LOG._debug && LOG.debug(`Failed to require "hdb" with error "${e.message}". Trying "@sap/hana-client" next.`)
       return _getHanaDriver('@sap/hana-client')
+    } else if (isConfigured) {
+      throw new Error(`"${name}" could not be required. Please make sure it is installed.`)
     } else {
       throw new Error(
         'Neither "hdb" nor "@sap/hana-client" could be required. Please make sure one of them is installed.'
@@ -172,4 +202,4 @@ const _getHanaDriver = (name = 'hdb') => {
   }
 }
 
-module.exports = _getHanaDriver('hdb')
+module.exports = _getHanaDriver()

package/libx/_runtime/hana/dynatrace.js

@@ -1,5 +1,6 @@
 const dynatrace = {}
 try {
+  // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
   dynatrace.sdk = require('@dynatrace/oneagent-sdk')
   dynatrace.api = dynatrace.sdk.createInstance()
 } catch (err) {

package/libx/_runtime/hana/search2Contains.js

@@ -59,7 +59,7 @@ const search2Contains = (cqnSearchPhrase, columns) => {
   return expression
 }
 
-const isContainsPredicateSupported = query => {
+const isContainsPredicateSupported = (query, entity, columns2Search) => {
   const cqnSearchPhrase = query.SELECT.search
 
   if (cqnSearchPhrase && cqnSearchPhrase[0] && cqnSearchPhrase[0].val === ' ') return false
@@ -84,9 +84,20 @@ const isContainsPredicateSupported = query => {
   // brackets are not supported as search operators in SAP HANA
   if (cqnSearchPhrase.some(searchXpr => searchXpr.xpr)) return false
 
+  // join not optimized
+  if (entity.query?.SELECT.from.join) return false
+
+  // the CONTAINS function does not interoperate with columns that use the CONCAT function
+  if (_isColumnFunc(columns2Search, entity.query?.SELECT.columns)) return false
   return true
 }
 
+const _isColumnFunc = (columns2Search, columnsDefs) =>
+  columns2Search.some(column2Search => {
+    if (column2Search.func) return true
+    return columnsDefs?.some(columnDef => columnDef.func && columnDef.as === column2Search.ref[0])
+  })
+
 module.exports = {
   isContainsPredicateSupported,
   search2Contains

package/libx/_runtime/hana/search2cqn4sql.js

@@ -25,35 +25,29 @@ const search2cqn4sql = (query, entity, options) => {
   if (!cqnSearchPhrase) return query
 
   let { columns: columns2Search = computeColumnsToBeSearched(query, entity), locale } = options
-  const localizedAssociation = _getLocalizedAssociation(entity)
+  const localizedAssociation = entity.associations?.localized
 
-  // If the localized association is defined for the target entity,
-  // there should be at least one localized element.
-  const resolveLocalizedDataAtRuntime = !!localizedAssociation
-
-  // suppress the localize handler from redirecting the query's target to the localized view
-  Object.defineProperty(query, '_suppressLocalization', { value: true })
-
-  const columnsDefs = entity.query && entity.query.SELECT.columns
-  const isSomeColumn2SearchUseFunction = _isSomeColumn2SearchAFunction(columns2Search, columnsDefs)
-
-  if (resolveLocalizedDataAtRuntime) {
+  // Resolve localized data at runtime if the localized association is defined for the target entity.
+  // Notice that if the localized association is defined, there should be at least one localized element.
+  if (localizedAssociation) {
     const onCondition = entity._relations[localizedAssociation.name].join(localizedAssociation.target, entity.name)
 
     // REVISIT this is dirty but works for now
     // replace $user_locale placeholder with the user locale or the HANA session context
     onCondition[0].xpr[onCondition[0].xpr.length - 1] = { val: locale || "SESSION_CONTEXT('LOCALE')" }
 
-    // inner join the target table with the _texts table (the _texts table contains
-    // the translated texts)
+    // inner join the target table with the _texts table (the _texts table contains the translated texts)
     const localizedEntityName = localizedAssociation.target
     query.join(localizedEntityName).on(onCondition)
 
     // prevent SQL ambiguity error for columns with the same name
     columns2Search = _addAliasToQuery(query, entity, columns2Search)
+
+    // suppress the localize handler from redirecting the query's target to the localized view
+    Object.defineProperty(query, '_suppressLocalization', { value: true })
   } // else --> resolve localized texts via localized view (default)
 
-  const useContains = !isSomeColumn2SearchUseFunction && isContainsPredicateSupported(query)
+  const useContains = !!localizedAssociation && isContainsPredicateSupported(query, entity, columns2Search)
   let expression
 
   if (useContains) {
@@ -70,23 +64,12 @@ const search2cqn4sql = (query, entity, options) => {
   return query
 }
 
-const _isSomeColumn2SearchAFunction = (columns2Search, columnsDefs) =>
-  columns2Search.some(column2Search => {
-    if (column2Search.func) return true
-    return columnsDefs && columnsDefs.some(columnDef => columnDef.func && columnDef.as === column2Search.ref[0])
-  })
-
-const _getLocalizedAssociation = entity => {
-  const associations = entity.associations
-  return associations && associations.localized
-}
-
 // The inner join modifies the original SELECT ... FROM query and adds ambiguity,
 // therefore add the table/entity name (as a preceding element) to the columns ref
 // to prevent a SQL ambiguity error.
 const _addAliasToQuery = (query, entity, columnsToBeSearched) => {
   const SELECT = query.SELECT
-  const localizedEntityName = _getLocalizedAssociation(entity).target
+  const localizedEntityName = entity.associations?.localized.target
   const elements = entity.elements
   const entityName = entity.name
   const getEntityName = columnRef => {

package/libx/_runtime/hana/streaming.js

@@ -9,6 +9,7 @@ const STREAM_PLACEHOLDER = '[<stream>]'
 const _loadStreamExtensionIfNeeded = () => {
   const hana = require('./driver')
   if (hana.name !== 'hdb') {
+    // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
     const extension = require('@sap/hana-client/extension/Stream.js')
     return isDynatraceEnabled() ? dynatraceStreamingExtension(extension) : extension
   }

package/libx/_runtime/messaging/AMQPWebhookMessaging.js

@@ -39,8 +39,10 @@ class AMQPWebhookMessaging extends MessagingService {
 
   startListening(opt = {}) {
     if (!this.subscribedTopics.size) return
-    const management = this.getManagement()
-    if (!opt.doNotDeploy) this.queued(management.createQueueAndSubscriptions.bind(management))()
+    if (!opt.doNotDeploy) {
+      const management = this.getManagement()
+      this.queued(management.createQueueAndSubscriptions.bind(management))()
+    }
     this.queued(this.listenToClient.bind(this))(async (_topic, _payload, _other, { done, failed }) => {
       const msg = Object.assign(normalizeIncomingMessage(_payload), _other || {})
       msg.event = _topic

package/libx/_runtime/messaging/common-utils/AMQPClient.js

@@ -1,4 +1,5 @@
 const cds = require('../../cds.js')
+// eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
 const ClientAmqp = require('@sap/xb-msg-amqp-v100').Client
 const { connect, disconnect } = require('./connections')
 const { hasPersistentOutbox } = require('../outbox/utils')

package/libx/_runtime/messaging/enterprise-messaging-utils/getTenantInfo.js

@@ -2,11 +2,14 @@ const cds = require('../../cds')
 const _transform = o => ({ subdomain: o.subscribedSubdomain, tenant: o.subscribedTenantId })
 
 const getTenantInfo = async tenant => {
-  const provisioning = await cds.connect.to('ProvisioningService')
+  const provisioningServiceName = cds.mtx ? 'ProvisioningService' : 'cds.xt.SaasProvisioningService'
+  const primaryKey = cds.mtx ? 'ID' : 'subscribedTenantId'
+
+  const provisioning = await cds.connect.to(provisioningServiceName)
   const tx = provisioning.tx({ user: new cds.User.Privileged() })
   try {
     const result = tenant
-      ? _transform(await tx.get(`tenant`, { ID: tenant }))
+      ? _transform(await tx.get(`tenant`, { [primaryKey]: tenant }))
       : (await tx.read('tenant')).map(o => _transform(o))
     await tx.commit()
     return result

package/libx/_runtime/messaging/enterprise-messaging-utils/registerEndpoints.js

@@ -1,4 +1,5 @@
 const cds = require('../../cds.js')
+// eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
 const express = require('express')
 const getTenantInfo = require('./getTenantInfo.js')
 const isSecured = () => cds.requires.auth && cds.requires.auth.credentials
@@ -14,6 +15,7 @@ class EndpointRegistry {
     this.deployCallbacks = new Map()
     if (isSecured()) {
       const JWTStrategy = require('../../auth/strategies/JWT.js')
+      // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
       const passport = require('passport')
       // REVISIT: It's unclear if the credentials from cds.requires.auth need to be used here.
       //          In principle, user-facing endpoints might differ from messaging ones.

package/libx/_runtime/messaging/enterprise-messaging.js

@@ -5,6 +5,7 @@ const optionsManagement = require('./enterprise-messaging-utils/options-manageme
 const EMManagement = require('./enterprise-messaging-utils/EMManagement.js')
 const optionsForSubdomain = require('./common-utils/optionsForSubdomain.js')
 const authorizedRequest = require('./common-utils/authorizedRequest')
+const getTenantInfo = require('./enterprise-messaging-utils/getTenantInfo')
 const sleep = require('util').promisify(setTimeout)
 const {
   registerDeployEndpoints,
@@ -26,6 +27,9 @@ const _checkAppURL = appURL => {
     )
 }
 
+const _oldMtx = () => cds.mtx
+const _multitenancyEnabled = () => cds.requires.multitenancy || _oldMtx()
+
 // REVISIT: It's bad to have to rely on the subdomain.
 // For all interactions where we perform the token exchange ourselves,
 // we will be able to use the zoneId instead of the subdomain.
@@ -77,8 +81,62 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
     })
   }
 
+  // New mtx based on @sap/cds-mtxs
+  async addMTXSHandlers() {
+    const deploymentSrv = await cds.connect.to('cds.xt.DeploymentService')
+    const provisioningSrv = await cds.connect.to('cds.xt.SaasProvisioningService')
+    deploymentSrv.impl(() => {
+      deploymentSrv.on('subscribe', async (req, next) => {
+        const res = await next()
+        const { tenant } = req.data
+        let subdomain
+        try {
+          const tenantInfo = await getTenantInfo(tenant) // @sap/cds-mtxs must provide that info
+          subdomain = tenantInfo.subdomain
+        } catch (e) {
+          this.LOG.error("'subscribe' is not yet implemented for @sap/cds-mtxs")
+          throw e
+        }
+        const management = await this.getManagement(subdomain).waitUntilReady()
+        await management.deploy()
+        return res
+      })
+      deploymentSrv.on('unsubscribe', async (req, next) => {
+        const res = await next()
+        const { tenant } = req.data
+        let subdomain
+        try {
+          const tenantInfo = await getTenantInfo(tenant) // @sap/cds-mtxs must provide that info
+          subdomain = tenantInfo.subdomain
+        } catch (e) {
+          this.LOG.error("'unsubscribe' is not yet implemented for @sap/cds-mtxs")
+          throw e
+        }
+        try {
+          const management = await this.getManagement(subdomain).waitUntilReady()
+          await management.undeploy()
+        } catch (error) {
+          this.LOG.error('Failed to delete messaging artifacts for subdomain', subdomain, '(', error, ')')
+        }
+        return res
+      })
+    })
+    provisioningSrv.impl(() => {
+      provisioningSrv.on('dependencies', async (req, next) => {
+        this.LOG._info && this.LOG.info('Include Enterprise-Messaging as SaaS dependency')
+        const res = (await next()) || []
+        const xsappname = this.options.credentials?.xsappname
+        if (xsappname) {
+          const exists = res.some(d => d.xsappname === xsappname)
+          if (!exists) res.push({ xsappname })
+        }
+        return res
+      })
+    })
+  }
+
   startListening() {
-    const doNotDeploy = cds.mtx && !this.options.deployForProvider
+    const doNotDeploy = _multitenancyEnabled() && !this.options.deployForProvider
     if (doNotDeploy) this.LOG._info && this.LOG.info('Skipping deployment of messaging artifacts for provider account')
     super.startListening({ doNotDeploy })
     if (!doNotDeploy && this.subscribedTopics.size) {
@@ -97,8 +155,9 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
   async listenToClient(cb) {
     _checkAppURL(this.optionsApp.appURL)
     registerWebhookEndpoints(BASE_PATH, this.queueName, this.LOG, cb)
-    if (cds.mtx) {
-      await this.addMTXHandlers()
+    if (_multitenancyEnabled()) {
+      if (_oldMtx()) await this.addMTXHandlers()
+      else await this.addMTXSHandlers()
       registerDeployEndpoints(BASE_PATH, this.queueName, async (tenantInfo, options) => {
         const result = { queue: this.queueName, succeeded: [], failed: [] }
         await Promise.all(

package/libx/_runtime/messaging/outbox/utils.js

@@ -32,7 +32,7 @@ const hasPersistentOutbox = (srv, tenant) => {
   if (!cds.requires.outbox || cds.requires.outbox.kind !== 'persistent-outbox') return false
   if (srv.options && srv.options.outbox && srv.options.outbox.kind && srv.options.outbox.kind !== 'persistent-outbox')
     return false
-  if (cds.mtx && tenant && _isProviderTenant(tenant)) return false // no persistence for provider account
+  if ((cds.mtx || cds.requires.multitenancy) && tenant && _isProviderTenant(tenant)) return false // no persistence for provider account
   return true
 }
 

package/libx/_runtime/messaging/redis-messaging.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
 const redis = require('redis')
 const cds = require('../../../lib')
 const waitingTime = require('./common-utils/waitingTime')

package/libx/_runtime/remote/Service.js

@@ -6,6 +6,7 @@ const LOG = cds.log('remote')
 // disable sdk logger if not in debug mode
 if (!LOG._debug) {
   try {
+    // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
     const sdkUtils = require('@sap-cloud-sdk/util')
     sdkUtils.setGlobalLogLevel('error')
   } catch (err) {
@@ -143,8 +144,7 @@ const _addHandlerActionFunction = (srv, def, target) => {
   if (target) {
     srv.on(event, target, async function (req) {
       const shortEntityName = req.target.name.replace(`${this.namespace}.`, '')
-      if (this.kind === 'odata-v2')
-        return _handleV2BoundActionFunction(srv, def, req, `${shortEntityName}_${event}`, this.kind)
+      if (this.kind === 'odata-v2') return _handleV2BoundActionFunction(srv, def, req, event, this.kind)
       const url = `/${shortEntityName}(${_buildKeys(req, this.kind).join(',')})/${this.namespace}.${event}`
       return _handleBoundActionFunction(srv, def, req, url)
     })

package/libx/_runtime/remote/utils/client.js

@@ -24,8 +24,8 @@ const _sanitizeHeaders = headers => {
 
 const _executeHttpRequest = async ({ requestConfig, destination, destinationOptions, jwt }) => {
   const { executeHttpRequestWithOrigin } = cloudSdk()
-
   const destinationName = typeof destination === 'string' && destination
+
   if (destinationName) {
     destination = { destinationName, ...(resolveDestinationOptions(destinationOptions, jwt) || {}) }
   } else if (destination.forwardAuthToken) {
@@ -59,13 +59,21 @@ const _executeHttpRequest = async ({ requestConfig, destination, destinationOpti
 
   // cloud sdk requires a new mechanism to differentiate the priority of headers
   // "custom" keeps the highest priority as before
-  requestConfig = { ...requestConfig, headers: { custom: { ...requestConfig.headers } } }
+  const maxBodyLength = cds.env?.remote?.max_body_length
+  requestConfig = {
+    ...requestConfig,
+    headers: {
+      custom: { ...requestConfig.headers }
+    },
+    ...(maxBodyLength && { maxBodyLength })
+  }
 
   return executeHttpRequestWithOrigin(destination, requestConfig, requestOptions)
 }
 
 const cloudSdk = () => {
   if (_cloudSdk) return _cloudSdk
+  // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
   _cloudSdk = require('@sap-cloud-sdk/http-client')
   return _cloudSdk
 }
@@ -145,10 +153,12 @@ function _defineProperty(obj, property, value) {
     const map = (..._) => _defineProperty(_map.call(obj, ..._), property, value)
     props.map = { value: map, enumerable: false, configurable: true, writable: true }
   }
+
   props[property] = { value: value, enumerable: false, configurable: true, writable: true }
   for (const prop in props) {
     Object.defineProperty(obj, prop, props[prop])
   }
+
   return obj
 }
 
@@ -156,14 +166,17 @@ function _normalizeMetadata(prefix, data, results) {
   const target = results !== undefined ? results : data
   if (typeof target !== 'object' || target === null) return target
   const metadataKeys = Object.keys(data).filter(k => prefix.test(k))
+
   for (const k of metadataKeys) {
     const $ = k.replace(prefix, '$')
     _defineProperty(target, $, data[k])
     delete target[k]
   }
+
   if (Array.isArray(target)) {
     return target.map(row => _normalizeMetadata(prefix, row))
   }
+
   // check properties for all and prop.results for odata v2
   for (const [key, value] of Object.entries(target)) {
     if (value && typeof value === 'object') {
@@ -171,6 +184,7 @@ function _normalizeMetadata(prefix, data, results) {
       target[key] = _normalizeMetadata(prefix, value, nestedResults)
     }
   }
+
   return target
 }
 const _getPurgedRespActionFunc = (data, returnType) => {
@@ -181,6 +195,7 @@ const _getPurgedRespActionFunc = (data, returnType) => {
       return data[key]
     }
   }
+
   return data
 }
 
@@ -198,6 +213,7 @@ const _purgeODataV2 = (data, target, returnType, reqHeaders) => {
     ieee754Compatible,
     exponentialDecimals
   )
+
   return _normalizeMetadata(/^__/, data, convertedResponse)
 }
 
@@ -217,6 +233,7 @@ const _getSanitizedError = (e, reqOptions, options = { suppressRemoteResponseBod
     url: e.config ? e.config.baseURL + e.config.url : reqOptions.url,
     headers: e.config ? e.config.headers : reqOptions.headers
   }
+
   if (options.batchRequest) {
     e.request.body = reqOptions.data
   }
@@ -227,9 +244,11 @@ const _getSanitizedError = (e, reqOptions, options = { suppressRemoteResponseBod
       statusText: e.response.statusText,
       headers: e.response.headers
     }
+
     if (e.response.data && !options.suppressRemoteResponseBody) {
       response.body = e.response.data
     }
+
     e.response = response
   }
 
@@ -270,12 +289,7 @@ const run = async (
     response = await _executeHttpRequest({ requestConfig, destination, destinationOptions, jwt })
   } catch (e) {
     // > axios received status >= 400 -> gateway error
-    const msg =
-      (e.response &&
-        e.response.data &&
-        e.response.data.error &&
-        ((e.response.data.error.message && e.response.data.error.message.value) || e.response.data.error.message)) ||
-      e.message
+    const msg = e?.response?.data?.error?.message?.value ?? e?.response?.data?.error?.message ?? e.message
     e.message = msg ? 'Error during request to remote service: \n' + msg : 'Request to remote service failed.'
 
     const sanitizedError = _getSanitizedError(e, requestConfig, {
@@ -284,7 +298,6 @@ const run = async (
 
     const err = Object.assign(new Error(e.message), { statusCode: 502, reason: sanitizedError })
     LOG._warn && LOG.warn(err)
-
     throw err
   }
 
@@ -312,7 +325,6 @@ const run = async (
     })
 
     LOG._warn && LOG.warn(err)
-
     throw err
   }
 
@@ -331,6 +343,7 @@ const run = async (
     if (responseDataSplitted[1].startsWith('HTTP/1.1 2')) {
       response.data = contentJSON
     }
+
     if (responseDataSplitted[1].startsWith('HTTP/1.1 4') || responseDataSplitted[1].startsWith('HTTP/1.1 5')) {
       const innerError = contentJSON.error || contentJSON
       innerError.status = Number(responseDataSplitted[1].match(/HTTP.*(\d{3})/m)[1])
@@ -357,6 +370,7 @@ const run = async (
     }
     return _purgeODataV4(response.data)
   }
+
   return response.data
 }
 
@@ -368,6 +382,7 @@ const getJwt = req => {
       return token[1]
     }
   }
+
   return null
 }
 
@@ -382,9 +397,11 @@ const _cqnToReqOptions = (query, service, req) => {
       .replace(/\( /g, '(')
       .replace(/ \)/g, ')')
   }
+
   if (queryObject.method !== 'GET' && queryObject.method !== 'HEAD') {
     reqOptions.data = kind === 'odata-v2' ? convertV2PayloadData(queryObject.body, req.target) : queryObject.body
   }
+
   return reqOptions
 }
 
@@ -395,9 +412,11 @@ const _stringToReqOptions = (query, data, target) => {
     method: cleanQuery.substring(0, blankIndex).toUpperCase(),
     url: encodeURI(formatPath(cleanQuery.substring(blankIndex, cleanQuery.length).trim()))
   }
+
   if (data && reqOptions.method !== 'GET' && reqOptions.method !== 'HEAD') {
     reqOptions.data = this.kind === 'odata-v2' ? Object.assign({}, convertV2PayloadData(data, target)) : data
   }
+
   return reqOptions
 }
 
@@ -412,10 +431,12 @@ const _pathToReqOptions = (method, path, data, target) => {
     // normalize in case parts[2] already starts with /
     url = url.replace(/^\/\//, '/')
   }
+
   const reqOptions = { method, url }
   if (data && reqOptions.method !== 'GET' && reqOptions.method !== 'HEAD') {
     reqOptions.data = this.kind === 'odata-v2' ? Object.assign({}, convertV2PayloadData(data, target)) : data
   }
+
   return reqOptions
 }
 
@@ -453,8 +474,11 @@ const getReqOptions = (req, query, service) => {
     if (typeof reqOptions.data === 'object' && !Buffer.isBuffer(reqOptions.data)) {
       reqOptions.headers['content-type'] = 'application/json'
       reqOptions.headers['content-length'] = Buffer.byteLength(JSON.stringify(reqOptions.data))
-    } else if (typeof reqOptions.data === 'string' || Buffer.isBuffer(reqOptions.data)) {
+    } else if (typeof reqOptions.data === 'string') {
+      reqOptions.headers['content-length'] = Buffer.byteLength(reqOptions.data)
+    } else if (Buffer.isBuffer(reqOptions.data)) {
       reqOptions.headers['content-length'] = Buffer.byteLength(reqOptions.data)
+      if (!_hasHeader(req.headers, 'content-type')) reqOptions.headers['content-type'] = 'application/octet-stream'
     }
   }
   reqOptions.url = formatPath(reqOptions.url)

package/libx/_runtime/remote/utils/data.js

@@ -78,9 +78,14 @@ const _convertValue = (ieee754Compatible, exponentialDecimals) => (value, elemen
     } else if (value === 'false') {
       value = false
     }
-  } else if (type === 'cds.Integer') {
+  } else if (type === 'cds.Integer' || type === 'cds.UInt8' || type === 'cds.Int16' || type === 'cds.Int32') {
     value = parseInt(value, 10)
-  } else if (type === 'cds.Decimal' || type === 'cds.DecimalFloat' || type === 'cds.Integer64') {
+  } else if (
+    type === 'cds.Decimal' ||
+    type === 'cds.DecimalFloat' ||
+    type === 'cds.Integer64' ||
+    type === 'cds.Int64'
+  ) {
     const bigValue = big(value)
     if (ieee754Compatible) {
       // TODO test with arrayed => element.items.scale?

package/libx/_runtime/sqlite/Service.js

@@ -17,6 +17,7 @@ const execute = require('./execute')
 
 const _new = url => {
   if (url && url !== ':memory:') url = cds.utils.path.resolve(cds.root, url)
+  // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
   if (!_sqlite) _sqlite = require('sqlite3')
   return new Promise((resolve, reject) => {
     const dbc = new _sqlite.Database(url, err => {
@@ -102,8 +103,8 @@ module.exports = class SQLiteDatabase extends DatabaseService {
     const credentials = this.options.credentials || this.options || {}
     let dbUrl = credentials.database || credentials.url || credentials.host || ':memory:'
 
-    if (tenant && dbUrl.endsWith('.db')) {
-      dbUrl = dbUrl.split('.db')[0] + '_' + tenant + '.db'
+    if (tenant && dbUrl !== ':memory:') {
+      dbUrl = dbUrl.replace(/\.(db|sqlite)$/, `-${tenant}.$1`)
     }
     return dbUrl
   }
@@ -153,13 +154,13 @@ module.exports = class SQLiteDatabase extends DatabaseService {
    */
   // REVISIT: make tenant aware
   async deploy(model, options = {}) {
-    const createEntities = cds.compile.to.sql(model, options)
-    if (!createEntities || createEntities.length === 0) return // > nothing to deploy
+    let createEntities = cds.compile.to.sql(model, options)
+    if (createEntities.length === 0) return // > nothing to deploy
 
-    const dropViews = []
-    const dropTables = []
+    let dropViews = []
+    let dropTables = []
     for (const each of createEntities) {
-      const [, table, entity] = each.match(/^\s*CREATE (?:(TABLE)|VIEW)\s+"?([^\s"(]+)"?/im) || []
+      const [, table, entity] = each.match(/^CREATE (?:(TABLE)|VIEW)\s+"?([^\s"(]+)"?/im) || []
       if (table) dropTables.push({ DROP: { entity } })
       else dropViews.push({ DROP: { view: entity } })
     }
@@ -190,6 +191,12 @@ module.exports = class SQLiteDatabase extends DatabaseService {
     await this.run(async tx => {
       // This starts a new transaction if called from CLI, while joining
       // existing root tx, e.g. when called from DeploymenrService
+      const [ext] = await tx.run(`SELECT 1 from sqlite_master where name='cds_xt_Extensions'`)
+      if (ext) {
+        // Poor man's schema evolution for MTX upgrade operations
+        createEntities = createEntities.filter(ct => !ct.match(/^CREATE TABLE cds_xt_Extensions/im))
+        dropTables = dropTables.filter(dt => dt.DROP.entity !== 'cds_xt_Extensions')
+      }
       await tx.run(dropViews)
       await tx.run(dropTables)
       await tx.run(createEntities)
@@ -197,4 +204,8 @@ module.exports = class SQLiteDatabase extends DatabaseService {
 
     return true
   }
+
+  async disconnect(tenant) {
+    this.dbcs.delete(tenant)
+  }
 }

package/libx/_runtime/sqlite/conversion.js

@@ -39,15 +39,18 @@ const SQLITE_TYPE_CONVERSION_MAP = new Map([
   ['cds.Boolean', convertToBoolean],
   ['cds.Date', convertToDateString],
   ['cds.Integer64', convertInt64ToString],
+  ['cds.Int64', convertInt64ToString],
   ['cds.DateTime', convertToISONoMillis],
   ['cds.Timestamp', convertToISOTime]
 ])
 
 if (cds.env.features.bigjs) {
+  // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
   const Big = require('big.js')
   const convertToBig = value => new Big(value)
 
   SQLITE_TYPE_CONVERSION_MAP.set('cds.Integer64', convertToBig)
+  SQLITE_TYPE_CONVERSION_MAP.set('cds.Int64', convertToBig)
   SQLITE_TYPE_CONVERSION_MAP.set('cds.Decimal', convertToBig)
 }