@cap-js/change-tracking 2.0.0-beta.1 → 2.0.0-beta.2

package/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
-## Version 2.0.0 - TBD
+## Version 2.0.0-beta.3 - tbd
 
 ### Added
 
@@ -12,7 +12,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Changed
 
-## Version 2.0.0-beta - 27.02.26
+## Version 2.0.0-beta.2 - 11.03.26
+
+### Fixed
+- Fixed a server crash when resolving table names
+- Support entity level `@changelog` annotation where no explicit elements for the object ID are defined
+- Trigger generation works again for MTX scenarios
+
+### Changed
+- Improved performance when quering changes
+
+
+## Version 2.0.0-beta.1 - 06.03.26
 
 ### Added
 - Trigger generation for SQLite, HANA, Postgres and H2 to perform change tracking on a database level

package/_i18n/i18n.properties

@@ -37,10 +37,6 @@ Changes.modification.create=Create
 Changes.modification.update=Update
 #XFLD: Field label
 Changes.modification.delete=Delete
-#XFLD: Field label
-Changes.createdAt=Changed On
-#XFLD: Field label
-Changes.createdBy=Changed By
 
 ## Change History Table##
 ########################################

package/cds-plugin.js

@@ -9,8 +9,10 @@ const { registerHDICompilerHook } = require('./lib/hana/register.js');
 
 cds.on('loaded', enhanceModel);
 cds.on('listening', registerSessionVariableHandlers);
-cds.once('served', deploySQLiteTriggers);
-cds.once('served', deployPostgresLabels);
+cds.once('served', async () => {
+	await deploySQLiteTriggers();
+	await deployPostgresLabels();
+});
 
 registerH2CompilerHook();
 registerPostgresCompilerHook();

package/index.cds

@@ -17,8 +17,8 @@ entity aspect @(UI.Facets: [{
   @UI.PartOfPreview: false
 }]) {
       changes : Association to many ChangeView
-                  on  changes.entityKey     = ID
-                  and changes.entity        = 'ENTITY';
+                  on  changes.entityKey = ID
+                  and changes.entity    = 'ENTITY';
   key ID      : String;
 }
 
