@sap/cds 6.4.1 → 6.6.0

package/lib/auth/jwt-auth.js

@@ -24,20 +24,21 @@ module.exports = function jwt_auth(config) {
     .use(passport.authenticate(config.kind, { session: false }))
     .use((req, res, next) => {
       const payload = req.tokenInfo.getPayload()
-    
+
       let id = req.user.id
-    
+      let _is_system, _is_internal
+
       let roles = payload.scope.map(s => s.replace(new RegExp(`^(${config.credentials.xsappname + '.'})`), ''))
       roles.push('identified-user')
       if (payload.grant_type) {
         // > not "weak"
         roles.push('authenticated-user')
-    
+
         const CLIENT = { client_credentials: 1, client_x509: 1 }
         if (payload.grant_type in CLIENT) {
           id = 'system'
-          roles.push('system-user')
-          if (req.tokenInfo.getClientId() === config.credentials.clientid) roles.push('internal-user')
+          _is_system = true
+          if (req.tokenInfo.getClientId() === config.credentials.clientid) _is_internal = true
         }
       }
 
@@ -49,11 +50,11 @@ module.exports = function jwt_auth(config) {
         attr.email = req.authInfo.getEmail()
       }
 
-      req.user = new cds.User({ id, roles, attr })
+      req.user = new cds.User({ id, roles, attr, _is_system, _is_internal })
       req.tenant = req.tokenInfo.getZoneId?.()
       next()
     })
-    .use((err, req, res, next) => {
+    .use((err, req, res, _next) => {
       if (req.tokenInfo) {
         LOG?.debug('error during token validation', req.tokenInfo.getErrorObject())
       }

package/lib/compile/for/lean_drafts.js

@@ -1,5 +1,43 @@
-const cds = require ('../../index')
-module.exports = function cds_compile_for_lean_drafts(csn, o) {
+const cds = require('../../index')
+
+function _getBacklinkName(on) {
+  const i = on.findIndex(e => e.ref && e.ref[0] === '$self')
+  if (i === -1) return
+  let ref
+  if (on[i + 1] && on[i + 1] === '=') ref = on[i + 2].ref
+  if (on[i - 1] && on[i - 1] === '=') ref = on[i - 2].ref
+  return ref && ref[ref.length - 1]
+}
+
+function _isCompositionBacklink(e) {
+  if (!e.isAssociation) return
+  if (!e._target?.associations) return
+  if (!(!e.isComposition && (e.keys || e.on))) return
+  for (const anchor of Object.values(e._target.associations)) {
+    if (!(anchor.isComposition && anchor.on?.length > 2)) continue
+    if (_getBacklinkName(anchor.on) === e.name && anchor.target === e.parent.name) return anchor
+  }
+}
+
+const IGNORED_ANNOTATIONS = [
+  '@assert.range',
+  '@assert.enum',
+  '@assert.format',
+  '@assert.target',
+  '@mandatory',
+  '@Core.Immutable',
+  '@readonly',
+  '@cds.on.update',
+  '@cds.on.insert',
+  '@Core.Computed',
+  '@Common.FieldControl.Readonly',
+  '@Common.FieldControl.Mandatory',
+  '@FieldControl.Mandatory',
+  '@FieldControl.ReadOnly',
+  '@Common.FieldControl'
+]
+
+module.exports = function cds_compile_for_lean_drafts(csn) {
   const DRAFT_ELEMENTS = new Set([
     'IsActiveEntity',
     'HasDraftEntity',
@@ -22,6 +60,13 @@ module.exports = function cds_compile_for_lean_drafts(csn, o) {
     return on
   }
 
+  function _isDraft(def) {
+    return (
+      def.associations?.DraftAdministrativeData ||
+      (def.own('@odata.draft.enabled') && def.own('@Common.DraftRoot.ActivationAction'))
+    )
+  }
+
   const { Draft } = cds.linked(`
   entity ActiveEntity { key ID: UUID; }
   entity Draft {
@@ -49,15 +94,21 @@ module.exports = function cds_compile_for_lean_drafts(csn, o) {
     const draft = { __proto__: active, name: _draftEntity, elements: { ...active.elements, ...Draft.elements } }
     Object.defineProperty(model.definitions, _draftEntity, { value: draft })
     Object.defineProperty(active, 'drafts', { value: draft })
+    Object.defineProperty(draft, 'actives', { value: active })
     draft['@cds.persistence.table'] = _draftEntity
+    if (draft['@restrict']) draft['@restrict'] = undefined
     // Recursively add drafts for compositions
     for (const each in draft.elements) {
       const e = draft.elements[each]
       const newEl = Object.create(e)
-      if (e.isComposition || (e.isAssociation && e['@odata.draft.enclosed']) || e._isBacklink) {
+      if (e.isComposition || (e.isAssociation && e['@odata.draft.enclosed']) || _isCompositionBacklink(e)) {
+        if (e._target['@odata.draft.enabled'] === false) continue // happens for texts if @fiori.draft.enabled is not set
         _redirect(newEl, draftEntity(e._target, model))
       }
       newEl.parent = draft
+      for (const ignoredAnno of IGNORED_ANNOTATIONS) {
+        if (newEl[ignoredAnno]) newEl[ignoredAnno] = undefined
+      }
       draft.elements[each] = newEl
     }
     // TODO: Redirect associations to localized
@@ -65,9 +116,7 @@ module.exports = function cds_compile_for_lean_drafts(csn, o) {
   }
   for (const name in csn.definitions) {
     const def = csn.definitions[name]
-    if (!def._isDraftEnabled || def.name.endsWith('.DraftAdministrativeData'))
-      continue
-      // so that database ignores them
+    if (!_isDraft(def)) continue
     ;[
       'IsActiveEntity',
       'HasDraftEntity',

package/lib/compile/minify.js

@@ -35,10 +35,10 @@ module.exports = function cds_minify (csn, _roots) { // IMPORTANT: don't add cds
   }
   function _visit (d) {
     if (typeof d === 'string') {
-      if (cds.compiler.model.isInReservedNamespace(d)) return
-      else d = all[d]
+      d = all[d]
+      if (!d) return // builtins like cds.String
     } else if (d.ref) return d.ref.reduce((p,n) => {
-      let d = (p.elements || csn.definitions[p.target].elements)[n.id || n] // > n.id -> view with parameters
+      let d = (p.elements || all[p.target || p.type].elements)[n.id || n] // > n.id -> view with parameters
       if (d)  _visit(d)
       return d
     },{elements:all})

package/lib/dbs/cds-deploy.js

@@ -107,9 +107,7 @@ exports.exclude_external_entities_in = function (csn) { // NOSONAR
 
 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) {
+  if (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
@@ -134,13 +132,12 @@ 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;');
+    if(!o.dry) await db.run('DROP table if exists cds_Model;');
     return db.deploy(csn, o);
   }
 
-  const in_memory = db.options?.credentials?.url === ':memory:';
   let beforeCsn
-  if (!in_memory && schemaEvo) try {
+  if (schemaEvo) try {
     const [{ csn }] = await db.read('cds.Model')
     beforeCsn = JSON.parse(csn);
   } catch(e) {
@@ -160,7 +157,7 @@ exports.create = async function (db, csn=db.model, o) {
   } else return db.run (async tx => {
     await tx.run(drops)
     await tx.run(creas)
-    if (!in_memory && schemaEvo) {
+    if (schemaEvo) {
       await tx.update('cds.Model').with({ csn: JSON.stringify(afterCsn) })
     }
     return true
@@ -169,27 +166,31 @@ exports.create = async function (db, csn=db.model, o) {
 
 
 exports.init = (db, csn=db.model, o, csvs, log=()=>{}) => db.run (async tx => {
+
+  const {tenant} = cds.context; if (tenant && tenant === cds.requires.multitenancy?.t0) return
+  const schemaEvo = db.options?.schema_evolution === 'auto' || o?.schema_evolution === 'auto'
   const resources = await exports.resources(csn, {testdata: cds.env.features.test_data})
   const inits=[]
-  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)
-      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) })
-      }))
+    for(let [file,src] of Object.entries(csvs)) {
+      const entity = _entity4(path.basename(file, '.csv'), csn)
+      if (entity?.name) {
+        const q = INSERT_from_csv (entity.name,src,schemaEvo); if (!q) continue
+        if (db.kind === 'better-sqlite') _add_missing_pks2(q)
+        q._target = ccsn.definitions[entity.name]
+        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)
+        inits.push (!x.then && typeof x === 'function' ? x(tx,csn) : x)
         log (file)
       } else { // from .csv or .json
         const INSERT_into = _from_csv_or_json [path.extname(file)]

package/lib/env/cds-requires.js

@@ -131,7 +131,7 @@ const _databases = {
   },
   "better-sqlite": _compat_to_use({
     credentials: { url: ":memory:" },
-    impl: "@sap/cds-sqlite",
+    impl: "@cap-js/sqlite",
   }),
   "sql-mt": {
     '[development]': { kind: 'sqlite' },

package/lib/env/defaults.js

@@ -29,7 +29,11 @@ module.exports = {
     localized: true,
     assert_integrity: false,
     cds_tx_protection: true,
-    cds_tx_inheritance: true
+    cds_tx_inheritance: true,
+    lean_draft: false,
+    '[lean-draft]': {
+      lean_draft: true,
+    }
   },
 
   log: {

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

@@ -246,8 +246,26 @@
           "description": "Shortcut to enable multitenancy."
         },
         "extensibility": {
-          "type": "boolean",
-          "description": "Shortcut to enable extensibility."
+          "oneOf": [
+            {
+              "type": "boolean",
+              "description": "Shortcut to enable extensibility."
+            },
+            {
+              "type": "object",
+              "description": "Extensibility configuration options.",
+              "properties": {
+                "tenantCheckInterval": {
+                  "type": "number",
+                  "description": "Time interval in ms to check for new extensions and refreshed models."
+                },
+                "evictionInterval": {
+                  "type": "number",
+                  "description": "Time interval in ms after which to evict models for inactive tenants."
+                }
+              }
+            }
+          ]
         },
         "toggles": {
           "type": "boolean",
@@ -264,7 +282,7 @@
             },
             {
               "type": "object",
-              "description": "Configuration options",
+              "description": "ModelProviderService configuration options.",
               "additionalProperties": true,
               "properties": {
                 "root": {
@@ -295,6 +313,37 @@
             },
             {
               "$ref": "#/$defs/servicePresetSidecar"
+            },
+            {
+              "type": "object",
+              "description": "DeploymentService configuration options.",
+              "properties": {
+                "hdi": {
+                  "type": "object",
+                  "description": "Bundles HDI-specific settings.",
+                  "properties": {
+                    "create": {
+                      "type": "object",
+                      "description": "HDI container provisioning parameters.",
+                      "properties": {
+                        "database_id": {
+                          "type": "string",
+                          "description": "HANA Cloud instance ID."
+                        },
+                        "additionalProperties": true
+                      }
+                    },
+                    "bind": {
+                      "type": "object",
+                      "description": "HDI container binding parameters."
+                    },
+                    "deploy": {
+                      "type": "object",
+                      "description": "HDI deployment parameters as defined on https://www.npmjs.com/package/@sap/hdi-deploy#supported-features"
+                    }
+                  }
+                }
+              }
             }
           ]
         },
@@ -303,6 +352,28 @@
           "oneOf": [
             {
               "$ref": "#/$defs/serviceActivation"
+            },
+            {
+              "type": "object",
+              "description": "SaasProvisioningService configuration options.",
+              "additionalProperties": true,
+              "properties": {
+                "jobs": {
+                  "type": "object",
+                  "description": "Configuration options for the built-in async job executor.",
+                  "properties": {
+                    "workerSize": {
+                      "type": "number",
+                      "description": "Number of workers running in parallel per database."
+                    },
+                    "clusterSize": {
+                      "type": "number",
+                      "description": "Number of databases executing parallel tasks."
+                    }
+                  },
+                  "additionalProperties": true
+                }
+              }
             }
           ]
         }

package/lib/index.js

@@ -12,8 +12,9 @@ const facade = class cds extends require('events') {
   set context(_){ this._context._for(this,_) }
   get spawn() { return super.spawn = this._context.spawn }
 
-  emit (eve, ...args) {
-    if (eve === 'served') return Promise.all (this.listeners(eve).map (l => l.call(this,...args)))
+  async emit (eve, ...args) {
+    // if (eve === 'served') return Promise.all (this.listeners(eve).map (l => l.call(this,...args)))
+    if (eve === 'served') for (let l of this.listeners(eve)) await l.call(this,...args)
     else return super.emit (eve, ...args)
   }
 }
@@ -93,6 +94,7 @@ const cds = module.exports = extend (new facade) .with ({
   test: require ('./utils/cds-test'),
   log: require ('./log/cds-log'), debug: lazy => cds.log.debug,
   exec: require ('../bin/cds'),
+  exit: (code) => cds.shutdown ? cds.shutdown() : process.exit(code),
   clone: m => JSON.parse (JSON.stringify(m)),
   lazified, lazify,
 

package/lib/lazy.js

@@ -9,7 +9,7 @@ const extend = (target) => ({
     for (let each of aspects) {
       for (let p of Reflect.ownKeys(each)) {
         if (p in excludes) continue
-        define (target,p, describe(each,p))
+        Reflect.defineProperty (target,p, Reflect.getOwnPropertyDescriptor(each,p))
       }
       if (is_class(target) && is_class(each)) {
         extend(target.prototype).with(each.prototype)
@@ -28,10 +28,10 @@ const _excludes = {
 const lazify = (o) => {
   if (o.constructor === module.constructor) return lazify_module(o)
   for (let p of Reflect.ownKeys(o)) {
-    const d = describe(o,p)
-    if (is_lazy(d.value)) define (o,p,{
-      set(v) { define (this,p,{value:v,__proto__:d}) },
-      get() { return this[p] = d.value(p,this) },
+    const d = Reflect.getOwnPropertyDescriptor(o,p)
+    if (is_lazy(d.value)) Reflect.defineProperty (o,p,{
+      set(v) { Reflect.defineProperty (this,p,{value:v,__proto__:d}) },
+      get() { return this[p] = d.value.call(this,p,this) },
       configurable: true,
     })
   }
@@ -45,9 +45,7 @@ const lazify_module = (module) => {
   return (id) => (lazy) => module.require(id)
 }
 
-const is_lazy = (x) => typeof x === 'function' && /^\(?lazy[,)\t =]/.test(x)
+const is_lazy = (x) => typeof x === 'function' && /^(function\s?)?\(?lazy[,)\t =]/.test(x)
 const is_class = (x) => typeof x === 'function' && x.prototype && /^class\b/.test(x)
-const describe = Reflect.getOwnPropertyDescriptor
-const define = Reflect.defineProperty
 
 module.exports = { extend, lazify, lazified:lazify }

package/lib/log/cds-error.js

@@ -47,9 +47,9 @@ exports.message = (strings,...values) => String.raw(strings,...values.map(_forma
  *     typeof x === 'string' || cds.error.expected `${{x}} to be a string`
  *     //> Error: Expected argument 'x' to be a string, but got: { foo: 'bar' }
  */
-exports.expected = ([,type], arg) => {
+const expected = exports.expected = ([,type], arg) => {
   const [ name, value ] = Object.entries(arg)[0]
-  return error `Expected argument '${name}'${type}, but got: ${require('util').inspect(value,{depth:11})}`
+  return error (`Expected argument '${name}'${type}, but got: ${require('util').inspect(value,{depth:11})}`, undefined, expected)
 }
 
 

package/lib/ql/Whereable.js

@@ -7,25 +7,33 @@ class Query extends require('./Query') {
   where(...x) { return this._where (x,'and','where') }
   and(...x) {  return this._where (x,'and') }
   or(...x) { return this._where (x,'or') }
-  _where (args, and_or, _clause) {
-    let pred = predicate4(args, _clause)
+  _where (args, and_or, _where) {
+    let pred = predicate4(args, _where)
     if (pred && pred.length > 0) {
       let _ = this[this.cmd]
-      if (!_clause) _clause = (
+      const clause = _where ?? (
         _.having ? 'having' :
         _.where ? 'where' :
         _.from?.on ? 'on' :
         error (`Invalid attempt to call '${this.cmd}.${and_or}()' before a prior call to '${this.cmd}.where()'`)
       )
-      if (_clause === 'on') _ = _.from
-      let left = Reflect.getOwnPropertyDescriptor(_,_clause)?.value
-      if (!left) {
+      if (clause === 'on') _ = _.from
+      let left = Reflect.getOwnPropertyDescriptor(_,clause)?.value
+      if (!left) { //> .where() called first time
+        // SELECT.from `X` .where `x or y` .and `z` -> SELECT from X where (x or y) and z
         if (pred.includes('or')) this._left_has_or = true
-        _[_clause] = pred
-      } else {
-        if (this._left_has_or && and_or === 'and') { left = [{xpr:left}]; delete this._left_has_or }
+        _[clause] = pred
+      } else { //> .where(), .and(), .or() called successively
+        if (_where) {
+          // SELECT.from `X` .where `x` .or `y` .where `z` -> SELECT from X where (x or y) and z
+          if (left.includes('or')) left = [{xpr:left}]
+        } else if (and_or === 'and') {
+          // SELECT.from `X` .where `x` .or `y` .and `z` -> SELECT from X where x or y and z
+          if (this._left_has_or) { left = [{xpr:left}]; delete this._left_has_or }
+        }
+        // SELECT.from `X` .where `x` .and `y or z` -> SELECT from X where x and (y or z)
         if (pred.includes('or')) pred = [{xpr:pred}]
-        _[_clause] = [ ...left, and_or, ...pred ]
+        _[clause] = [ ...left, and_or, ...pred ]
       }
     }
     return this
@@ -44,7 +52,10 @@ class Query extends require('./Query') {
 
 const predicate4 = (args, _clause) => {
   if (args.length === 0) return; /* else */ const x = args[0]
-  if (x.raw) return parse.CXL(...args).xpr
+  if (x.raw) {
+    let cxn = parse.CXL(...args)
+    return cxn.xpr ?? [cxn] //> the fallback is for single-item exprs like `1` or `ref`
+  }
   if (args.length === 1 && typeof x === 'object') {
     if (is_array(x)) return x
     if (is_cqn(x)) return args

package/lib/ql/cds-ql.js

@@ -1,4 +1,3 @@
-const cds = require('../index')
 const Query = require('./Query')
 require = path => { // eslint-disable-line no-global-assign
   const clazz = module.require (path); if (!clazz._api) return clazz
@@ -30,6 +29,7 @@ function _deprecated_srv_ql() { // eslint-disable-next-line no-console
 }
 
 module.exports._reset = ()=>{ // for strange tests only
+  const cds = require('../index')
   const _name = cds.env.sql.names === 'quoted' ? n =>`"${n}"` : n => n.replace(/[.:]/g,'_')
   Object.defineProperty (Query.prototype,'valueOf',{ configurable:1, value: function(cmd=this.cmd) {
     return `${cmd} ${_name(this._target.name)} `

package/lib/req/cds-context.js

@@ -47,9 +47,9 @@ module.exports = new class extends AsyncLocalStorage {
       })
     }
     const em = new EventEmitter; em.timer = (
-      (o && o.after) ? setTimeout(fx, o.after) :
-      (o && o.every) ? setInterval(fx, o.every) :
-      setImmediate(fx)
+      (o && o.after) ? setTimeout(fx, o.after).unref() :
+      (o && o.every) ? setInterval(fx, o.every).unref() :
+      setImmediate(fx).unref()
     )
     return em
   }

package/lib/req/response.js

@@ -4,8 +4,8 @@ const cds = require ('../index')
  * Messages Collector, used for `req.errors` and `req.messages`
  */
 class Responses extends Array {
-  add (severity, code, message, target, args) { // NOSONAR
-    let e // be filled in below...
+  static get (severity, code, message, target, args) {
+   let e // be filled in below...
     if (typeof code === 'object') e = code; else {
       if (typeof code === 'number') e = { code }; else [ code, message, target, args, e ] = [ undefined, code, message, target, {} ]
       if (typeof message === 'object') e = Object.assign(message,e); else {
@@ -16,9 +16,14 @@ class Responses extends Array {
       }
     }
     if (!e.numericSeverity) e.numericSeverity = severity
-    this.push(e)
     return e
   }
+
+  add (...args) {
+    const response = Responses.get(...args)
+    this.push(response)
+    return response
+  }
 }
 
 class Errors extends Responses {

package/lib/req/user.js

@@ -1,3 +1,5 @@
+const PSEUDO_ROLES = ['system-user', 'internal-user']
+
 class User {
 
   constructor (_) {
@@ -9,14 +11,22 @@ class User {
     if (typeof _ === 'string') { this.id = _; return }
     for (let each in _) super[each === '_roles' ? 'roles' : each] = _[each] // overrides getters
     const roles = this.hasOwnProperty('roles') && this.roles // eslint-disable-line no-prototype-builtins
-    if (Array.isArray(roles)) this.roles = roles.reduce ((p,n)=>{p[n]=1; return p},{})
+    if (Array.isArray(roles)) this.roles = roles.filter(r => !PSEUDO_ROLES.includes(r)).reduce ((p,n)=>{p[n]=1; return p},{})
+    else PSEUDO_ROLES.forEach(r => delete this.roles[r])
   }
 
   get attr() { return super.attr = {} }
   get roles(){ return super.roles = {} }
   get _roles(){ return this.roles } // compatibility
 
-  is (role) { return role === 'any' || role === 'identified-user' || role === 'authenticated-user' && this.authLevel !== 'weak' || !!this.roles[role] }
+  is (role) { 
+    return role === 'any' || 
+      role === 'identified-user' || 
+      role === 'system-user' && this._is_system || 
+      role === 'internal-user' && this._is_internal || 
+      role === 'authenticated-user' && this.authLevel !== 'weak' || 
+      !!this.roles[role] 
+  }
   valueOf() { return this.id }
 
 }

package/lib/srv/bindings.js

@@ -68,8 +68,7 @@ module.exports = class Bindings {
                 }
             }
         }
-        cds.on ('shutdown', ()=>this.purge())
-        process.on ('exit', ()=>this.purge()) // last resort e.g. in case of errors
+        process.on ('exit', ()=>this.purge())
         return this.store()
     }
 

package/lib/srv/cds-serve.js

@@ -56,7 +56,8 @@ module.exports = function cds_serve (som, _options) { // NOSONAR
     if (o.service && o.service !== 'all') {
       // skip services not chosen by o.service, if specified
       const specified = o.service.split(/\s*,\s*/).map (s => required[s] && required[s].service || s )
-      services = services.filter (s => specified.some (n => s.name.endsWith(n)))
+      // matching exact or unqualified name
+      services = services.filter (s => specified.some (n => s.name === n || s.name.endsWith('.'+n)))
       if (!services.length) throw cds.error (`No such service: '${o.service}'`)
     }
     services = services.filter (d => !(

package/lib/srv/middlewares/trace.js

@@ -66,15 +66,22 @@ function _instrument_sqlite (_get_perf) {
   try { require.resolve('sqlite3') } catch { return }
   // eslint-disable-next-line cds/no-missing-dependencies
   const sqlite = require('sqlite3').Database.prototype
-  for (let each of ['all', 'get', 'run', 'prepare']) {
-    const _super = sqlite[each]
-    sqlite[each] = function (q, ..._) {
-      const perf = _get_perf(q)
+  for (let each of ['all', 'get', 'run', 'prepare']) _wrap(each,sqlite)
+  function _wrap (op,sqlite) {
+    const _super = sqlite[op]
+    sqlite[op] = function (q, ..._) {
+      const perf = _get_perf(q) //> q is a SQL command like BEGIN, COMMIT, ROLLBACK, SELECT ...
       if (perf) {
-        const pe = perf.log ('sqlite -', q)
-        const callback = _[_.length-1]; _[_.length-1] = function(){
-          perf.done(pe)
-          callback.apply (this, arguments)
+        const pe = perf.log ('sqlite3', '-', q)
+        const callback = _[_.length-1]; _[_.length-1] = function(ps){
+          if (op === 'prepare') callback.apply (this, {
+            all: _wrap('all',ps),
+            get: _wrap('get',ps),
+            run: _wrap('run',ps),
+          }); else {
+            perf.done(pe)
+            callback.apply (this, arguments)
+          }
         }
       }
       return _super.call (this, q, ..._)
@@ -87,14 +94,23 @@ function _instrument_better_sqlite (_get_perf) {
   try { require.resolve('better-sqlite3') } catch { return }
   // eslint-disable-next-line cds/no-missing-dependencies
   const sqlite = require('better-sqlite3').prototype
-  for (let each of ['exec', 'prepare']) {
-    const _super = sqlite[each]
-    sqlite[each] = function (q, ..._) {
-      const perf = _get_perf(q)
+  for (let each of ['exec', 'prepare']) _wrap(each,sqlite)
+  function _wrap (op,sqlite) {
+    const _super = sqlite[op]
+    sqlite[op] = function (q, ..._) {
+      const perf = _get_perf(q) //> q is a SQL command like BEGIN, COMMIT, ROLLBACK, SELECT ...
       if (perf) {
-        const pe = perf.log ('sqlite -', q)
-        try { return _super.call (this, q, ..._) }
-        finally { perf.done(pe) }
+        const pe = perf.log ('better-sqlite3', '-', q)
+        try {
+          const x = _super.call (this, q, ..._)
+          if (op === 'prepare') return {
+            all(..._){ try { return x.all(..._) } finally { perf.done(pe) }},
+            get(..._){ try { return x.get(..._) } finally { perf.done(pe) }},
+            run(..._){ try { return x.run(..._) } finally { perf.done(pe) }},
+          }
+          else return x
+        }
+        catch(e) { perf.done(pe); throw e }
       }
       else return _super.call (this, q, ..._)
     }