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

package/lib/sqlite/sql-expressions.js

@@ -3,26 +3,18 @@ const { CT_SKIP_VAR, getEntitySkipVarName, getElementSkipVarName } = require('..
 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);
 }
 
 /**
@@ -103,7 +95,7 @@ function getWhereCondition(col, modification) {
 /**
  * Builds scalar subselect for association label lookup with locale awareness
  */
-function buildAssocLookup(column, refRow, entityKey) {
+function buildAssocLookup(column, refRow, entityKey, model) {
 	const where = column.foreignKeys
 		? column.foreignKeys.reduce((acc, k) => {
 				acc[k] = { val: `${refRow}.${column.name}_${k}` };
@@ -125,35 +117,35 @@ function buildAssocLookup(column, refRow, entityKey) {
 		const textsWhere = { ...where, locale: { func: 'session_context', args: [{ val: '$user.locale' }] } };
 		const textsQuery = SELECT.one.from(localizedInfo.textsEntity).columns(columns).where(textsWhere);
 		const baseQuery = SELECT.one.from(column.target).columns(columns).where(where);
-		return `(SELECT COALESCE((${toSQL(textsQuery)}), (${toSQL(baseQuery)})))`;
+		return `(SELECT COALESCE((${toSQL(textsQuery, model)}), (${toSQL(baseQuery, model)})))`;
 	}
 
 	const query = SELECT.one.from(column.target).columns(columns).where(where);
-	return `(${toSQL(query)})`;
+	return `(${toSQL(query, model)})`;
 }
 
 /**
  * Returns SQL expression for a column's label (looked-up value for associations)
  */
-function getLabelExpr(col, refRow, entityKey) {
+function getLabelExpr(col, refRow, entityKey, model) {
 	if (col.target && col.alt) {
-		return buildAssocLookup(col, refRow, entityKey);
+		return buildAssocLookup(col, refRow, entityKey, model);
 	}
 	return 'NULL';
 }
 
 /**
  * Builds SQL expression for objectID (entity display name)
- * Uses @changelog annotation fields, falling back to entity name
+ * Uses @changelog annotation fields, falling back to entity keys
  */
-function buildObjectIDSelect(objectIDs, entityName, entityKeys, refRow) {
-	if (objectIDs.length === 0) return `'${entityName}'`;
+function buildObjectIDSelect(objectIDs, entityName, entityKeys, refRow, model) {
+	if (objectIDs.length === 0) return null;
 
 	for (const objectID of objectIDs) {
 		if (objectID.included) continue;
 		const where = buildKeyWhere(entityKeys, refRow);
 		const query = SELECT.one.from(entityName).columns(objectID.name).where(where);
-		objectID.selectSQL = toSQL(query);
+		objectID.selectSQL = toSQL(query, model);
 	}
 
 	const unionParts = objectIDs.map((id) => (id.included ? `SELECT ${refRow}.${id.name} AS value WHERE ${refRow}.${id.name} IS NOT NULL` : `SELECT (${id.selectSQL}) AS value`));
@@ -161,16 +153,16 @@ function buildObjectIDSelect(objectIDs, entityName, entityKeys, refRow) {
 	return `(SELECT GROUP_CONCAT(value, ', ') FROM (${unionParts.join('\nUNION ALL\n')}))`;
 }
 
-function buildTriggerContext(entity, objectIDs, refRow, compositionParentInfo = null) {
+function buildTriggerContext(entity, objectIDs, refRow, model, compositionParentInfo = null) {
 	const keys = utils.extractKeys(entity.keys);
 	const entityKey = compositeKeyExpr(keys.map((k) => `${refRow}.${k}`));
-	const objectID = buildObjectIDSelect(objectIDs, entity.name, keys, refRow) ?? entityKey;
+	const objectID = buildObjectIDSelect(objectIDs, entity.name, keys, refRow, model) ?? entityKey;
 	const parentLookupExpr = compositionParentInfo ? 'PARENT_LOOKUP_PLACEHOLDER' : null;
 
 	return { keys, entityKey, objectID, parentLookupExpr };
 }
 
-function buildInsertSQL(entity, columns, modification, ctx) {
+function buildInsertSQL(entity, columns, modification, ctx, model) {
 	const unionQuery = columns
 		.map((col) => {
 			const whereCondition = getWhereCondition(col, modification);
@@ -193,8 +185,8 @@ function buildInsertSQL(entity, columns, modification, ctx) {
 
 			const oldVal = modification === 'create' ? 'NULL' : getValueExpr(col, 'old');
 			const newVal = modification === 'delete' ? 'NULL' : getValueExpr(col, 'new');
-			const oldLabel = modification === 'create' ? 'NULL' : getLabelExpr(col, 'old', ctx.entityKey);
-			const newLabel = modification === 'delete' ? 'NULL' : getLabelExpr(col, 'new', ctx.entityKey);
+			const oldLabel = modification === 'create' ? 'NULL' : getLabelExpr(col, 'old', ctx.entityKey, model);
+			const newLabel = modification === 'delete' ? 'NULL' : getLabelExpr(col, 'new', ctx.entityKey, model);
 
 			return `SELECT '${col.name}' AS attribute, ${oldVal} AS valueChangedFrom, ${newVal} AS valueChangedTo, ${oldLabel} AS valueChangedFromLabel, ${newLabel} AS valueChangedToLabel, '${col.type}' AS valueDataType WHERE ${fullWhere}`;
 		})
@@ -223,8 +215,6 @@ function buildInsertSQL(entity, columns, modification, ctx) {
 }
 
 module.exports = {
-	setModel,
-	getModel,
 	toSQL,
 	getSkipCheckCondition,
 	getElementSkipCondition,

package/lib/sqlite/triggers.js

@@ -1,12 +1,12 @@
 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, getSkipCheckCondition, buildTriggerContext, buildInsertSQL } = require('./sql-expressions.js');
+const { getSkipCheckCondition, buildTriggerContext, buildInsertSQL } = require('./sql-expressions.js');
 const { buildCompositionParentContext } = require('./composition.js');
 
-function generateCreateTrigger(entity, columns, objectIDs, rootObjectIDs, compositionParentInfo = null, grandParentCompositionInfo = null) {
-	const compositionParentContext = compositionParentInfo ? buildCompositionParentContext(compositionParentInfo, rootObjectIDs, 'create', 'new', grandParentCompositionInfo) : null;
-	const ctx = buildTriggerContext(entity, objectIDs, 'new', compositionParentInfo);
+function generateCreateTrigger(entity, columns, objectIDs, rootObjectIDs, model, compositionParentInfo = null, grandParentCompositionInfo = null) {
+	const compositionParentContext = compositionParentInfo ? buildCompositionParentContext(compositionParentInfo, rootObjectIDs, 'create', 'new', model, grandParentCompositionInfo) : null;
+	const ctx = buildTriggerContext(entity, objectIDs, 'new', model, compositionParentInfo);
 
 	// Replace placeholder with actual parent lookup expression if needed
 	if (compositionParentContext && ctx.parentLookupExpr) {
@@ -18,10 +18,10 @@ function generateCreateTrigger(entity, columns, objectIDs, rootObjectIDs, compos
 	if (columns.length === 0 && compositionParentContext) {
 		bodySQL = compositionParentContext.insertSQL;
 	} else if (compositionParentContext) {
-		const insertSQL = buildInsertSQL(entity, columns, 'create', ctx);
+		const insertSQL = buildInsertSQL(entity, columns, 'create', ctx, model);
 		bodySQL = `${compositionParentContext.insertSQL}\n        ${insertSQL}`;
 	} else {
-		bodySQL = buildInsertSQL(entity, columns, 'create', ctx);
+		bodySQL = buildInsertSQL(entity, columns, 'create', ctx, model);
 	}
 
 	return `CREATE TRIGGER IF NOT EXISTS ${utils.transformName(entity.name)}_ct_create AFTER INSERT
@@ -32,9 +32,9 @@ function generateCreateTrigger(entity, columns, objectIDs, rootObjectIDs, compos
     END;`;
 }
 
-function generateUpdateTrigger(entity, columns, objectIDs, rootObjectIDs, compositionParentInfo = null, grandParentCompositionInfo = null) {
-	const compositionParentContext = compositionParentInfo ? buildCompositionParentContext(compositionParentInfo, rootObjectIDs, 'update', 'new', grandParentCompositionInfo) : null;
-	const ctx = buildTriggerContext(entity, objectIDs, 'new', compositionParentInfo);
+function generateUpdateTrigger(entity, columns, objectIDs, rootObjectIDs, model, compositionParentInfo = null, grandParentCompositionInfo = null) {
+	const compositionParentContext = compositionParentInfo ? buildCompositionParentContext(compositionParentInfo, rootObjectIDs, 'update', 'new', model, grandParentCompositionInfo) : null;
+	const ctx = buildTriggerContext(entity, objectIDs, 'new', model, compositionParentInfo);
 
 	// Replace placeholder with actual parent lookup expression if needed
 	if (compositionParentContext && ctx.parentLookupExpr) {
@@ -46,10 +46,10 @@ function generateUpdateTrigger(entity, columns, objectIDs, rootObjectIDs, compos
 	if (columns.length === 0 && compositionParentContext) {
 		bodySQL = compositionParentContext.insertSQL;
 	} else if (compositionParentContext) {
-		const insertSQL = buildInsertSQL(entity, columns, 'update', ctx);
+		const insertSQL = buildInsertSQL(entity, columns, 'update', ctx, model);
 		bodySQL = `${compositionParentContext.insertSQL}\n        ${insertSQL}`;
 	} else {
-		bodySQL = buildInsertSQL(entity, columns, 'update', ctx);
+		bodySQL = buildInsertSQL(entity, columns, 'update', ctx, model);
 	}
 
 	// Build OF clause for targeted update trigger
@@ -69,9 +69,9 @@ function generateUpdateTrigger(entity, columns, objectIDs, rootObjectIDs, compos
     END;`;
 }
 
-function generateDeleteTriggerPreserve(entity, columns, objectIDs, rootObjectIDs, compositionParentInfo = null, grandParentCompositionInfo = null) {
-	const compositionParentContext = compositionParentInfo ? buildCompositionParentContext(compositionParentInfo, rootObjectIDs, 'delete', 'old', grandParentCompositionInfo) : null;
-	const ctx = buildTriggerContext(entity, objectIDs, 'old', compositionParentInfo);
+function generateDeleteTriggerPreserve(entity, columns, objectIDs, rootObjectIDs, model, compositionParentInfo = null, grandParentCompositionInfo = null) {
+	const compositionParentContext = compositionParentInfo ? buildCompositionParentContext(compositionParentInfo, rootObjectIDs, 'delete', 'old', model, grandParentCompositionInfo) : null;
+	const ctx = buildTriggerContext(entity, objectIDs, 'old', model, compositionParentInfo);
 
 	// Replace placeholder with actual parent lookup expression if needed
 	if (compositionParentContext && ctx.parentLookupExpr) {
@@ -83,10 +83,10 @@ function generateDeleteTriggerPreserve(entity, columns, objectIDs, rootObjectIDs
 	if (columns.length === 0 && compositionParentContext) {
 		bodySQL = compositionParentContext.insertSQL;
 	} else if (compositionParentContext) {
-		const insertSQL = buildInsertSQL(entity, columns, 'delete', ctx);
+		const insertSQL = buildInsertSQL(entity, columns, 'delete', ctx, model);
 		bodySQL = `${compositionParentContext.insertSQL}\n        ${insertSQL}`;
 	} else {
-		bodySQL = buildInsertSQL(entity, columns, 'delete', ctx);
+		bodySQL = buildInsertSQL(entity, columns, 'delete', ctx, model);
 	}
 
 	return `CREATE TRIGGER IF NOT EXISTS ${utils.transformName(entity.name)}_ct_delete AFTER DELETE
@@ -97,9 +97,9 @@ function generateDeleteTriggerPreserve(entity, columns, objectIDs, rootObjectIDs
     END;`;
 }
 
-function generateDeleteTrigger(entity, columns, objectIDs, rootObjectIDs, compositionParentInfo = null, grandParentCompositionInfo = null) {
-	const compositionParentContext = compositionParentInfo ? buildCompositionParentContext(compositionParentInfo, rootObjectIDs, 'delete', 'old', grandParentCompositionInfo) : null;
-	const ctx = buildTriggerContext(entity, objectIDs, 'old', compositionParentInfo);
+function generateDeleteTrigger(entity, columns, objectIDs, rootObjectIDs, model, compositionParentInfo = null, grandParentCompositionInfo = null) {
+	const compositionParentContext = compositionParentInfo ? buildCompositionParentContext(compositionParentInfo, rootObjectIDs, 'delete', 'old', model, grandParentCompositionInfo) : null;
+	const ctx = buildTriggerContext(entity, objectIDs, 'old', model, compositionParentInfo);
 
 	// Replace placeholder with actual parent lookup expression if needed
 	if (compositionParentContext && ctx.parentLookupExpr) {
@@ -113,10 +113,10 @@ function generateDeleteTrigger(entity, columns, objectIDs, rootObjectIDs, compos
 	if (columns.length === 0 && compositionParentContext) {
 		bodySQL = `${deleteSQL}\n        ${compositionParentContext.insertSQL}`;
 	} else if (compositionParentContext) {
-		const insertSQL = buildInsertSQL(entity, columns, 'delete', ctx);
+		const insertSQL = buildInsertSQL(entity, columns, 'delete', ctx, model);
 		bodySQL = `${deleteSQL}\n        ${compositionParentContext.insertSQL}\n        ${insertSQL}`;
 	} else {
-		const insertSQL = buildInsertSQL(entity, columns, 'delete', ctx);
+		const insertSQL = buildInsertSQL(entity, columns, 'delete', ctx, model);
 		bodySQL = `${deleteSQL}\n        ${insertSQL}`;
 	}
 
@@ -129,7 +129,6 @@ function generateDeleteTrigger(entity, columns, objectIDs, rootObjectIDs, compos
 }
 
 function generateSQLiteTrigger(csn, entity, rootEntity, mergedAnnotations = null, rootMergedAnnotations = null, grandParentContext = {}) {
-	setModel(csn);
 	const triggers = [];
 	const { columns: trackedColumns } = utils.extractTrackedColumns(entity, csn, mergedAnnotations);
 	const objectIDs = utils.getObjectIDs(entity, csn, mergedAnnotations?.entityAnnotation);
@@ -147,14 +146,14 @@ function generateSQLiteTrigger(csn, entity, rootEntity, mergedAnnotations = null
 
 	if (shouldGenerateTriggers) {
 		if (!config?.disableCreateTracking) {
-			triggers.push(generateCreateTrigger(entity, trackedColumns, objectIDs, rootObjectIDs, compositionParentInfo, grandParentCompositionInfo));
+			triggers.push(generateCreateTrigger(entity, trackedColumns, objectIDs, rootObjectIDs, csn, compositionParentInfo, grandParentCompositionInfo));
 		}
 		if (!config?.disableUpdateTracking) {
-			triggers.push(generateUpdateTrigger(entity, trackedColumns, objectIDs, rootObjectIDs, compositionParentInfo, grandParentCompositionInfo));
+			triggers.push(generateUpdateTrigger(entity, trackedColumns, objectIDs, rootObjectIDs, csn, compositionParentInfo, grandParentCompositionInfo));
 		}
 		if (!config?.disableDeleteTracking) {
 			const generateDeleteTriggerFunc = config?.preserveDeletes ? generateDeleteTriggerPreserve : generateDeleteTrigger;
-			triggers.push(generateDeleteTriggerFunc(entity, trackedColumns, objectIDs, rootObjectIDs, compositionParentInfo, grandParentCompositionInfo));
+			triggers.push(generateDeleteTriggerFunc(entity, trackedColumns, objectIDs, rootObjectIDs, csn, compositionParentInfo, grandParentCompositionInfo));
 		}
 	}
 

package/lib/utils/change-tracking.js

@@ -207,7 +207,7 @@ function getObjectIDs(entity, model = cds.context?.model ?? cds.model, overrideE
 	if (!entity) return [];
 	// Use override annotation if provided, otherwise use the entity's own annotation
 	const entityAnnotation = overrideEntityAnnotation ?? entity['@changelog'];
-	if (!entityAnnotation) return [];
+	if (!entityAnnotation || entityAnnotation === true) return [];
 	const ids = [];
 
 	for (const { ['=']: field } of entityAnnotation) {

package/lib/utils/session-variables.js

@@ -9,19 +9,17 @@ const CT_SKIP_VAR = 'ct.skip';
 const CT_SKIP_ENTITY_PREFIX = 'ct.skip_entity.';
 const CT_SKIP_ELEMENT_PREFIX = 'ct.skip_element.';
 
-const _resolveTableName = (entity) => cds.db?.resolve?.table(entity) || _getTableNameFallback(entity);
-
-function _getTableNameFallback(entity) {
-	const baseRef = entity.query?.SELECT?.from?.ref?.[0];
+function _resolveView(entity) {
 	const model = cds.context?.model ?? cds.model;
+	const baseRef = entity.query?._target;
 	if (!baseRef || !model) return null;
 
-	const baseEntity = model.definitions[baseRef];
+	const baseEntity = model.definitions[baseRef.name];
 	if (!baseEntity) return null;
 
 	// If base entity is also a projection, recurse
-	if (baseEntity.query?.SELECT?.from?.ref) {
-		return _getTableNameFallback(baseEntity);
+	if (baseEntity.query?._target) {
+		return _resolveView(baseEntity);
 	}
 
 	return baseEntity;
@@ -38,7 +36,7 @@ function getElementSkipVarName(entityName, elementName) {
 function _findServiceEntity(service, dbEntity) {
 	if (!service || !dbEntity) return null;
 	for (const def of service.entities) {
-		const projectionTarget = _resolveTableName(def)?.name;
+		const projectionTarget = _resolveView(def)?.name;
 		if (projectionTarget === dbEntity.name) return def;
 	}
 	return null;
@@ -66,7 +64,7 @@ function _collectDeepEntities(entity, data, service, toSkip) {
 
 function _collectSkipEntities(rootTarget, query, service) {
 	const toSkip = new Set();
-	const dbEntity = _resolveTableName(rootTarget);
+	const dbEntity = _resolveView(rootTarget);
 
 	// Check root entity annotation
 	if (rootTarget['@changelog'] === false || rootTarget['@changelog'] === null) {
@@ -105,7 +103,7 @@ function _collectSkipElements(serviceEntity, query, service) {
 	const toSkip = [];
 	if (!serviceEntity?.elements) return toSkip;
 
-	const dbEntity = _resolveTableName(serviceEntity);
+	const dbEntity = _resolveView(serviceEntity);
 	if (!dbEntity) return toSkip;
 
 	for (const [elementName, element] of Object.entries(serviceEntity.elements)) {
@@ -241,7 +239,7 @@ function resetSkipSessionVariables(req) {
 
 // --- Auto-skip for non-opted-in service entities ---
 function _shouldSkipServiceEntity(serviceEntity, collectedEntities) {
-	const dbEntityName = _resolveTableName(serviceEntity)?.name;
+	const dbEntityName = _resolveView(serviceEntity)?.name;
 	if (!dbEntityName) return false;
 
 	const srvEntities = collectedEntities.get(dbEntityName);
@@ -252,7 +250,7 @@ function _shouldSkipServiceEntity(serviceEntity, collectedEntities) {
 }
 
 function _setAutoSkipForServiceEntity(req) {
-	const dbEntity = _resolveTableName(req.target);
+	const dbEntity = _resolveView(req.target);
 	if (!dbEntity) return null;
 
 	const varName = getEntitySkipVarName(dbEntity.name);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cap-js/change-tracking",
-	"version": "2.0.0-beta.1",
+	"version": "2.0.0-beta.2",
 	"publishConfig": {
 		"access": "public",
 		"tag": "beta"