@@ -31,73 +31,60 @@ entity aspect @(UI.Facets: [{
 @readonly
 @cds.autoexpose
 view ChangeView as
-  select from Changes as change {
-    key change.ID                                        @UI.Hidden,
-    *,
-    COALESCE(
-      (
-        select text from i18nKeys
-        where
-              ID     = change.attribute
-          and locale = $user.locale
-      ), (
-        select text from i18nKeys
-        where
-              ID     = change.attribute
-          and locale = 'en'
-      ), change.attribute
-    ) as attributeLabel        : String(15) @title: '{i18n>Changes.attribute}',
-    COALESCE(
-      (
-        select text from i18nKeys
-        where
-              ID     = change.entity
-          and locale = $user.locale
-      ), (
-        select text from i18nKeys
-        where
-              ID     = change.entity
-          and locale = 'en'
-      ), change.entity
-    ) as entityLabel           : String(24) @title: '{i18n>Changes.entity}',
-    COALESCE(
-      (
-        select text from i18nKeys
-        where
-              ID     = change.modification
-          and locale = $user.locale
-      ), (
-        select text from i18nKeys
-        where
-              ID     = change.modification
-          and locale = 'en'
-      ), change.modification
-    ) as modificationLabel     : String(16) @title: '{i18n>Changes.modification}',
-    COALESCE(
-      (
-        select text from i18nKeys
-        where
-              ID     = change.objectID
-          and locale = $user.locale
-      ), (
-        select text from i18nKeys
-        where
-              ID     = change.objectID
-          and locale = 'en'
-      ), change.objectID
-    ) as objectID              : String(24) @title: '{i18n>Changes.objectID}',
-    COALESCE(
-      change.valueChangedFromLabel, change.valueChangedFrom
-    ) as valueChangedFromLabel : String(5000) @title: '{i18n>Changes.valueChangedFrom}',
-    COALESCE(
-      change.valueChangedToLabel, change.valueChangedTo
-    ) as valueChangedToLabel   : String(5000) @title: '{i18n>Changes.valueChangedTo}',
-    
-    // For the hierarchy
-    null as LimitedDescendantCount : Int16 @UI.Hidden,
-    null as DistanceFromRoot       : Int16 @UI.Hidden,
-    null as DrillState             : String @UI.Hidden,
-    null as LimitedRank            : Int16 @UI.Hidden,
+  select from Changes as change
+  left outer join i18nKeys as attributeI18n
+    on   attributeI18n.ID     = change.attribute
+    and (
+         attributeI18n.locale = $user.locale
+      or attributeI18n.locale = 'en'
+    )
+  left outer join i18nKeys as entityI18n
+    on   entityI18n.ID     = change.entity
+    and (
+         entityI18n.locale = $user.locale
+      or entityI18n.locale = 'en'
+    )
+  left outer join i18nKeys as modificationI18n
+    on   modificationI18n.ID     = change.modification
+    and (
+         modificationI18n.locale = $user.locale
+      or modificationI18n.locale = 'en'
+    )
+  {
+    key change.ID                                     @UI.Hidden,
+        change.parent: redirected to ChangeView,
+        change.children: redirected to ChangeView,
+        change.attribute,
+        change.valueChangedFrom,
+        change.valueChangedTo,
+        change.entity,
+        change.entityKey,
+        change.objectID,
+        change.modification,
+        change.valueDataType,
+        change.createdAt,
+        change.createdBy,
+        change.transactionID,
+        COALESCE(
+          attributeI18n.text, change.attribute
+        )    as attributeLabel         : String(15)   @title: '{i18n>Changes.attribute}',
+        COALESCE(
+          entityI18n.text, change.entity
+        )    as entityLabel            : String(24)   @title: '{i18n>Changes.entity}',
+        COALESCE(
+          modificationI18n.text, change.modification
+        )    as modificationLabel      : String(16)   @title: '{i18n>Changes.modification}',
+        COALESCE(
+          change.valueChangedFromLabel, change.valueChangedFrom
+        )    as valueChangedFromLabel  : String(5000) @title: '{i18n>Changes.valueChangedFrom}',
+        COALESCE(
+          change.valueChangedToLabel, change.valueChangedTo
+        )    as valueChangedToLabel    : String(5000) @title: '{i18n>Changes.valueChangedTo}',
+        // For the hierarchy
+        null as LimitedDescendantCount : Int16        @UI.Hidden,
+        null as DistanceFromRoot       : Int16        @UI.Hidden,
+        null as DrillState             : String       @UI.Hidden,
+        null as LimitedRank            : Int16        @UI.Hidden,
   };
 
 entity i18nKeys {
@@ -159,46 +146,46 @@ annotate ChangeView with @(UI: {
   },
   LineItem                            : [
     {
-      Value             : modificationLabel,
-      @UI.Importance : #Low
+      Value         : modificationLabel,
+      @UI.Importance: #Low
     },
     {
-      Value             : entityLabel,
-      @UI.Importance : #Medium
+      Value         : entityLabel,
+      @UI.Importance: #Medium
     },
     {
-      Value             : objectID,
-      @UI.Importance : #Medium
+      Value         : objectID,
+      @UI.Importance: #Medium
     },
     {
-      Value             : attributeLabel,
-      @UI.Importance : #Medium
+      Value         : attributeLabel,
+      @UI.Importance: #Medium
     },
     {
-      Value             : valueChangedToLabel,
-      @UI.Importance : #High
+      Value         : valueChangedToLabel,
+      @UI.Importance: #High
     },
     {
-      Value             : valueChangedFromLabel,
-      @UI.Importance : #High
+      Value         : valueChangedFromLabel,
+      @UI.Importance: #High
     },
     {
-      Value             : createdAt,
-      @UI.Importance : #Low
+      Value         : createdAt,
+      @UI.Importance: #Low
     },
     {
-      Value             : createdBy,
-      @UI.Importance : #High
+      Value         : createdBy,
+      @UI.Importance: #High
     },
   ],
   DeleteHidden                        : true,
 }) {
   valueChangedFrom @UI.Hidden;
-  valueChangedTo @UI.Hidden;
-  parent @UI.Hidden;
-  entityKey @UI.Hidden;
-  entity @UI.Hidden;
-  attribute @UI.Hidden;
+  valueChangedTo   @UI.Hidden;
+  parent           @UI.Hidden;
+  entityKey        @UI.Hidden;
+  entity           @UI.Hidden;
+  attribute        @UI.Hidden;
 };
 
 annotate ChangeView with @(

package/lib/h2/java-codegen.js

@@ -4,29 +4,21 @@ const { createTriggerCQN2SQL } = require('../TriggerCQN2SQL.js');
 
 const cqn4sql = require('@cap-js/db-service/lib/cqn4sql');
 
-let SQLiteCQN2SQL;
-let model;
+const _cqn2sqlCache = new WeakMap();
 
-function setModel(m) {
-	model = m;
-	SQLiteCQN2SQL = null;
-}
-
-function getModel() {
-	return model;
-}
-
-function _toSQL(query) {
-	if (!SQLiteCQN2SQL) {
+function _toSQL(query, model) {
+	let cqn2sql = _cqn2sqlCache.get(model);
+	if (!cqn2sql) {
 		const SQLiteService = require('@cap-js/sqlite');
 		const TriggerCQN2SQL = createTriggerCQN2SQL(SQLiteService.CQN2SQL);
-		SQLiteCQN2SQL = new TriggerCQN2SQL({ model: model });
+		cqn2sql = new TriggerCQN2SQL({ model: model });
+		_cqn2sqlCache.set(model, cqn2sql);
 	}
 	const sqlCQN = cqn4sql(query, model);
-	return SQLiteCQN2SQL.SELECT(sqlCQN);
+	return cqn2sql.SELECT(sqlCQN);
 }
 
-function handleAssocLookup(column, refRow) {
+function handleAssocLookup(column, refRow, model) {
 	let bindings = [];
 	let where = {};
 
@@ -56,8 +48,8 @@ function handleAssocLookup(column, refRow) {
 		const textsQuery = SELECT.one.from(localizedInfo.textsEntity).columns(columns).where(textsWhere);
 		const baseQuery = SELECT.one.from(column.target).columns(columns).where(where);
 
-		const textsSQL = _toSQL(textsQuery);
-		const baseSQL = _toSQL(baseQuery);
+		const textsSQL = _toSQL(textsQuery, model);
+		const baseSQL = _toSQL(baseQuery, model);
 
 		// Add locale binding (fetched from session variable @$user.locale)
 		const textsBindings = [...bindings, 'locale'];
@@ -73,7 +65,7 @@ function handleAssocLookup(column, refRow) {
 	const query = SELECT.one.from(column.target).columns(columns).where(where);
 
 	return {
-		sql: `(${_toSQL(query)})`,
+		sql: `(${_toSQL(query, model)})`,
 		bindings: bindings
 	};
 }
@@ -288,12 +280,12 @@ ${grandParentHelper}${parentIdHelper}
     }`;
 }
 
-function _generateCreateBody(entity, columns, objectIDs, rootEntity, rootObjectIDs, compositionParentInfo = null, grandParentCompositionInfo = null) {
+function _generateCreateBody(entity, columns, objectIDs, rootEntity, rootObjectIDs, model, compositionParentInfo = null, grandParentCompositionInfo = null) {
 	const reference = 'newRow';
 
 	// Set modification type for grandparent entry creation (must be before keysCalc which uses it)
 	const modificationTypeSetup = grandParentCompositionInfo ? 'String modificationType = "create";' : '';
-	const keysCalc = _generateKeyCalculationJava(entity, rootEntity, reference, rootObjectIDs, compositionParentInfo, grandParentCompositionInfo);
+	const keysCalc = _generateKeyCalculationJava(entity, rootEntity, reference, rootObjectIDs, model, compositionParentInfo, grandParentCompositionInfo);
 
 	// Composition parent handling - with deep linking support when grandParentCompositionInfo exists
 	let parentIdSetup = '';
@@ -314,7 +306,7 @@ function _generateCreateBody(entity, columns, objectIDs, rootEntity, rootObjectI
 		.map((col) => {
 			// Prepare Value Expression
 			const { sqlExpr, bindings } = _prepareValueExpression(col, reference);
-			const labelRes = _prepareLabelExpression(col, reference); // label expression
+			const labelRes = _prepareLabelExpression(col, reference, model); // label expression
 
 			// SQL Statement - include PARENT_ID if composition parent info exists
 			const insertSQL = compositionParentInfo
@@ -346,12 +338,12 @@ function _generateCreateBody(entity, columns, objectIDs, rootEntity, rootObjectI
 	return `${modificationTypeSetup}\n${keysCalc}\n${parentIdSetup}\n${columnBlocks}`;
 }
 
-function _generateUpdateBody(entity, columns, objectIDs, rootEntity, rootObjectIDs, compositionParentInfo = null, grandParentCompositionInfo = null) {
+function _generateUpdateBody(entity, columns, objectIDs, rootEntity, rootObjectIDs, model, compositionParentInfo = null, grandParentCompositionInfo = null) {
 	const reference = 'newRow';
 
 	// Set modification type for grandparent entry creation (must be before keysCalc which uses it)
 	const modificationTypeSetup = grandParentCompositionInfo ? 'String modificationType = "update";' : '';
-	const keysCalc = _generateKeyCalculationJava(entity, rootEntity, reference, rootObjectIDs, compositionParentInfo, grandParentCompositionInfo);
+	const keysCalc = _generateKeyCalculationJava(entity, rootEntity, reference, rootObjectIDs, model, compositionParentInfo, grandParentCompositionInfo);
 
 	// Composition parent handling - with deep linking support when grandParentCompositionInfo exists
 	let parentIdSetup = '';
@@ -374,8 +366,8 @@ function _generateUpdateBody(entity, columns, objectIDs, rootEntity, rootObjectI
 			const newRes = _prepareValueExpression(col, 'newRow');
 			const oldRes = _prepareValueExpression(col, 'oldRow');
 			// Prepare new and old Label (lookup values if col.alt exists)
-			const newLabelRes = _prepareLabelExpression(col, 'newRow');
-			const oldLabelRes = _prepareLabelExpression(col, 'oldRow');
+			const newLabelRes = _prepareLabelExpression(col, 'newRow', model);
+			const oldLabelRes = _prepareLabelExpression(col, 'oldRow', model);
 
 			// Check column values from ResultSet for Change Logic
 			let checkCols = [col.name];
@@ -420,12 +412,12 @@ function _generateUpdateBody(entity, columns, objectIDs, rootEntity, rootObjectI
 	return `${modificationTypeSetup}\n${keysCalc}\n${parentIdSetup}\n${columnBlocks}`;
 }
 
-function _generateDeleteBody(entity, columns, objectIDs, rootEntity, rootObjectIDs, compositionParentInfo = null, grandParentCompositionInfo = null) {
+function _generateDeleteBody(entity, columns, objectIDs, rootEntity, rootObjectIDs, model, compositionParentInfo = null, grandParentCompositionInfo = null) {
 	const reference = 'oldRow';
 
 	// Set modification type for grandparent entry creation (must be before keysCalc which uses it)
 	const modificationTypeSetup = grandParentCompositionInfo ? 'String modificationType = "delete";' : '';
-	const keysCalc = _generateKeyCalculationJava(entity, rootEntity, reference, rootObjectIDs, compositionParentInfo, grandParentCompositionInfo);
+	const keysCalc = _generateKeyCalculationJava(entity, rootEntity, reference, rootObjectIDs, model, compositionParentInfo, grandParentCompositionInfo);
 
 	// First delete existing changelogs for this entity
 	const deleteSQL = `DELETE FROM sap_changelog_Changes WHERE ENTITY = ? AND ENTITYKEY = ?`;
@@ -452,7 +444,7 @@ function _generateDeleteBody(entity, columns, objectIDs, rootEntity, rootObjectI
 			// Prepare Old Value (raw FK value)
 			const { sqlExpr, bindings } = _prepareValueExpression(col, reference);
 			// Prepare Old Label (lookup value if col.alt exists)
-			const labelRes = _prepareLabelExpression(col, reference);
+			const labelRes = _prepareLabelExpression(col, reference, model);
 
 			// SQL Statement - include PARENT_ID if composition parent info exists
 			const insertSQL = compositionParentInfo
@@ -487,12 +479,12 @@ function _generateDeleteBody(entity, columns, objectIDs, rootEntity, rootObjectI
         ${columnBlocks}`;
 }
 
-function _generateDeleteBodyPreserve(entity, columns, objectIDs, rootEntity, rootObjectIDs, compositionParentInfo = null, grandParentCompositionInfo = null) {
+function _generateDeleteBodyPreserve(entity, columns, objectIDs, rootEntity, rootObjectIDs, model, compositionParentInfo = null, grandParentCompositionInfo = null) {
 	const reference = 'oldRow';
 
 	// Set modification type for grandparent entry creation (must be before keysCalc which uses it)
 	const modificationTypeSetup = grandParentCompositionInfo ? 'String modificationType = "delete";' : '';
-	const keysCalc = _generateKeyCalculationJava(entity, rootEntity, reference, rootObjectIDs, compositionParentInfo, grandParentCompositionInfo);
+	const keysCalc = _generateKeyCalculationJava(entity, rootEntity, reference, rootObjectIDs, model, compositionParentInfo, grandParentCompositionInfo);
 
 	// Composition parent handling - with deep linking support when grandParentCompositionInfo exists
 	let parentIdSetup = '';
@@ -514,7 +506,7 @@ function _generateDeleteBodyPreserve(entity, columns, objectIDs, rootEntity, roo
 			// Prepare Old Value (raw FK value)
 			const { sqlExpr, bindings } = _prepareValueExpression(col, reference);
 			// Prepare Old Label (lookup value if col.alt exists)
-			const labelRes = _prepareLabelExpression(col, reference);
+			const labelRes = _prepareLabelExpression(col, reference, model);
 
 			// SQL Statement - include PARENT_ID if composition parent info exists
 			const insertSQL = compositionParentInfo
@@ -545,13 +537,13 @@ function _generateDeleteBodyPreserve(entity, columns, objectIDs, rootEntity, roo
 	return `${modificationTypeSetup}\n${keysCalc}\n${parentIdSetup}\n${columnBlocks}`;
 }
 
-function _generateKeyCalculationJava(entity, rootEntity, ref, rootObjectIDs, compositionParentInfo = null, grandParentCompositionInfo = null) {
+function _generateKeyCalculationJava(entity, rootEntity, ref, rootObjectIDs, model, compositionParentInfo = null, grandParentCompositionInfo = null) {
 	// extract keys for entity (entity.keys is undefined)
 	let keys = utils.extractKeys(entity.keys);
 	const entityKeyExp = keys.map((k) => `${ref}.getString("${k}")`).join(' + "||" + ');
 
 	const objectIDs = utils.getObjectIDs(entity, model);
-	const objectIDBlock = _generateObjectIDCalculation(objectIDs, entity, ref);
+	const objectIDBlock = _generateObjectIDCalculation(objectIDs, entity, ref, model);
 
 	// Add parent key calculation for composition parent linking
 	let parentKeyBlock = '';
@@ -589,7 +581,7 @@ function _generateKeyCalculationJava(entity, rootEntity, ref, rootObjectIDs, com
 		}
 
 		// Compute parent objectID (the display name of the composition parent entity)
-		const parentObjectIDCalcBlock = _generateParentObjectIDCalculation(rootObjectIDs, rootEntity, ref, entity);
+		const parentObjectIDCalcBlock = _generateParentObjectIDCalculation(rootObjectIDs, rootEntity, ref, entity, model);
 		parentObjectIDBlock = parentObjectIDCalcBlock;
 
 		if (grandParentCompositionInfo && !parentKeyBinding.type) {
@@ -683,9 +675,9 @@ function _prepareValueExpression(col, rowVar) {
 }
 
 // Returns label expression for a column
-function _prepareLabelExpression(col, rowVar) {
+function _prepareLabelExpression(col, rowVar, model) {
 	if (col.target && col.alt) {
-		const { sql, bindings } = handleAssocLookup(col, rowVar);
+		const { sql, bindings } = handleAssocLookup(col, rowVar, model);
 		return { sqlExpr: sql, bindings: bindings };
 	}
 	// No label for scalars or associations without @changelog override
@@ -704,7 +696,7 @@ function _wrapInTryCatch(sql, bindings) {
             }`;
 }
 
-function _generateObjectIDCalculation(objectIDs, entity, refRow) {
+function _generateObjectIDCalculation(objectIDs, entity, refRow, model) {
 	// fallback to entity name (will be translated via i18nKeys in ChangeView)
 	if (!objectIDs || objectIDs.length === 0) {
 		return `String objectID = "${entity.name}";`;
@@ -727,7 +719,7 @@ function _generateObjectIDCalculation(objectIDs, entity, refRow) {
 			}, {});
 
 			const query = SELECT.one.from(entity.name).columns(oid.name).where(where);
-			const sql = `(${_toSQL(query)})`;
+			const sql = `(${_toSQL(query, model)})`;
 
 			parts.push(`SELECT CAST(${sql} AS VARCHAR) AS val`);
 
@@ -761,7 +753,7 @@ function _generateObjectIDCalculation(objectIDs, entity, refRow) {
  * This is used when a child entity has a tracked composition parent — the parent's
  * changelog entry needs a meaningful objectID rather than just the key.
  */
-function _generateParentObjectIDCalculation(rootObjectIDs, rootEntity, refRow, childEntity) {
+function _generateParentObjectIDCalculation(rootObjectIDs, rootEntity, refRow, childEntity, model) {
 	if (!rootObjectIDs || rootObjectIDs.length === 0) {
 		const rootEntityName = rootEntity ? rootEntity.name : '';
 		return `String parentObjectID = "${rootEntityName}";`;
@@ -798,7 +790,7 @@ function _generateParentObjectIDCalculation(rootObjectIDs, rootEntity, refRow, c
 
 			const targetEntity = isCompositionOfOne ? binding.rootEntityName : rootEntity.name;
 			const query = SELECT.one.from(targetEntity).columns(oid.name).where(where);
-			const sql = `(${_toSQL(query)})`;
+			const sql = `(${_toSQL(query, model)})`;
 
 			parts.push(`SELECT CAST(${sql} AS VARCHAR) AS val`);
 
@@ -833,8 +825,6 @@ function _generateParentObjectIDCalculation(rootObjectIDs, rootEntity, refRow, c
 }
 
 module.exports = {
-	setModel,
-	getModel,
 	_generateJavaMethod,
 	_generateCreateBody,
 	_generateUpdateBody,

package/lib/h2/triggers.js

@@ -1,10 +1,9 @@
 const utils = require('../utils/change-tracking.js');
 const config = require('@sap/cds').env.requires['change-tracking'];
 const { getCompositionParentInfo, getGrandParentCompositionInfo } = require('../utils/composition-helpers.js');
-const { setModel, _generateJavaMethod, _generateCreateBody, _generateUpdateBody, _generateDeleteBody, _generateDeleteBodyPreserve } = require('./java-codegen.js');
+const { _generateJavaMethod, _generateCreateBody, _generateUpdateBody, _generateDeleteBody, _generateDeleteBodyPreserve } = require('./java-codegen.js');
 
 function generateH2Trigger(csn, entity, rootEntity, mergedAnnotations = null, rootMergedAnnotations = null, grandParentContext = {}) {
-	setModel(csn);
 	const { columns: trackedColumns } = utils.extractTrackedColumns(entity, csn, mergedAnnotations);
 	const objectIDs = utils.getObjectIDs(entity, csn, mergedAnnotations?.entityAnnotation);
 	const rootObjectIDs = utils.getObjectIDs(rootEntity, csn, rootMergedAnnotations?.entityAnnotation);
@@ -21,13 +20,13 @@ function generateH2Trigger(csn, entity, rootEntity, mergedAnnotations = null, ro
 	if (!shouldGenerateTriggers) return null;
 
 	// Generate the Java code for each section
-	const createBody = !config?.disableCreateTracking ? _generateCreateBody(entity, trackedColumns, objectIDs, rootEntity, rootObjectIDs, compositionParentInfo, grandParentCompositionInfo) : '';
-	const updateBody = !config?.disableUpdateTracking ? _generateUpdateBody(entity, trackedColumns, objectIDs, rootEntity, rootObjectIDs, compositionParentInfo, grandParentCompositionInfo) : '';
+	const createBody = !config?.disableCreateTracking ? _generateCreateBody(entity, trackedColumns, objectIDs, rootEntity, rootObjectIDs, csn, compositionParentInfo, grandParentCompositionInfo) : '';
+	const updateBody = !config?.disableUpdateTracking ? _generateUpdateBody(entity, trackedColumns, objectIDs, rootEntity, rootObjectIDs, csn, compositionParentInfo, grandParentCompositionInfo) : '';
 	let deleteBody = '';
 	if (!config?.disableDeleteTracking) {
 		deleteBody = config?.preserveDeletes
-			? _generateDeleteBodyPreserve(entity, trackedColumns, objectIDs, rootEntity, rootObjectIDs, compositionParentInfo, grandParentCompositionInfo)
-			: _generateDeleteBody(entity, trackedColumns, objectIDs, rootEntity, rootObjectIDs, compositionParentInfo, grandParentCompositionInfo);
+			? _generateDeleteBodyPreserve(entity, trackedColumns, objectIDs, rootEntity, rootObjectIDs, csn, compositionParentInfo, grandParentCompositionInfo)
+			: _generateDeleteBody(entity, trackedColumns, objectIDs, rootEntity, rootObjectIDs, csn, compositionParentInfo, grandParentCompositionInfo);
 	}
 
 	// Define the full Create Trigger SQL

package/lib/hana/composition.js

@@ -1,14 +1,16 @@
 const utils = require('../utils/change-tracking.js');
-const { getModel, toSQL, compositeKeyExpr, buildGrandParentObjectIDExpr } = require('./sql-expressions.js');
+const { toSQL, compositeKeyExpr, buildGrandParentObjectIDExpr } = require('./sql-expressions.js');
 
 /**
  * Builds rootObjectID select for composition of many
  */
-function buildCompOfManyRootObjectIDSelect(rootEntity, rootObjectIDs, binding, refRow) {
-	if (!rootObjectIDs || rootObjectIDs.length === 0) return `'${rootEntity.name}'`;
+function buildCompOfManyRootObjectIDSelect(rootEntity, rootObjectIDs, binding, refRow, model) {
+	const rootEntityKeyExpr = compositeKeyExpr(binding.map((k) => `:${refRow}.${k}`));
+
+	if (!rootObjectIDs || rootObjectIDs.length === 0) return rootEntityKeyExpr;
 
 	const rootKeys = utils.extractKeys(rootEntity.keys);
-	if (rootKeys.length !== binding.length) return `'${rootEntity.name}'`;
+	if (rootKeys.length !== binding.length) return rootEntityKeyExpr;
 
 	const where = {};
 	for (let i = 0; i < rootKeys.length; i++) {
@@ -18,11 +20,10 @@ function buildCompOfManyRootObjectIDSelect(rootEntity, rootObjectIDs, binding, r
 	const parts = [];
 	for (const oid of rootObjectIDs) {
 		const query = SELECT.one.from(rootEntity.name).columns(oid.name).where(where);
-		parts.push(`COALESCE(TO_NVARCHAR((${toSQL(query)})), '')`);
+		parts.push(`COALESCE(TO_NVARCHAR((${toSQL(query, model)})), '')`);
 	}
 
 	const concatLogic = parts.join(" || ', ' || ");
-	const rootEntityKeyExpr = compositeKeyExpr(binding.map((k) => `:${refRow}.${k}`));
 
 	return `COALESCE(NULLIF(${concatLogic}, ''), ${rootEntityKeyExpr})`;
 }
@@ -32,8 +33,7 @@ function buildCompOfManyRootObjectIDSelect(rootEntity, rootObjectIDs, binding, r
  * In composition of one, the parent entity has FK to the child (e.g., BookStores.registry_ID -> BookStoreRegistry.ID)
  * So we need to do a reverse lookup: find the parent record that has FK pointing to this child.
  */
-function buildCompositionOfOneParentContext(compositionParentInfo, rootObjectIDs, modification, rowRef) {
-	const model = getModel();
+function buildCompositionOfOneParentContext(compositionParentInfo, rootObjectIDs, modification, rowRef, model) {
 	const { parentEntityName, compositionFieldName, parentKeyBinding } = compositionParentInfo;
 	const { compositionName, childKeys } = parentKeyBinding;
 
@@ -101,23 +101,21 @@ function buildCompositionOfOneParentContext(compositionParentInfo, rootObjectIDs
 	return { declares, insertSQL, parentEntityName, compositionFieldName, parentKeyExpr };
 }
 
-function buildCompositionParentContext(compositionParentInfo, rootObjectIDs, modification, rowRef, grandParentCompositionInfo = null) {
-	const model = getModel();
+function buildCompositionParentContext(compositionParentInfo, rootObjectIDs, modification, rowRef, model, grandParentCompositionInfo = null) {
 	const { parentEntityName, compositionFieldName, parentKeyBinding } = compositionParentInfo;
 
 	// Handle composition of one (parent has FK to child - need reverse lookup)
 	if (parentKeyBinding.type === 'compositionOfOne') {
-		return buildCompositionOfOneParentContext(compositionParentInfo, rootObjectIDs, modification, rowRef);
+		return buildCompositionOfOneParentContext(compositionParentInfo, rootObjectIDs, modification, rowRef, model);
 	}
 
 	const parentKeyExpr = compositeKeyExpr(parentKeyBinding.map((k) => `:${rowRef}.${k}`));
 
 	// Build rootObjectID expression for the parent entity
 	const rootEntity = model.definitions[parentEntityName];
-	const rootObjectIDExpr = buildCompOfManyRootObjectIDSelect(rootEntity, rootObjectIDs, parentKeyBinding, rowRef);
+	const rootObjectIDExpr = buildCompOfManyRootObjectIDSelect(rootEntity, rootObjectIDs, parentKeyBinding, rowRef, model);
 
-	let declares = 'DECLARE parent_id NVARCHAR(36);';
-	let insertSQL;
+	let declares, insertSQL;
 
 	if (grandParentCompositionInfo) {
 		// When we have grandparent info, we need to:
@@ -134,7 +132,7 @@ function buildCompositionParentContext(compositionParentInfo, rootObjectIDs, mod
 		// Build grandparent objectID expression
 		const grandParentEntity = model.definitions[grandParentEntityName];
 		const grandParentObjectIDs = utils.getObjectIDs(grandParentEntity, model);
-		const grandParentObjectIDExpr = grandParentObjectIDs?.length > 0 ? buildGrandParentObjectIDExpr(grandParentObjectIDs, grandParentEntity, parentEntityName, parentKeyBinding, grandParentKeyBinding, rowRef) : grandParentKeyExpr;
+		const grandParentObjectIDExpr = grandParentObjectIDs?.length > 0 ? buildGrandParentObjectIDExpr(grandParentObjectIDs, grandParentEntity, parentEntityName, parentKeyBinding, grandParentKeyBinding, rowRef, model) : grandParentKeyExpr;
 
 		// Add grandparent_id to declares
 		declares = 'DECLARE parent_id NVARCHAR(36);\n\tDECLARE grandparent_id NVARCHAR(36);';