@sap/cds 5.4.6 → 5.5.0

package/bin/build/index.js

@@ -1,14 +1,14 @@
 const path = require('path')
-const {fs} = require('@sap/cds-foss')
+const { fs } = require('@sap/cds-foss')
 const BuildTaskEngine = require('./buildTaskEngine')
 const BuildTaskFactory = require('./buildTaskFactory')
 const BuildTaskHandler = require('./buildTaskHandler')
-const constants = require('./constants')
+const { LOG_MODULE_NAMES } = require('./constants')
 const { BuildError } = require('./util')
 const { BUILD_MODE_INPLACE } = require('./constants')
 
 module.exports = Object.assign(build,
-    { build, BuildTaskFactory, BuildTaskEngine, BuildTaskHandler, BuildError, constants }
+    { build, BuildTaskFactory, BuildTaskEngine, BuildTaskHandler, BuildError }
 )
 
 /**
@@ -18,7 +18,6 @@ module.exports = Object.assign(build,
  * @param {object} _env - for testing purposes only, will be removed.
  */
 async function build(options = {}, _env = null /* for unit tests only: */) {
-    const logger = options.logger || global.console
     const projectPath = path.resolve(options.project || '.')
 
     if (!fs.lstatSync(projectPath).isDirectory()) {
@@ -26,6 +25,8 @@ async function build(options = {}, _env = null /* for unit tests only: */) {
     }
 
     const cds = require('./cds').in(projectPath)
+    const logger = options.logger || cds.log(LOG_MODULE_NAMES)
+
     if (_env) {
         // REVISIT: please avoid using internal APIs
         cds.env = cds.env._merge_with(_env)

package/bin/build/mtaUtil.js

@@ -1,9 +1,8 @@
-const cds = require ('./cds')
-const {fs} = require('@sap/cds-foss')
+const cds = require('./cds')
+const { fs } = require('@sap/cds-foss')
 const path = require('path')
 const { getProperty } = require('./util')
 
-const DEBUG = process.env.DEBUG
 const HDI_CONTAINER_TYPES = ['com.sap.xs.hdi-container']
 const UTF_8 = 'utf-8'
 const MTA_YAML = 'mta.yaml'
@@ -11,7 +10,7 @@ const MTA_YAML = 'mta.yaml'
 async function getHanaDbModuleDescriptor(projectPath, moduleName, logger) {
     // mta might be null if mta.yaml does not exist
     const mta = await _getMta(projectPath, logger)
-    const projectInfo = await _getProjectInfo(projectPath, mta)
+    const projectInfo = await _getProjectInfo(projectPath, mta, logger)
     const hdiService = _findHdiResource(mta, moduleName, logger)
     const appName = _getApplicationName(mta, moduleName, 'hdb')
 
@@ -26,7 +25,7 @@ async function getHanaDbModuleDescriptor(projectPath, moduleName, logger) {
 async function getServiceModuleDescriptor(projectPath, moduleName, moduleType, logger) {
     // mta might be null if mta.yaml does not exist
     const mta = await _getMta(projectPath, logger)
-    const projectInfo = await _getProjectInfo(projectPath, mta)
+    const projectInfo = await _getProjectInfo(projectPath, mta, logger)
     const appName = _getApplicationName(mta, moduleName, moduleType)
 
     return {
@@ -35,7 +34,7 @@ async function getServiceModuleDescriptor(projectPath, moduleName, moduleType, l
     }
 }
 
-async function _getProjectInfo(projectPath, mta) {
+async function _getProjectInfo(projectPath, mta, logger) {
     const details = {
     }
     // 1. use mta data
@@ -76,8 +75,8 @@ async function _getProjectInfo(projectPath, mta) {
                 }
             }
         } catch (e) {
-            this.logger.error(`Failed to load ${packageJsonPath} - skip application data`)
-            this.logger.error(e)
+            logger.error(`Failed to load ${packageJsonPath} - skip application data`)
+            logger.error(e)
         }
     }
     // 3. use project name and static default values
@@ -103,9 +102,7 @@ async function _getMta(projectPath, logger) {
 
     const existsMtaYaml = await fs.pathExists(mtaFilePath)
     if (!existsMtaYaml) {
-        if (DEBUG) {
-            logger.log('[cds] - mta.yaml not existing')
-        }
+        logger.debug('mta.yaml not existing')
         return null
     }
 

package/bin/build/provider/buildTaskHandlerEdmx.js

@@ -1,7 +1,6 @@
 const path = require('path')
 const BuildTaskHandlerInternal = require('./buildTaskHandlerInternal')
 const { BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY } = require('../constants')
-const DEBUG = process.env.DEBUG
 
 class BuildTaskHandlerEdmx extends BuildTaskHandlerInternal {
     init() {
@@ -10,10 +9,11 @@ class BuildTaskHandlerEdmx extends BuildTaskHandlerInternal {
             csn: {},
             edmx: new Map(),
             languages: new Set(),
-            services: new Set()
+            services: new Set(),
+            languageBundles: {}
         }
     }
-    async compileEdmx(model, edmxDest, compileOptions = {}) { // NOSONAR
+    async compileToEdmx(model, edmxDest, compileOptions = {}) { // NOSONAR
         const promises = []
         const services = this.cds.reflect(model).services
 
@@ -26,10 +26,8 @@ class BuildTaskHandlerEdmx extends BuildTaskHandlerInternal {
                 ...this._options4edmx(),
                 ...compileOptions
             }
+            this.logger._debug && this.logger.debug(`compiling edmx files using OData version ${options.version}`)
 
-            if (DEBUG) {
-                this.logger.log(`[cds] - compiling edmx files using OData version ${options.version}`)
-            }
             const result = this.cds.compile.to.edmx(model, options)
 
             if (result) {
@@ -57,6 +55,65 @@ class BuildTaskHandlerEdmx extends BuildTaskHandlerInternal {
         return Promise.all(promises)
     }
 
+    async compileToJson(model, csnDest) {
+        // This will als add a @source prop containing the relative path to the origin .cds source file
+        // and a parsed _where clause for @restrict.{grant,where} annotations.
+        // The @source annotation is required for correct custom handler resolution if no @impl annotation has been defined as
+        // custom service handler implementations are relative to the origin .cds source files.
+        // For staging builds (task.src !== task.dest) the csn.json file that is served at runtime is copied into a corresponding srv subfolder.
+        // As a consequence the src folder name has to be included in the @source file name while for inplace builds (task.src === task.dest) this is not the case.
+        // This ensures that the paths are relative to the cwd when executing cds run.
+        const jsonOptions = {
+            cwd: this.buildOptions.root,
+            src: this.task.src === this.task.dest ? this.task.src : this.buildOptions.root
+        }
+        const csnStr = this.cds.compile.to.json(model, jsonOptions)
+        this._result.csn = JSON.parse(csnStr)
+        this._result.csn.meta = model.meta
+
+        // csnDest might be null
+        if (csnDest && !this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
+            await this.write(csnStr).to(path.join(csnDest, 'csn.json'))
+        }
+        return this._result.csn
+    }
+
+    /**
+     * Collect and write language bundles into a single i18n.json file.
+     * @param {Object} model
+     * @param {string} bundleDest
+     */
+    async collectLanguageBundles(model, bundleDest) {
+        // collect effective i18n properties...
+        let bundles = {}
+        const bundleGenerator = this.cds.localize.bundles4(model)
+        if (bundleGenerator && bundleGenerator[Symbol.iterator]) {
+            for (let [locale, bundle] of bundleGenerator) {
+                // fallback bundle has the name ""
+                if (typeof locale === 'string') {
+                    bundles[locale] = bundle
+                }
+            }
+        }
+
+        // omit bundles in case the fallback bundle is the only existing entry
+        const keys = Object.keys(bundles)
+        if (keys.length === 1 && keys[0] === "" && Object.keys(bundles[keys[0]]).length === 0) {
+            bundles = {}
+        }
+        // copied from ../compile/i18n.js
+        const { folders = ['i18n'], file = 'i18n' } = this.env.i18n
+        
+        // bundleDest might be null
+        if (bundleDest && Object.keys(bundles).length > 0) {
+            if (!this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
+                await this.write(bundles).to(path.join(bundleDest, folders[0], file + '.json'))
+            }
+        }
+        this._result.languageBundles = bundles
+        return bundles
+    }
+
     _options4odata() {
         const o = this.options()
         o.version = this.env.odata.version

package/bin/build/provider/buildTaskHandlerInternal.js

@@ -2,7 +2,7 @@ const { fs } = require('@sap/cds-foss')
 const path = require('path')
 const BuildTaskHandler = require('../buildTaskHandler')
 const { hasOptionValue } = require('../util')
-const { BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY, FOLDER_GEN } = require('../constants')
+const { FOLDER_GEN } = require('../constants')
 
 class BuildTaskHandlerInternal extends BuildTaskHandler {
     /**
@@ -165,40 +165,8 @@ class BuildTaskHandlerInternal extends BuildTaskHandler {
         )
     }
 
-    /**
-     * Collect and write language bundles into a single i18n.json file.
-     * @param {Object} model
-     * @param {string} dest
-     */
-    async copyLanguageBundles(model, dest) {
-        // collect effective i18n properties...
-        let bundles = {}
-        const bundleGenerator = this.cds.localize.bundles4(model)
-        if (bundleGenerator && bundleGenerator[Symbol.iterator]) {
-            for (let [locale, bundle] of bundleGenerator) {
-                // fallback bundle has the name ""
-                if (typeof locale === 'string') {
-                    bundles[locale] = bundle
-                }
-            }
-        }
-
-        // omit bundles in case the fallback bundle is the only existing entry
-        const keys = Object.keys(bundles)
-        if (keys.length === 1 && keys[0] === "" && Object.keys(bundles[keys[0]]).length === 0) {
-            bundles = {}
-        }
-        // copied from ../compile/i18n.js
-        const { folders = ['i18n'], file = 'i18n' } = this.env.i18n
-        if (Object.keys(bundles).length > 0) {
-            if (!this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
-                await this.write(bundles).to(path.join(dest, folders[0], file + '.json'))
-            }
-        }
-    }
-
     options() {
-        return { messages: this._messages }
+        return { messages: this._messages, logger: this.logger }
     }
 
     _isSubDirectory(parent, child) {

package/bin/build/provider/buildTaskProviderInternal.js

@@ -5,8 +5,6 @@ const { FILE_EXT_CDS, BUILD_TASK_HANA, BUILD_TASK_FIORI, BUILD_TASK_JAVA, BUILD_
     CDS_CONFIG_PATH_SEP, BUILD_MODE_INPLACE, BUILD_TASK_PREFIX, BUILD_TASKS } = require("../constants")
 const BuildTaskProvider = require('../buildTaskProvider')
 
-const DEBUG = process.env.DEBUG
-
 class BuildTaskProviderInternal extends BuildTaskProvider {
     constructor(cds, logger) {
         super()
@@ -64,9 +62,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
     }
 
     async _createTasks(buildOptions) { // NOSONAR
-        if (DEBUG) {
-            this.logger.log("[cds] - Determining CDS build tasks from CDS configuration - applying defaults")
-        }
+        this.logger.debug("[cds] - Determining CDS build tasks from CDS configuration - applying defaults")
         const { root: projectPath } = buildOptions
         let tasks = []
         let db = typeof this.env.folders.db === "string" ? [BuildTaskProviderInternal._normalizePath(this.env.folders.db)] : this.env.folders.db
@@ -139,15 +135,11 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
     }
 
     _createDbTask(projectPath, src, taskOptions, buildOptions) {
-        if (DEBUG) {
-            this.logger.log("[cds] - Determining database kind.")
-        }
+        this.logger.debug("[cds] - Determining database kind.")
         let task = null
 
         if (this._useHana(projectPath, buildOptions)) {
-            if (DEBUG) {
-                this.logger.log("[cds] - Found HANA database.")
-            }
+            this.logger.debug("[cds] - Found HANA database.")
             // legacy build supports dest property
             const compileDest = this.env.get("data.dest")
             if (compileDest) {
@@ -162,19 +154,17 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                 options: taskOptions
             }
         } else {
-            if (DEBUG) {
-                this.logger.log("[cds] - Found sqlite database - skipping HANA build task")
-            }
+            this.logger.debug("[cds] - Found sqlite database - skipping HANA build task")
         }
         return task
     }
 
     _useHana(projectPath, buildOptions) {
         if (this.env.get("build.mode") === BUILD_MODE_INPLACE
-            // || !this.env.get("requires.db.kind")
-            || getProperty(buildOptions, "for.hana.skipManifestGeneration") // fallback for webide fullstack and mtx
+            || getProperty(buildOptions, "for.hana.skipManifestGeneration") // deprecated fallback for webide fullstack and mtx
+            || getProperty(buildOptions, "for.hana.contentManifest") === false // fallback for webide fullstack and mtx
             || this.env.get("requires.db.kind") === "hana"
-            || this.env.get("requires.db.use") === "hana") {
+            || this.env.get("requires.db.dialect") === "hana") {
 
             return true
         }
@@ -189,38 +179,28 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
     }
 
     _createMtxTask(srv) {
-        if (DEBUG) {
-            this.logger.log("[cds] - Determining single or multi-tenant strategy.")
-        }
+        this.logger.debug("[cds] - Determining single or multi-tenant strategy.")
         let task = null
 
-        if (this.env.get("requires.multitenancy") && (this.env.get("requires.db.kind") === "hana" || this.env.get("requires.db.use") === "hana")) {
-            if (DEBUG) {
-                this.logger.log("[cds] - Found multi-tenant app.")
-            }
+        if (this.env.get("requires.multitenancy") && (this.env.get("requires.db.kind") === "hana" || this.env.get("requires.db.dialect") === "hana")) {
+            this.logger.debug("[cds] - Found multi-tenant app.")
             task = {
                 src: ".",
                 for: BUILD_TASK_MTX,
                 dest: srv
             }
         } else {
-            if (DEBUG) {
-                this.logger.log("[cds] - Found single-tenant app - skipping mtx build task")
-            }
+            this.logger.debug("[cds] - Found single-tenant app - skipping mtx build task")
         }
         return task
     }
 
     _createSrvTask(projectPath, src, taskOptions) {
-        if (DEBUG) {
-            this.logger.log("[cds] - Determining implementation technology")
-        }
+        this.logger.debug("[cds] - Determining implementation technology")
         let task = this._createJavaTask(projectPath, src, taskOptions)
 
         if (!task) {
-            if (DEBUG) {
-                this.logger.log("[cds] - Found implementation technology node")
-            }
+            this.logger.debug("[cds] - Found implementation technology node")
             task = {
                 src: src,
                 for: BUILD_TASK_NODE,
@@ -232,9 +212,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
 
     _createJavaTask(projectPath, src, taskOptions) {
         if (this._hasJavaNature(projectPath, src)) {
-            if (DEBUG) {
-                this.logger.log("[cds] - Found implementation technology java")
-            }
+            this.logger.debug("[cds] - Found implementation technology java")
             // legacy build supports dest property
             const compileDest = this.env.get("service.dest")
             if (compileDest) {
@@ -259,9 +237,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
      */
     _createFioriTasks(projectPath, fioriSrvOptions) {
         let tasks = []
-        if (DEBUG) {
-            this.logger.log("[cds] - Determining fiori modules - matching modules */webapp/manifest.json")
-        }
+        this.logger.debug("[cds] - Determining fiori modules - matching modules */webapp/manifest.json")
         // fiori-app build-tasks
         let appDirs = this.env.ui && this.env.ui.apps ? this.env.ui.apps : undefined
         if (!appDirs) {
@@ -287,9 +263,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                 return appDir
             })
         }
-        if (DEBUG) {
-            this.logger.log(`[cds] - Found fiori app paths [${appDirs}]`)
-        }
+        this.logger._debug && this.logger.debug(`[cds] - Found fiori app paths [${appDirs}]`)
         appDirs.forEach(appDir => {
             appDir = BuildTaskProviderInternal._normalizePath(appDir)
             let modelPaths = this._resolveModel(path.resolve(projectPath, appDir))

package/bin/build/provider/fiori/index.js

@@ -2,7 +2,6 @@ const path = require('path')
 const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 const URL = require('url')
 const { getProperty, isOldJavaStack, relativePaths } = require('../../util')
-const DEBUG = process.env.DEBUG
 
 const { ODATA_VERSION, ODATA_VERSION_V2, BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY, BUILD_TASK_FIORI, BUILD_TASK_JAVA, CDS_CONFIG_PATH_SEP } = require('../../constants')
 
@@ -56,30 +55,26 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
 
                     // old java stack
                     // default is now v4 and not v2 anymore, so overwrite with v2 if using default
-                    if (DEBUG) {
-                        this.logger.log("Fiori task is forcing OData v2 for building though the default is v4.")
-                    }
+                    this.logger.debug("Fiori task is forcing OData v2 for building though the default is v4.")
                     edmxOptions.version = ODATA_VERSION_V2
                 }
             }
 
             for (let [appFolder, appModelGroup] of appModelGroups.entries()) {
-                this.logger.log(`[cds] - building module [${appFolder}] using [${this.constructor.name}]`)
+                this.logger.log(`building module [${appFolder}] using [${this.constructor.name}]`)
                 const modelPaths = this.cds.resolve(Array.from(appModelGroup.values()), this.buildOptions)
                 if (!modelPaths || modelPaths.length === 0) {
-                    this.logger.log(`[cds] - no model found`)
+                    this.logger.log(`no model found`)
                     continue
                 }
-                if (DEBUG) {
-                    this.logger.log(`[cds] - model: ${relativePaths(this.buildOptions.root, modelPaths).join(", ")}`)
-                }
+                this.logger._debug && this.logger.debug(`model: ${relativePaths(this.buildOptions.root, modelPaths).join(", ")}`)
 
                 //cache model per fiori app root folder
                 const options = this.options()
                 const model = await this.cds.load(modelPaths, options)
                 fioriBuildOptions.appModel.set(appFolder, model)
 
-                await this.compileEdmx(model, null, edmxOptions)
+                await this.compileToEdmx(model, null, edmxOptions)
 
                 // cache edmx per fiori app root folder
                 fioriBuildOptions.appEdmx.set(appFolder, this._result.edmx)
@@ -100,12 +95,10 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
         const { src, dest } = this.task
         const modelPaths = this.resolveModel()
         if (!modelPaths || modelPaths.length === 0) {
-            this.logger.log(`[cds] - no model found`)
+            this.logger.log(`no model found`)
             return
         }
-        if (DEBUG) {
-            this.logger.log(`[cds] - model: ${relativePaths(this.buildOptions.root, modelPaths).join(", ")}`)
-        }
+        this.logger._debug && this.logger.debug(`model: ${relativePaths(this.buildOptions.root, modelPaths).join(", ")}`)
 
         await this._writeEdmxToWebapp(src, dest)
     }
@@ -117,16 +110,14 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
         try {
             manifest = require(manifestPath)
         } catch (error) {
-            this.logger.log(`[cds] - UI module does not contain a manifest.json [${relativePaths(this.buildOptions.root, manifestPath)}], skipping build`)
+            this.logger.log(`UI module does not contain a manifest.json [${relativePaths(this.buildOptions.root, manifestPath)}], skipping build`)
             return
         }
 
         const mainService = getProperty(manifest, ['sap.app', 'dataSources', 'mainService'])
         if (!mainService) {
-            if (DEBUG) {
-                // no mainService defined - not supported
-                this.logger.log(`[cds] - UI module does not have a datasource [mainService], [${relativePaths(this.buildOptions.root, manifestPath)}], skipping build`)
-            }
+            // no mainService defined - not supported
+            this.logger._debug && this.logger.debug(`UI module does not have a datasource [mainService], [${relativePaths(this.buildOptions.root, manifestPath)}], skipping build`)
             return
         }
 
@@ -134,22 +125,20 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
         const uri = mainService.uri
 
         if (!localUri || !uri) {
-            if (DEBUG) {
-                this.logger.warn(`[cds] - local uri setting missing for data source [mainService], [${relativePaths(this.buildOptions.root, manifestPath)}]`)
-            }
+            this.logger._debug && this.logger.warn(`local uri setting missing for data source [mainService], [${relativePaths(this.buildOptions.root, manifestPath)}]`)
             return
         }
 
         const appFolder = path.relative(this.buildOptions.root, src).split(CDS_CONFIG_PATH_SEP)[0]
         const model = this.getBuildOption("appModel").get(appFolder)
         if (!model) {
-            this.logger.error(`[cds] - failed to load model for service uri ${uri}, data source [mainService]`)
+            this.logger.error(`failed to load model for service uri ${uri}, data source [mainService]`)
             return
         }
 
         const edmx = this._getEdmxForUri(model, appFolder, uri)
         if (!edmx) {
-            this.logger.error(`[cds] - failed to resolve service definition for service uri ${uri}, data source [mainService]`)
+            this.logger.error(`failed to resolve service definition for service uri ${uri}, data source [mainService]`)
             return
         }
 

package/bin/build/provider/hana/2migration.js

@@ -1,13 +1,17 @@
-const DEBUG = /\b(true|y|all)\b/.test(process.env.DEBUG) && function (message) { console.warn(message ? '[DEBUG] - ' + message : '') }// eslint-disable-line
-const _warn = (message) => { DEBUG && console.error('[WARNING] [hdbmigrationtable] - ', message) }  // eslint-disable-line
 const path = require('path')
-const { MigrationTableParser } = require('./migrationtable')
+const parser = require('./migrationtable')
 const { getProperty, BuildError } = require('../../util')
+const { LOG_MODULE_NAMES } = require('../../constants')
 const cdscVersion = `-- generated by cds-compiler version ${require('@sap/cds-compiler/package.json').version}`
-const cds = require ('../../cds'), minified = csn => cds.linked(csn).minified()
-const { compiler:cdsc } = cds
+const cds = require('../../cds'), minified = csn => cds.linked(csn).minified()
+const { compiler: cdsc } = cds
+let logger = cds.log(LOG_MODULE_NAMES)
 
 module.exports = async (model, lastDevVersion, srcPath, options = {}) => {
+  if (options.logger) {
+    logger = options.logger
+  }
+
   const journalEntityNames = _getJournalEntityNames(model)
   const { definitions, deletions, migrations, afterImage } = _toHdiMigration(model, lastDevVersion, journalEntityNames, options)
   const definitionResult = []
@@ -31,13 +35,13 @@ module.exports = async (model, lastDevVersion, srcPath, options = {}) => {
 function _toHdiMigration(model, lastDevVersion, journalEntityNames, options) {
   options.sqlChangeMode = getProperty(options, 'hana.journal.change-mode')
   const result = cdsc.to.hdi.migration(minified(model), options, lastDevVersion);
-  if (DEBUG) {
-    DEBUG('cdsc.to.hdi.migration returned')
+  if (logger._debug) {
+    logger.debug('cdsc.to.hdi.migration returned')
     for (const { name, suffix, sql } of result.definitions) {
       if (suffix === '.hdbtable' || suffix === '.hdbmigrationtable') {
         if (journalEntityNames.has(name)) {
           const migration = result.migrations.find(migration => migration.name === name)
-          DEBUG(`
+          logger.debug(`
 File ${name + '.hdbmigrationtable'} - ${migration ? migration.changeset.length : 0} new changes
 ${sql}
 ${migration ? migration.changeset.map(change => change.sql).join('\n') : 'Empty changeset'}
@@ -62,7 +66,7 @@ async function _2migrationtable(srcPath, migration, tableSql, options) {
   let migrationTableModel = null
   const file = path.join(srcPath, migration.name + migration.suffix)
   try {
-    migrationTableModel = await MigrationTableParser.read(file)
+    migrationTableModel = await parser.read(file)
   } catch (e) {
     // abort build in order to ensure consistent afterImage model state / hdbmigrationtable file state
     throw new BuildError(`${path.relative(process.cwd(), file)}: ${e.message}`)
@@ -132,17 +136,15 @@ function _getJournalEntityNames(model) {
   const journalNames = new Set(cds.reflect(model).all(item => {
     if (item.kind === 'entity' && item['@cds.persistence.journal'] === true) {
       if (item['@cds.persistence.skip'] === true || item['@cds.persistence.exists'] === true) {
-        _warn(`Annotation @cds.persistence.journal skipped for entity '${item.name}' as persistence exists`)
+        logger.warn(`[hdbmigrationtable] annotation @cds.persistence.journal skipped for entity '${item.name}' as persistence exists`)
       }
       return true
     }
     return false
   }).map(entity => entity.name))
 
-  if (DEBUG) {
-    DEBUG()
-    DEBUG(`Found ${journalNames.size} model entities annotated with '@cds.persistence.journal`)
-    DEBUG(`${[...journalNames].join(', ')}`)
-  }
+  logger._debug && logger.debug(`\n[hdbmigrationtable] found ${journalNames.size} model entities annotated with '@cds.persistence.journal`)
+  logger._debug && logger.debug(`[hdbmigrationtable] ${[...journalNames].join(', ')}\n`)
+
   return journalNames
 }