@cap-js/change-tracking 2.0.0-beta.5 → 2.0.0-beta.6

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-beta.6 - tbd
+## Version 2.0.0-beta.7 - tbd
 
 ### Added
 
@@ -12,6 +12,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Changed
 
+## Version 2.0.0-beta.6 - 26.03.26
+
+### Added
+- Provide detailed plan for v1 to v2 HANA migration
+- Generation of `.hdbmigrationtable` and updating `undeploy.json` via `cds add change-tracking-migration`
+- HANA procedure `SAP_CHANGELOG_RESTORE_BACKLINKS` to restore parent-child hierarchy for composition changes
+
+### Fixed
+- Explicit type casts for Date, DateTime, Time, Timestamp and Decimal fields in `ChangeView` to avoid conversion errors
+- Lazy load database adapters to prevent crashes when optional dependencies are not installed
+- Skip changelogs referencing association targets annotated with `@cds.persistence.skip`
+- Cast single entity keys to `cds.String` to prevent type conversion errors
+- Dynamic localization now verifies `.texts` entity existence before attempting localized lookup
+
+
 ## Version 2.0.0-beta.5 - 17.03.26
 
 ### Added

package/cds-plugin.js

@@ -17,3 +17,5 @@ cds.once('served', async () => {
 registerH2CompilerHook();
 registerPostgresCompilerHook();
 registerHDICompilerHook();
+
+cds.add?.register?.('change-tracking-migration', require('./lib/addMigrationTable.js'));

package/index.cds

@@ -45,17 +45,11 @@ view ChangeView as
     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,
+        // Needed to make the * possible
+        attributeI18n.locale @UI.Hidden,
+        attributeI18n.text @UI.Hidden,
+        // * is important to allow for application extensions of Changes
+        *,
         COALESCE(
           attributeI18n.text, (
             select text from i18nKeys
@@ -89,9 +83,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.DateTime'
-                 then COALESCE(
+                 then cast(COALESCE(
                         change.valueChangedFromLabel, change.valueChangedFrom
-                      )
+                      ) as DateTime)
             else null
           end
         )    as valueChangedFromLabelDateTime    : DateTime     @(title: '{i18n>Changes.valueChangedFrom}',
@@ -99,9 +93,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.DateTime' or valueDataType = 'cds.Timestamp'
-                 then COALESCE(
+                 then cast(COALESCE(
                         change.valueChangedFromLabel, change.valueChangedFrom
-                      )
+                      ) as DateTime)
             else null
           end
         )    as valueChangedFromLabelDateTimeWTZ : DateTime     @(
@@ -111,9 +105,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.Time'
-                 then COALESCE(
+                 then cast(COALESCE(
                         change.valueChangedFromLabel, change.valueChangedFrom
-                      )
+                      ) as Time)
             else null
           end
         )    as valueChangedFromLabelTime        : Time         @(title: '{i18n>Changes.valueChangedFrom}',
@@ -121,9 +115,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.Date'
-                 then COALESCE(
+                 then cast(COALESCE(
                         change.valueChangedFromLabel, change.valueChangedFrom
-                      )
+                      ) as Date)
             else null
           end
         )    as valueChangedFromLabelDate        : Date         @(title: '{i18n>Changes.valueChangedFrom}',
@@ -131,9 +125,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.Timestamp'
-                 then COALESCE(
+                 then cast(COALESCE(
                         change.valueChangedFromLabel, change.valueChangedFrom
-                      )
+                      ) as Timestamp)
             else null
           end
         )    as valueChangedFromLabelTimestamp   : Timestamp    @(title: '{i18n>Changes.valueChangedFrom}',
@@ -141,9 +135,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.Decimal'
-                 then COALESCE(
+                 then cast(COALESCE(
                         change.valueChangedFromLabel, change.valueChangedFrom
-                      )
+                      ) as Decimal)
             else null
           end
         )    as valueChangedFromLabelDecimal     : Decimal      @(title: '{i18n>Changes.valueChangedFrom}',
@@ -157,9 +151,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.DateTime'
-                 then COALESCE(
+                 then cast(COALESCE(
                         change.valueChangedToLabel, change.valueChangedTo
-                      )
+                      ) as DateTime)
             else null
           end
         )    as valueChangedToLabelDateTime      : DateTime     @(title: '{i18n>Changes.valueChangedTo}',
@@ -167,9 +161,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.DateTime' or valueDataType = 'cds.Timestamp'
-                 then COALESCE(
-                        change.valueChangedFromLabel, change.valueChangedTo
-                      )
+                 then cast(COALESCE(
+                        change.valueChangedToLabel, change.valueChangedTo
+                      ) as DateTime)
             else null
           end
         )    as valueChangedToLabelDateTimeWTZ   : DateTime     @(
@@ -179,9 +173,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.Time'
-                 then COALESCE(
+                 then cast(COALESCE(
                         change.valueChangedToLabel, change.valueChangedTo
-                      )
+                      ) as Time)
             else null
           end
         )    as valueChangedToLabelTime          : Time         @(title: '{i18n>Changes.valueChangedTo}',
@@ -189,9 +183,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.Date'
-                 then COALESCE(
+                 then cast(COALESCE(
                         change.valueChangedToLabel, change.valueChangedTo
-                      )
+                      ) as Date)
             else null
           end
         )    as valueChangedToLabelDate          : Date         @(title: '{i18n>Changes.valueChangedTo}',
@@ -199,9 +193,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.Timestamp'
-                 then COALESCE(
+                 then cast(COALESCE(
                         change.valueChangedToLabel, change.valueChangedTo
-                      )
+                      ) as Timestamp)
             else null
           end
         )    as valueChangedToLabelTimestamp     : Timestamp    @(title: '{i18n>Changes.valueChangedTo}',
@@ -209,9 +203,9 @@ view ChangeView as
         (
           case
             when valueDataType = 'cds.Decimal'
-                 then COALESCE(
+                 then cast(COALESCE(
                         change.valueChangedToLabel, change.valueChangedTo
-                      )
+                      ) as Decimal)
             else null
           end
         )    as valueChangedToLabelDecimal       : Decimal      @(title: '{i18n>Changes.valueChangedTo}',

package/lib/addMigrationTable.js

@@ -0,0 +1,59 @@
+const cds = require('@sap/cds');
+const { fs, path } = cds.utils;
+const { join } = path;
+
+const MIGRATION_TABLE_PATH = join('db', 'src', 'sap.changelog.Changes.hdbmigrationtable');
+const UNDEPLOY_JSON_PATH = join('db', 'undeploy.json');
+
+const UNDEPLOY_ENTRIES = ['src/gen/**/sap.changelog.Changes.hdbtable', 'src/gen/**/sap.changelog.ChangeLog.hdbtable'];
+
+const LOG = cds.log('change-tracking');
+
+const { getMigrationTableSQL } = require('./hana/migrationTable.js');
+
+module.exports = class extends cds.add.Plugin {
+	async run() {
+		if (fs.existsSync(MIGRATION_TABLE_PATH)) {
+			const existing = fs.readFileSync(MIGRATION_TABLE_PATH, 'utf8');
+			const versionMatch = [...existing.matchAll(/==\s*version=(\d+)/g)];
+			const latestVersion = versionMatch.length > 0 ? Math.max(...versionMatch.map((m) => parseInt(m[1]))) : 1;
+
+			if (latestVersion >= 2) {
+				LOG.warn(`Migration table already exists at ${MIGRATION_TABLE_PATH} (latest version: ${latestVersion}). ` + `Only the initial v1 -> v2 migration is supported by this command. ` + `Please add new migration steps manually.`);
+				return;
+			}
+
+			// Rewrite file with v2 DDL and migration (replaces v1 content)
+			fs.writeFileSync(MIGRATION_TABLE_PATH, getMigrationTableSQL());
+			LOG.info(`Updated ${MIGRATION_TABLE_PATH} with v2 migration`);
+		} else {
+			// Write the migration table file
+			const dir = join('db', 'src');
+			if (!fs.existsSync(dir)) {
+				fs.mkdirSync(dir, { recursive: true });
+			}
+			fs.writeFileSync(MIGRATION_TABLE_PATH, getMigrationTableSQL());
+			LOG.info(`Created ${MIGRATION_TABLE_PATH}`);
+		}
+
+		// Update undeploy.json
+		let undeploy = [];
+		if (fs.existsSync(UNDEPLOY_JSON_PATH)) {
+			undeploy = JSON.parse(fs.readFileSync(UNDEPLOY_JSON_PATH, 'utf8'));
+		}
+		if (!Array.isArray(undeploy)) undeploy = [];
+
+		let changed = false;
+		for (const entry of UNDEPLOY_ENTRIES) {
+			if (!undeploy.includes(entry)) {
+				undeploy.push(entry);
+				changed = true;
+			}
+		}
+
+		if (changed) {
+			fs.writeFileSync(UNDEPLOY_JSON_PATH, JSON.stringify(undeploy, null, 4) + '\n');
+			LOG.info(`Updated ${UNDEPLOY_JSON_PATH} with old .hdbtable entries`);
+		}
+	}
+};

package/lib/csn-enhancements/dynamicLocalization.js

@@ -37,7 +37,7 @@ function collectTrackedPropertiesWithDynamicLocalization(serviceName, m) {
 				continue;
 			}
 
-			if (!dynamicLocalizationProperties.some((prop) => prop.property === basePropertyName && prop.entity === base.baseRef)) {
+			if (!dynamicLocalizationProperties.some((prop) => prop.property === basePropertyName && prop.entity === base.baseRef) && m.definitions[target + '.texts']) {
 				dynamicLocalizationProperties.push({
 					property: basePropertyName,
 					entity: base.baseRef,

package/lib/csn-enhancements/index.js

@@ -21,7 +21,7 @@ function entityKey4(entity) {
 			keys.push({ ref: [k] });
 		}
 	}
-	if (keys.length <= 1) return keys;
+	if (keys.length <= 1) return keys.map((k) => ({ ...k, cast: { type: 'cds.String' } }));
 
 	const xpr = [];
 	for (let i = 0; i < keys.length; i++) {

package/lib/csn-enhancements/timezoneProperties.js

@@ -46,9 +46,9 @@ function enhanceChangeViewWithTimeZones(changeView, m) {
 			? compositeKeyExprHANA
 			: isDeploy2Check('postgres') && m.meta.creator.match(/v6/)
 				? compositeKeyExprPG
-				: cds.env.requires?.db.kind === 'sqlite' && !cds.build
+				: cds.env.requires?.db?.kind === 'sqlite' && !cds.build
 					? compositeKeyExprSqlite
-					: cds.env.requires?.db.kind === 'postgres' && (!cds.build || cds.env.profiles.includes('pg'))
+					: cds.env.requires?.db?.kind === 'postgres' && (!cds.build || cds.env.profiles.includes('pg'))
 						? compositeKeyExprPG
 						: compositeKeyExprHANA;
 	const timezoneProperties = collectTrackedPropertiesWithTimezone(m);

package/lib/hana/migrationTable.js

@@ -0,0 +1,69 @@
+/**
+ * Returns the .hdbmigrationtable content for migrating sap.changelog.Changes from v1 to v2.
+ */
+
+function getMigrationTableSQL() {
+	return `== version=2
+COLUMN TABLE sap_changelog_Changes (
+  ID NVARCHAR(36) NOT NULL,
+  parent_ID NVARCHAR(36),
+  attribute NVARCHAR(127),
+  valueChangedFrom NVARCHAR(5000),
+  valueChangedTo NVARCHAR(5000),
+  valueChangedFromLabel NVARCHAR(5000),
+  valueChangedToLabel NVARCHAR(5000),
+  entity NVARCHAR(150),
+  entityKey NVARCHAR(5000),
+  objectID NVARCHAR(5000),
+  modification NVARCHAR(6),
+  valueDataType NVARCHAR(5000),
+  createdAt TIMESTAMP,
+  createdBy NVARCHAR(255),
+  transactionID BIGINT,
+  PRIMARY KEY(ID)
+)
+
+== migration=2
+RENAME COLUMN sap_changelog_Changes.entityID TO objectID;
+
+ALTER TABLE sap_changelog_Changes ADD (parent_ID NVARCHAR(36), valueChangedFromLabel NVARCHAR(5000), valueChangedToLabel NVARCHAR(5000), transactionID BIGINT);
+
+-- Adjust entityKey structure
+RENAME COLUMN sap_changelog_Changes.keys TO entityKey;
+UPDATE SAP_CHANGELOG_CHANGES
+SET entityKey =
+    CASE
+        WHEN LOCATE(entityKey, '=') > 0 THEN
+              TRIM(SUBSTRING(entityKey, LOCATE(entityKey, '=') + 1))
+        ELSE
+            NULL
+    END;
+
+-- Copy changelog_ID into transactionID
+UPDATE SAP_CHANGELOG_CHANGES SET transactionID = CAST(SECONDS_BETWEEN(createdAt, TO_TIMESTAMP('1970-01-01 00:00:00')) * -1000 AS BIGINT);
+
+-- Column migration for attribute, entity and modification
+ALTER TABLE sap_changelog_Changes ADD (attribute_tmp NVARCHAR(127), entity_tmp NVARCHAR(150), modification_tmp NVARCHAR(6));
+
+-- Copy data into temp columns
+UPDATE sap_changelog_Changes SET attribute_tmp = attribute;
+UPDATE sap_changelog_Changes SET entity_tmp = entity;
+UPDATE sap_changelog_Changes SET modification_tmp = modification;
+
+ALTER TABLE sap_changelog_Changes DROP (attribute, entity, modification);
+
+ALTER TABLE sap_changelog_Changes ADD (attribute NVARCHAR(127), entity NVARCHAR(150), modification NVARCHAR(6));
+
+-- Restore data from temp columns
+UPDATE sap_changelog_Changes SET attribute = attribute_tmp;
+UPDATE sap_changelog_Changes SET entity = entity_tmp;
+UPDATE sap_changelog_Changes SET modification = modification_tmp;
+
+ALTER TABLE sap_changelog_Changes DROP (attribute_tmp, entity_tmp, modification_tmp);
+
+-- Drop columns that are no longer needed
+ALTER TABLE sap_changelog_Changes DROP (serviceEntity, parentEntityID, parentKey, serviceEntityPath, changeLog_ID);
+`;
+}
+
+module.exports = { getMigrationTableSQL };

package/lib/hana/register.js

@@ -3,6 +3,12 @@ const cds = require('@sap/cds');
 const { prepareCSNForTriggers, generateTriggersForEntities, ensureUndeployJsonHasTriggerPattern } = require('../utils/trigger-utils.js');
 const { getLabelTranslations } = require('../localization.js');
 
+const MIGRATION_TABLE_PATH = cds.utils.path.join('db', 'src', 'sap.changelog.Changes.hdbmigrationtable');
+
+function hasMigrationTable() {
+	return cds.utils.fs.existsSync(MIGRATION_TABLE_PATH);
+}
+
 function registerHDICompilerHook() {
 	const _hdi_migration = cds.compiler.to.hdi.migration;
 	cds.compiler.to.hdi.migration = function (csn, options, beforeImage) {
@@ -38,20 +44,37 @@ function registerHDICompilerHook() {
 			);
 		}
 
+		const config = cds.env.requires?.['change-tracking'];
+
+		// Generate restore backlinks procedure if enabled via feature flag
+		if (config?.procedureForRestoringBacklinks) {
+			const { generateRestoreBacklinksProcedure } = require('./restoreProcedure.js');
+			const procedure = generateRestoreBacklinksProcedure(runtimeCSN, hierarchy, entities);
+			if (procedure) data.push(procedure);
+		}
+
+		// Auto-detect migration table created by `cds add change-tracking`
+		if (hasMigrationTable()) {
+			csn.definitions['sap.changelog.Changes']['@cds.persistence.journal'] = true;
+		}
+
 		const ret = _hdi_migration(csn, options, beforeImage);
 		ret.definitions = ret.definitions.concat(triggers).concat(data);
 		return ret;
 	};
 
-	// REVISIT: Remove once time casting is fixed in cds-dbs
-	cds.on('serving', async () => {
-		if (cds.env.requires?.db.kind !== 'hana') return;
-		const db = await cds.connect.to('db');
-		db.before('*', () => {
-			// to_time conversion is necessary else HANA tries to convert to timestamp implicitly causing an SQL crash
-			db.class.CQN2SQL.OutputConverters.Time = (e) => `to_char(to_time(${e}), 'HH24:MI:SS')`;
-		});
-	});
+	// When a migration table file exists in db/src/, strip compiler-generated changesets for sap.changelog.Changes
+	// Prevent auto-generation of additional migration steps by the build
+	const _compile_to_hana = cds.compile.to.hana;
+	cds.compile.to.hana = function (csn, o, beforeCsn) {
+		if (hasMigrationTable() && beforeCsn) {
+			// Remove the Changes entity from the beforeImage so the compiler
+			const beforeClone = structuredClone(beforeCsn);
+			delete beforeClone.definitions?.['sap.changelog.Changes'];
+			return _compile_to_hana.call(this, csn, o, beforeClone);
+		}
+		return _compile_to_hana.call(this, csn, o, beforeCsn);
+	};
 }
 
 module.exports = { registerHDICompilerHook };

package/lib/hana/restoreProcedure.js

@@ -0,0 +1,342 @@
+const utils = require('../utils/change-tracking.js');
+const { getCompositionParentInfo, getGrandParentCompositionInfo } = require('../utils/composition-helpers.js');
+const { compositeKeyExpr } = require('./sql-expressions.js');
+
+/**
+ * Generates a HANA stored procedure that restores parent backlinks for composition changes.
+ *
+ * The procedure:
+ * 1. Finds all change entries for composition child entities that have no parent_ID set
+ * 2. Uses the child data table to resolve the parent entity key via FK lookup
+ * 3. Creates a parent composition entry (valueDataType='cds.Composition') if one doesn't exist
+ * 4. Updates child entries to set parent_ID pointing to the parent composition entry
+ * 5. Links composition entries to their grandparent composition entries (for deep hierarchies)
+ *
+ */
+function generateRestoreBacklinksProcedure(runtimeCSN, hierarchy, entities) {
+	const compositions = _collectCompositionInfo(runtimeCSN, hierarchy, entities);
+	if (compositions.length === 0) return null;
+
+	const blocks = compositions.map((comp) => _generateCompositionBlock(comp));
+
+	const procedureSQL = `PROCEDURE "SAP_CHANGELOG_RESTORE_BACKLINKS" ()
+	LANGUAGE SQLSCRIPT
+	SQL SECURITY INVOKER
+AS
+BEGIN
+${blocks.join('\n')}
+END`;
+
+	return {
+		name: 'SAP_CHANGELOG_RESTORE_BACKLINKS',
+		sql: procedureSQL,
+		suffix: '.hdbprocedure'
+	};
+}
+
+function _collectCompositionInfo(runtimeCSN, hierarchy, entities) {
+	const result = [];
+
+	for (const [childEntityName, hierarchyInfo] of hierarchy) {
+		const { parent: parentEntityName, compositionField } = hierarchyInfo;
+		if (!parentEntityName || !compositionField) continue;
+
+		const childEntity = runtimeCSN.definitions[childEntityName];
+		const parentEntity = runtimeCSN.definitions[parentEntityName];
+		if (!childEntity || !parentEntity) continue;
+
+		// Check if this entity is actually tracked (in our entities list)
+		const isTracked = entities.some((e) => e.dbEntityName === childEntityName);
+		if (!isTracked) continue;
+
+		// Get the FK binding from child to parent
+		const parentMergedAnnotations = entities.find((e) => e.dbEntityName === parentEntityName)?.mergedAnnotations;
+		const compositionParentInfo = getCompositionParentInfo(childEntity, parentEntity, parentMergedAnnotations);
+		if (!compositionParentInfo) continue;
+
+		const { parentKeyBinding } = compositionParentInfo;
+
+		// Skip composition of one - they have reverse FK direction and different handling
+		if (parentKeyBinding.type === 'compositionOfOne') continue;
+
+		const childKeys = utils.extractKeys(childEntity.keys);
+		const parentKeys = utils.extractKeys(parentEntity.keys);
+		const rootObjectIDs = utils.getObjectIDs(parentEntity, runtimeCSN, parentMergedAnnotations?.entityAnnotation);
+
+		// Collect child entity's objectIDs for restoring objectID on orphaned child entries
+		const childMergedAnnotations = entities.find((e) => e.dbEntityName === childEntityName)?.mergedAnnotations;
+		const childObjectIDs = utils.getObjectIDs(childEntity, runtimeCSN, childMergedAnnotations?.entityAnnotation);
+
+		// Collect grandparent info for deep hierarchies (e.g., Level2 -> Level1 -> Root)
+		const grandParentEntityName = hierarchyInfo?.grandParent ?? null;
+		const grandParentEntity = grandParentEntityName ? runtimeCSN.definitions[grandParentEntityName] : null;
+		const grandParentMergedAnnotations = grandParentEntityName ? entities.find((e) => e.dbEntityName === grandParentEntityName)?.mergedAnnotations : null;
+		const grandParentCompositionField = hierarchyInfo?.grandParentCompositionField ?? null;
+		const grandParentCompositionInfo = getGrandParentCompositionInfo(parentEntity, grandParentEntity, grandParentMergedAnnotations, grandParentCompositionField);
+
+		// If there's a grandparent, collect its keys, table name, and objectIDs for entry creation
+		let grandParentKeys, grandParentTableName, grandParentObjectIDs;
+		if (grandParentCompositionInfo && grandParentEntity) {
+			grandParentKeys = utils.extractKeys(grandParentEntity.keys);
+			grandParentTableName = utils.transformName(grandParentEntityName);
+			grandParentObjectIDs = utils.getObjectIDs(grandParentEntity, runtimeCSN, grandParentMergedAnnotations?.entityAnnotation);
+		}
+
+		result.push({
+			childEntityName,
+			parentEntityName,
+			compositionField,
+			childTableName: utils.transformName(childEntityName),
+			parentTableName: utils.transformName(parentEntityName),
+			fkFields: parentKeyBinding,
+			childKeys,
+			parentKeys,
+			rootObjectIDs,
+			childObjectIDs,
+			grandParentCompositionInfo,
+			grandParentKeys,
+			grandParentTableName,
+			grandParentObjectIDs
+		});
+	}
+
+	return result;
+}
+
+/**
+ * Builds the JOIN condition between Changes.entityKey and the child data table.
+ * Handles both v2 format (HIERARCHY_COMPOSITE_ID for multi-key) and v1 migrated format (single key only).
+ */
+function _buildChildKeyJoinCondition(childKeys, alias, changesAlias) {
+	const compositeExpr = compositeKeyExpr(childKeys.map((k) => `${alias}.${k}`));
+
+	// Single key: straightforward join
+	if (childKeys.length <= 1) {
+		return `${changesAlias}.ENTITYKEY = ${compositeExpr}`;
+	}
+
+	// Composite keys: support both v2 format (HIERARCHY_COMPOSITE_ID) and v1 migrated format (single ID only)
+	// v1 migrated data may have stored only the last key segment as entityKey
+	const lastKey = childKeys[childKeys.length - 1];
+	return `(${changesAlias}.ENTITYKEY = ${compositeExpr} OR ${changesAlias}.ENTITYKEY = TO_NVARCHAR(${alias}.${lastKey}))`;
+}
+
+/**
+ * Generates the SQL block for a single composition relationship.
+ */
+function _generateCompositionBlock(comp) {
+	const {
+		childEntityName,
+		parentEntityName,
+		compositionField,
+		childTableName,
+		parentTableName,
+		fkFields,
+		childKeys,
+		parentKeys,
+		rootObjectIDs,
+		childObjectIDs,
+		grandParentCompositionInfo,
+		grandParentKeys,
+		grandParentTableName,
+		grandParentObjectIDs
+	} = comp;
+
+	// Build JOIN condition handling both v2 composite keys and v1 migrated simple keys
+	const childKeyJoinStep1 = _buildChildKeyJoinCondition(childKeys, 'child_data', 'c');
+	const childKeyJoinStep2 = _buildChildKeyJoinCondition(childKeys, 'child_data', 'c2');
+
+	// Expression to compute the parent's entity key from the child data table's FK columns
+	const parentKeyFromChild = compositeKeyExpr(fkFields.map((fk) => `child_data.${fk}`));
+
+	// ObjectID expression for the parent composition entry
+	// Only use objectIDs that are direct columns on the parent table (not association paths requiring JOINs)
+	const simpleObjectIDs = rootObjectIDs?.filter((oid) => !oid.name.includes('.')) ?? [];
+	let objectIDExpr;
+	if (simpleObjectIDs.length > 0) {
+		const parts = simpleObjectIDs.map((oid) => `COALESCE(TO_NVARCHAR((SELECT ${oid.name} FROM ${parentTableName} WHERE ${parentKeys.map((pk) => `${pk} = grp.PARENT_ENTITYKEY`).join(' AND ')})), '')`);
+		const concatExpr = parts.length > 1 ? parts.join(" || ', ' || ") : parts[0];
+		objectIDExpr = `COALESCE(NULLIF(${concatExpr}, ''), grp.PARENT_ENTITYKEY)`;
+	} else {
+		objectIDExpr = 'grp.PARENT_ENTITYKEY';
+	}
+
+	// Child objectID expression for restoring objectID on orphaned child entries
+	// Uses @changelog fields if available, otherwise falls back to the child's entity key
+	const simpleChildObjectIDs = childObjectIDs?.filter((oid) => !oid.name.includes('.')) ?? [];
+	const childEntityKeyExpr = compositeKeyExpr(childKeys.map((k) => `child_data.${k}`));
+	let childObjectIDExpr;
+	if (simpleChildObjectIDs.length > 0) {
+		const childParts = simpleChildObjectIDs.map((oid) => `COALESCE(TO_NVARCHAR(child_data.${oid.name}), '<empty>')`);
+		const childConcatExpr = childParts.length > 1 ? childParts.join(" || ', ' || ") : childParts[0];
+		childObjectIDExpr = `COALESCE(NULLIF(${childConcatExpr}, ''), ${childEntityKeyExpr})`;
+	} else {
+		childObjectIDExpr = childEntityKeyExpr;
+	}
+
+	// Modification: 'create' if the parent entity was created in the same tx, 'update' otherwise
+	const modificationExpr = `CASE WHEN EXISTS (
+				SELECT 1 FROM SAP_CHANGELOG_CHANGES
+				WHERE entity = '${parentEntityName}'
+				AND entityKey = grp.PARENT_ENTITYKEY
+				AND modification = 'create'
+				AND transactionID = grp.TRANSACTIONID
+			) THEN 'create' ELSE 'update' END`;
+
+	let block = `
+	-- ============================================================================
+	-- Restore backlinks: ${childEntityName} -> ${parentEntityName}.${compositionField}
+	-- ============================================================================
+
+	-- Step 1: Create parent composition entries where missing
+	INSERT INTO SAP_CHANGELOG_CHANGES
+		(ID, parent_ID, attribute, entity, entityKey, objectID, createdAt, createdBy, valueDataType, modification, transactionID)
+	SELECT
+		SYSUUID,
+		NULL,
+		'${compositionField}',
+		'${parentEntityName}',
+		grp.PARENT_ENTITYKEY,
+		${objectIDExpr},
+		grp.MIN_CREATEDAT,
+		grp.CREATEDBY,
+		'cds.Composition',
+		${modificationExpr},
+		grp.TRANSACTIONID
+	FROM (
+		SELECT
+			${parentKeyFromChild} AS PARENT_ENTITYKEY,
+			c.TRANSACTIONID,
+			MIN(c.CREATEDAT) AS MIN_CREATEDAT,
+			MIN(c.CREATEDBY) AS CREATEDBY
+		FROM SAP_CHANGELOG_CHANGES c
+		INNER JOIN ${childTableName} child_data
+			ON ${childKeyJoinStep1}
+		WHERE c.entity = '${childEntityName}'
+		AND c.parent_ID IS NULL
+		AND c.valueDataType != 'cds.Composition'
+		AND NOT EXISTS (
+			SELECT 1 FROM SAP_CHANGELOG_CHANGES p
+			WHERE p.entity = '${parentEntityName}'
+			AND p.attribute = '${compositionField}'
+			AND p.valueDataType = 'cds.Composition'
+			AND p.transactionID = c.transactionID
+			AND p.entityKey = ${parentKeyFromChild}
+		)
+		GROUP BY ${parentKeyFromChild}, c.TRANSACTIONID, c.CREATEDBY
+	) grp;
+
+	-- Step 2: Link orphaned child entries to their parent composition entry and restore objectID
+	MERGE INTO SAP_CHANGELOG_CHANGES AS c
+	USING (
+		SELECT c2.ID AS CHILD_ID, p.ID AS PARENT_ID, ${childObjectIDExpr} AS CHILD_OBJECTID
+		FROM SAP_CHANGELOG_CHANGES c2
+		INNER JOIN ${childTableName} child_data
+			ON ${childKeyJoinStep2}
+		INNER JOIN SAP_CHANGELOG_CHANGES p
+			ON p.entity = '${parentEntityName}'
+			AND p.attribute = '${compositionField}'
+			AND p.valueDataType = 'cds.Composition'
+			AND p.transactionID = c2.transactionID
+			AND p.entityKey = ${parentKeyFromChild}
+		WHERE c2.entity = '${childEntityName}'
+		AND c2.parent_ID IS NULL
+		AND c2.valueDataType != 'cds.Composition'
+	) AS matched
+	ON c.ID = matched.CHILD_ID
+	WHEN MATCHED THEN UPDATE SET c.parent_ID = matched.PARENT_ID, c.objectID = matched.CHILD_OBJECTID;`;
+
+	// Create grandparent composition entries and link to them (for deep hierarchies)
+	if (grandParentCompositionInfo) {
+		const { grandParentEntityName, grandParentCompositionFieldName, grandParentKeyBinding } = grandParentCompositionInfo;
+
+		// Build expression to resolve the grandparent entity key from the parent data table's FK columns
+		const grandParentKeyFromParent = compositeKeyExpr(grandParentKeyBinding.map((fk) => `parent_data.${fk}`));
+
+		// Build grandparent objectID expression
+		const simpleGPObjectIDs = grandParentObjectIDs?.filter((oid) => !oid.name.includes('.')) ?? [];
+		let gpObjectIDExpr;
+		if (simpleGPObjectIDs.length > 0) {
+			const gpParts = simpleGPObjectIDs.map((oid) => `COALESCE(TO_NVARCHAR((SELECT ${oid.name} FROM ${grandParentTableName} WHERE ${grandParentKeys.map((pk) => `${pk} = grp2.GP_ENTITYKEY`).join(' AND ')})), '')`);
+			const gpConcatExpr = gpParts.length > 1 ? gpParts.join(" || ', ' || ") : gpParts[0];
+			gpObjectIDExpr = `COALESCE(NULLIF(${gpConcatExpr}, ''), grp2.GP_ENTITYKEY)`;
+		} else {
+			gpObjectIDExpr = 'grp2.GP_ENTITYKEY';
+		}
+
+		// Modification for grandparent: 'create' if grandparent was created in same tx, 'update' otherwise
+		const gpModificationExpr = `CASE WHEN EXISTS (
+					SELECT 1 FROM SAP_CHANGELOG_CHANGES
+					WHERE entity = '${grandParentEntityName}'
+					AND entityKey = grp2.GP_ENTITYKEY
+					AND modification = 'create'
+					AND transactionID = grp2.TRANSACTIONID
+				) THEN 'create' ELSE 'update' END`;
+
+		block += `
+
+	-- Step 3a: Create grandparent composition entries where missing
+	INSERT INTO SAP_CHANGELOG_CHANGES
+		(ID, parent_ID, attribute, entity, entityKey, objectID, createdAt, createdBy, valueDataType, modification, transactionID)
+	SELECT
+		SYSUUID,
+		NULL,
+		'${grandParentCompositionFieldName}',
+		'${grandParentEntityName}',
+		grp2.GP_ENTITYKEY,
+		${gpObjectIDExpr},
+		grp2.MIN_CREATEDAT,
+		grp2.CREATEDBY,
+		'cds.Composition',
+		${gpModificationExpr},
+		grp2.TRANSACTIONID
+	FROM (
+		SELECT
+			${grandParentKeyFromParent} AS GP_ENTITYKEY,
+			comp2.TRANSACTIONID,
+			MIN(comp2.CREATEDAT) AS MIN_CREATEDAT,
+			MIN(comp2.CREATEDBY) AS CREATEDBY
+		FROM SAP_CHANGELOG_CHANGES comp2
+		INNER JOIN ${parentTableName} parent_data
+			ON comp2.ENTITYKEY = ${compositeKeyExpr(parentKeys.map((pk) => `parent_data.${pk}`))}
+		WHERE comp2.entity = '${parentEntityName}'
+		AND comp2.attribute = '${compositionField}'
+		AND comp2.valueDataType = 'cds.Composition'
+		AND comp2.parent_ID IS NULL
+		AND NOT EXISTS (
+			SELECT 1 FROM SAP_CHANGELOG_CHANGES gp
+			WHERE gp.entity = '${grandParentEntityName}'
+			AND gp.attribute = '${grandParentCompositionFieldName}'
+			AND gp.valueDataType = 'cds.Composition'
+			AND gp.transactionID = comp2.transactionID
+			AND gp.entityKey = ${grandParentKeyFromParent}
+		)
+		GROUP BY ${grandParentKeyFromParent}, comp2.TRANSACTIONID, comp2.CREATEDBY
+	) grp2;
+
+	-- Step 3b: Link composition entries to their grandparent composition entries
+	MERGE INTO SAP_CHANGELOG_CHANGES AS comp
+	USING (
+		SELECT comp2.ID AS COMP_ID, gp.ID AS GRANDPARENT_ID
+		FROM SAP_CHANGELOG_CHANGES comp2
+		INNER JOIN ${parentTableName} parent_data
+			ON comp2.ENTITYKEY = ${compositeKeyExpr(parentKeys.map((pk) => `parent_data.${pk}`))}
+		INNER JOIN SAP_CHANGELOG_CHANGES gp
+			ON gp.entity = '${grandParentEntityName}'
+			AND gp.attribute = '${grandParentCompositionFieldName}'
+			AND gp.valueDataType = 'cds.Composition'
+			AND gp.transactionID = comp2.transactionID
+			AND gp.entityKey = ${grandParentKeyFromParent}
+		WHERE comp2.entity = '${parentEntityName}'
+		AND comp2.attribute = '${compositionField}'
+		AND comp2.valueDataType = 'cds.Composition'
+		AND comp2.parent_ID IS NULL
+	) AS matched
+	ON comp.ID = matched.COMP_ID
+	WHEN MATCHED THEN UPDATE SET comp.parent_ID = matched.GRANDPARENT_ID;`;
+	}
+
+	return block;
+}
+
+module.exports = { generateRestoreBacklinksProcedure };

package/lib/hana/sql-expressions.js

@@ -1,15 +1,14 @@
 const utils = require('../utils/change-tracking.js');
 const { CT_SKIP_VAR, getEntitySkipVarName, getElementSkipVarName } = require('../utils/session-variables.js');
-
-const HANAService = require('@cap-js/hana');
-const cqn4sql = require('@cap-js/db-service/lib/cqn4sql');
 const { createTriggerCQN2SQL } = require('../TriggerCQN2SQL.js');
 
-const TriggerCQN2SQL = createTriggerCQN2SQL(HANAService.CQN2SQL);
 let HANACQN2SQL;
 
 function toSQL(query, model) {
+	const cqn4sql = require('@cap-js/db-service/lib/cqn4sql');
 	if (!HANACQN2SQL) {
+		const { CQN2SQL } = require('@cap-js/hana');
+		const TriggerCQN2SQL = createTriggerCQN2SQL(CQN2SQL);
 		HANACQN2SQL = new TriggerCQN2SQL();
 	}
 	const sqlCQN = cqn4sql(query, model);
@@ -27,7 +26,7 @@ function getElementSkipCondition(entityName, elementName) {
 }
 
 function compositeKeyExpr(parts) {
-	if (parts.length <= 1) return parts[0];
+	if (parts.length <= 1) return `TO_NVARCHAR(${parts[0]})`;
 	return `HIERARCHY_COMPOSITE_ID(${parts.join(', ')})`;
 }
 

package/lib/postgres/register.js

@@ -26,18 +26,6 @@ function registerPostgresCompilerHook() {
 
 		return ddl;
 	});
-
-	// REVISIT: Remove once time casting is fixed in cds-dbs
-	cds.on('serving', async () => {
-		if (cds.env.requires?.db.kind !== 'postgres') return;
-		const db = await cds.connect.to('db');
-		db.before('*', () => {
-			db.class.CQN2SQL.OutputConverters.Date = (e) => `to_date(${e}::text, 'YYYY-MM-DD')`;
-			db.class.CQN2SQL.OutputConverters.Time = (e) => `to_timestamp(${e}::text, 'HH24:MI:SS')::TIME`;
-			db.class.CQN2SQL.OutputConverters.DateTime = (e) => `to_timestamp(${e}::text, 'YYYY-MM-DD"T"HH24:MI:SS"Z"')::timestamp`;
-			db.class.CQN2SQL.OutputConverters.Timestamp = (e) => `to_timestamp(${e}::text, 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')::timestamp`;
-		});
-	});
 }
 
 async function deployPostgresLabels() {

package/lib/postgres/sql-expressions.js

@@ -1,13 +1,13 @@
 const cds = require('@sap/cds');
 const utils = require('../utils/change-tracking.js');
 const config = cds.env.requires['change-tracking'];
-const cqn4sql = require('@cap-js/db-service/lib/cqn4sql');
 const { CT_SKIP_VAR, getEntitySkipVarName, getElementSkipVarName } = require('../utils/session-variables.js');
 const { createTriggerCQN2SQL } = require('../TriggerCQN2SQL.js');
 
 const _cqn2sqlCache = new WeakMap();
 
 function toSQL(query, model) {
+	const cqn4sql = require('@cap-js/db-service/lib/cqn4sql');
 	let cqn2sql = _cqn2sqlCache.get(model);
 	if (!cqn2sql) {
 		const Service = require('@cap-js/postgres');

package/lib/skipHandlers.js

@@ -7,7 +7,7 @@ const { setSkipSessionVariables, resetSkipSessionVariables, resetAutoSkipForServ
  * Register db handlers for setting/resetting session variables on INSERT/UPDATE/DELETE.
  */
 function registerSessionVariableHandlers() {
-	cds.db.before(['INSERT', 'UPDATE', 'DELETE'], async (req) => {
+	cds.db?.before(['INSERT', 'UPDATE', 'DELETE'], async (req) => {
 		const model = cds.context?.model ?? cds.model;
 		const collectedEntities = model.collectEntities || (model.collectEntities = collectEntities(model).collectedEntities);
 		if (!req.target || req.target.name.endsWith('.drafts')) return;
@@ -16,7 +16,7 @@ function registerSessionVariableHandlers() {
 		setSkipSessionVariables(req, srv, collectedEntities);
 	});
 
-	cds.db.after(['INSERT', 'UPDATE', 'DELETE'], async (_, req) => {
+	cds.db?.after(['INSERT', 'UPDATE', 'DELETE'], async (_, req) => {
 		if (!req.target || req.target.name.endsWith('.drafts')) return;
 
 		// Reset auto-skip variable if it was set

package/lib/sqlite/sql-expressions.js

@@ -2,10 +2,10 @@ const utils = require('../utils/change-tracking.js');
 const { CT_SKIP_VAR, getEntitySkipVarName, getElementSkipVarName } = require('../utils/session-variables.js');
 const { createTriggerCQN2SQL } = require('../TriggerCQN2SQL.js');
 
-const cqn4sql = require('@cap-js/db-service/lib/cqn4sql');
 const _cqn2sqlCache = new WeakMap();
 
 function toSQL(query, model) {
+	const cqn4sql = require('@cap-js/db-service/lib/cqn4sql');
 	let cqn2sql = _cqn2sqlCache.get(model);
 	if (!cqn2sql) {
 		const SQLiteService = require('@cap-js/sqlite');

package/lib/utils/change-tracking.js

@@ -166,6 +166,12 @@ function extractTrackedColumns(entity, model = cds.context?.model ?? cds.model,
 		const entry = { name: name, type: col.type };
 
 		if (isAssociation) {
+			// Check if association target has a table
+			const targetEntity = model.definitions[col.target];
+			if (!targetEntity || targetEntity['@cds.persistence.skip'] === true) {
+				LOG.warn(`Skipped @changelog for ${name} on entity ${entity.name}: Association target "${col.target}" is annotated with @cds.persistence.skip!`);
+				continue;
+			}
 			entry.target = col.target;
 			// Use the resolved changelog annotation (which could be from override)
 			if (Array.isArray(changelogAnnotation) && changelogAnnotation.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cap-js/change-tracking",
-	"version": "2.0.0-beta.5",
+	"version": "2.0.0-beta.6",
 	"publishConfig": {
 		"access": "public",
 		"tag": "beta"
@@ -45,7 +45,8 @@
 			"change-tracking": {
 				"model": "@cap-js/change-tracking",
 				"maxDisplayHierarchyDepth": 3,
-				"preserveDeletes": false
+				"preserveDeletes": false,
+				"procedureForRestoringBacklinks": true
 			}
 		}
 	},