@memberjunction/sqlserver-dataprovider 2.112.0 → 2.113.1

package/dist/SQLServerDataProvider.js

@@ -41,7 +41,7 @@ exports.SQLServerDataProvider = void 0;
  * In practice - this FILE will NOT exist in the entities library, we need to move to its own separate project
  * so it is only included by the consumer of the entities library if they want to use it.
  **************************************************************************************************************/
-const global_1 = require("@memberjunction/global");
+const core_1 = require("@memberjunction/core");
 const queryParameterProcessor_1 = require("./queryParameterProcessor");
 const core_entities_1 = require("@memberjunction/core-entities");
 const aiengine_1 = require("@memberjunction/aiengine");
@@ -118,7 +118,10 @@ async function executeSQLCore(query, parameters, context, options) {
             }
         }
         // Execute query and logging in parallel
-        const [result] = await Promise.all([request.query(processedQuery), logPromise]);
+        const [result] = await Promise.all([
+            request.query(processedQuery),
+            logPromise
+        ]);
         return result;
     }
     catch (error) {
@@ -150,7 +153,7 @@ async function executeSQLCore(query, parameters, context, options) {
  * await provider.Config();
  * ```
  */
-class SQLServerDataProvider extends global_1.DatabaseProviderBase {
+class SQLServerDataProvider extends core_1.DatabaseProviderBase {
     _pool;
     // Instance transaction properties
     _transaction;
@@ -158,7 +161,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
     _savepointCounter = 0;
     _savepointStack = [];
     // Query cache instance
-    queryCache = new global_1.QueryCache();
+    queryCache = new core_1.QueryCache();
     // Removed _transactionRequest - creating new Request objects for each query to avoid concurrency issues
     _localStorageProvider;
     _bAllowRefresh = true;
@@ -241,7 +244,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             return super.Config(configData, providerToUse); // now parent class can do it's config
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e;
         }
     }
@@ -253,16 +256,14 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         // Each instance gets its own queue processor, but only do this ONCE if we get this method called more than once we don't need to reinit
         // the sub, taht would cause duplicate rprocessing.
         if (!this._queueSubscription) {
-            this._queueSubscription = this._sqlQueue$
-                .pipe((0, rxjs_1.concatMap)((item) => (0, rxjs_1.from)(executeSQLCore(item.query, item.parameters, item.context, item.options)).pipe(
+            this._queueSubscription = this._sqlQueue$.pipe((0, rxjs_1.concatMap)(item => (0, rxjs_1.from)(executeSQLCore(item.query, item.parameters, item.context, item.options)).pipe(
             // Handle success
-            (0, rxjs_1.tap)((result) => item.resolve(result)), 
+            (0, rxjs_1.tap)(result => item.resolve(result)), 
             // Handle errors
-            (0, rxjs_1.catchError)((error) => {
+            (0, rxjs_1.catchError)(error => {
                 item.reject(error);
                 return (0, rxjs_1.of)(null); // Continue processing queue even on errors
-            }))))
-                .subscribe();
+            })))).subscribe();
         }
     }
     /**
@@ -337,7 +338,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         const mjCoreSchema = this.ConfigData.MJCoreSchemaName;
         const session = new SqlLogger_js_1.SqlLoggingSessionImpl(sessionId, filePath, {
             defaultSchemaName: mjCoreSchema,
-            ...options, // if defaultSchemaName is not provided, it will use the MJCoreSchemaName, otherwise
+            ...options // if defaultSchemaName is not provided, it will use the MJCoreSchemaName, otherwise
             // the caller's defaultSchemaName will be used
         });
         // Initialize the session (create file, write header)
@@ -422,16 +423,16 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         }
         // Check if any session has verbose output enabled for debug logging
         const allSessions = Array.from(this._sqlLoggingSessions.values());
-        const hasVerboseSession = allSessions.some((s) => s.options.verboseOutput === true);
+        const hasVerboseSession = allSessions.some(s => s.options.verboseOutput === true);
         if (hasVerboseSession) {
             console.log('=== SQL LOGGING DEBUG ===');
             console.log(`Query to log: ${query.substring(0, 100)}...`);
             console.log(`Context user email: ${contextUser?.Email || 'NOT_PROVIDED'}`);
             console.log(`Active sessions count: ${this._sqlLoggingSessions.size}`);
-            console.log(`All sessions:`, allSessions.map((s) => ({
+            console.log(`All sessions:`, allSessions.map(s => ({
                 id: s.id,
                 filterByUserId: s.options.filterByUserId,
-                sessionName: s.options.sessionName,
+                sessionName: s.options.sessionName
             })));
         }
         const filteredSessions = allSessions.filter((session) => {
@@ -448,7 +449,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                     console.log(`Session ${session.id} filter check:`, {
                         filterByUserId: session.options.filterByUserId,
                         contextUserEmail: contextUser.Email,
-                        matches: matches,
+                        matches: matches
                     });
                 }
                 return matches;
@@ -479,7 +480,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
      */
     static async LogSQLStatement(query, parameters, description, isMutation = false, simpleSQLFallback, contextUser) {
         // Get the current provider instance
-        const provider = global_1.Metadata.Provider;
+        const provider = core_1.Metadata.Provider;
         if (provider && provider._sqlLoggingSessions.size > 0) {
             await provider._logSqlStatement(query, parameters, description, false, isMutation, simpleSQLFallback, contextUser);
         }
@@ -537,17 +538,17 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         if (!categoryPath)
             return null;
         // Split path and clean segments - remove empty strings from leading/trailing slashes
-        const segments = categoryPath
-            .split('/')
-            .map((s) => s.trim())
-            .filter((s) => s.length > 0);
+        const segments = categoryPath.split('/')
+            .map(s => s.trim())
+            .filter(s => s.length > 0);
         if (segments.length === 0)
             return null;
         // Walk down the hierarchy to find the target category
         let currentCategory = null;
         for (const segment of segments) {
             const parentId = currentCategory?.ID || null;
-            currentCategory = this.QueryCategories.find((cat) => cat.Name.trim().toLowerCase() === segment.toLowerCase() && cat.ParentID === parentId);
+            currentCategory = this.QueryCategories.find(cat => cat.Name.trim().toLowerCase() === segment.toLowerCase() &&
+                cat.ParentID === parentId);
             if (!currentCategory) {
                 return null; // Path not found
             }
@@ -567,7 +568,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
      */
     async findQuery(QueryID, QueryName, CategoryID, CategoryPath, refreshMetadataIfNotFound = false) {
         // First, get the query metadata
-        const queries = this.Queries.filter((q) => {
+        const queries = this.Queries.filter(q => {
             if (QueryID) {
                 return q.ID.trim().toLowerCase() === QueryID.trim().toLowerCase();
             }
@@ -638,11 +639,11 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 ExecutionTime: executionTime,
                 ErrorMessage: '',
                 AppliedParameters: appliedParameters,
-                CacheHit: false,
+                CacheHit: false
             };
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             const errorMessage = e instanceof Error ? e.message : String(e);
             return {
                 Success: false,
@@ -704,7 +705,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         }
         else if (parameters && Object.keys(parameters).length > 0) {
             // Warn if parameters were provided but query doesn't use templates
-            (0, global_1.LogStatus)('Warning: Parameters provided but query does not use templates. Parameters will be ignored.');
+            (0, core_1.LogStatus)('Warning: Parameters provided but query does not use templates. Parameters will be ignored.');
         }
         return { finalSQL, appliedParameters };
     }
@@ -720,10 +721,10 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         if (!cachedEntry) {
             return null;
         }
-        (0, global_1.LogStatus)(`Cache hit for query ${query.Name} (${query.ID})`);
+        (0, core_1.LogStatus)(`Cache hit for query ${query.Name} (${query.ID})`);
         // Apply pagination to cached results
         const { paginatedResult, totalRowCount } = this.applyQueryPagination(cachedEntry.results, params);
-        const remainingTTL = cachedEntry.timestamp + cachedEntry.ttlMinutes * 60 * 1000 - Date.now();
+        const remainingTTL = (cachedEntry.timestamp + (cachedEntry.ttlMinutes * 60 * 1000)) - Date.now();
         return {
             Success: true,
             QueryID: query.ID,
@@ -735,7 +736,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             ErrorMessage: '',
             AppliedParameters: appliedParameters,
             CacheHit: true,
-            CacheTTLRemaining: remainingTTL,
+            CacheTTLRemaining: remainingTTL
         };
     }
     /**
@@ -750,7 +751,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         }
         return {
             result,
-            executionTime: end - start,
+            executionTime: end - start
         };
     }
     /**
@@ -785,11 +786,11 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             RowCount: rowCount,
             TotalRowCount: totalRowCount,
             ExecutionTime: executionTime,
-            SQL: finalSQL, // After parameter substitution
+            SQL: finalSQL // After parameter substitution
         }), null, // entityId - No specific entity for queries
         query.ID, // recordId
         params.AuditLogDescription, { IgnoreDirtyState: true } // saveOptions
-        ).catch((error) => {
+        ).catch(error => {
             console.error('Error creating audit log:', error);
         });
     }
@@ -803,7 +804,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         }
         // Cache the full result set (before pagination)
         this.queryCache.set(query.ID, parameters, results, cacheConfig);
-        (0, global_1.LogStatus)(`Cached results for query ${query.Name} (${query.ID})`);
+        (0, core_1.LogStatus)(`Cached results for query ${query.Name} (${query.ID})`);
     }
     /**************************************************************************/
     // END ---- IRunQueryProvider
@@ -864,7 +865,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             return sWhere;
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e;
         }
     }
@@ -911,7 +912,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 const saveViewResults = params.SaveViewResults;
                 let topSQL = '';
                 // Only use TOP if we're NOT using OFFSET/FETCH pagination
-                const usingPagination = params.MaxRows && params.MaxRows > 0 && params.StartRow !== undefined && params.StartRow >= 0;
+                const usingPagination = params.MaxRows && params.MaxRows > 0 && (params.StartRow !== undefined && params.StartRow >= 0);
                 if (params.IgnoreMaxRows === true) {
                     // do nothing, leave it blank, this structure is here to make the code easier to read
                 }
@@ -929,9 +930,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 const fields = this.getRunTimeViewFieldString(params, viewEntity);
                 let viewSQL = `SELECT ${topSQL} ${fields} FROM [${entityInfo.SchemaName}].${entityInfo.BaseView}`;
                 // We need countSQL for pagination (to get total count) or when using TOP (to show limited vs total)
-                let countSQL = usingPagination || (topSQL && topSQL.length > 0)
-                    ? `SELECT COUNT(*) AS TotalRowCount FROM [${entityInfo.SchemaName}].${entityInfo.BaseView}`
-                    : null;
+                let countSQL = (usingPagination || (topSQL && topSQL.length > 0)) ? `SELECT COUNT(*) AS TotalRowCount FROM [${entityInfo.SchemaName}].${entityInfo.BaseView}` : null;
                 let whereSQL = '';
                 let bHasWhere = false;
                 let userViewRunID = '';
@@ -993,9 +992,9 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                     }
                 }
                 // NEXT, apply Row Level Security (RLS)
-                if (!entityInfo.UserExemptFromRowLevelSecurity(user, global_1.EntityPermissionType.Read)) {
+                if (!entityInfo.UserExemptFromRowLevelSecurity(user, core_1.EntityPermissionType.Read)) {
                     // user is NOT exempt from RLS, so we need to apply it
-                    const rlsWhereClause = entityInfo.GetUserRowLevelSecurityWhereClause(user, global_1.EntityPermissionType.Read, '');
+                    const rlsWhereClause = entityInfo.GetUserRowLevelSecurityWhereClause(user, core_1.EntityPermissionType.Read, '');
                     if (rlsWhereClause && rlsWhereClause.length > 0) {
                         if (bHasWhere) {
                             whereSQL += ` AND (${rlsWhereClause})`;
@@ -1032,7 +1031,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                     viewSQL += ` ORDER BY ${orderBy}`;
                 }
                 // Apply pagination using OFFSET/FETCH if both MaxRows and StartRow are specified
-                if (params.MaxRows && params.MaxRows > 0 && params.StartRow !== undefined && params.StartRow >= 0 && entityInfo.FirstPrimaryKey) {
+                if (params.MaxRows && params.MaxRows > 0 && (params.StartRow !== undefined && params.StartRow >= 0) && entityInfo.FirstPrimaryKey) {
                     // If no ORDER BY was already added, add one based on primary key (required for OFFSET/FETCH)
                     if (!orderBy) {
                         viewSQL += ` ORDER BY ${entityInfo.FirstPrimaryKey.Name} `;
@@ -1056,9 +1055,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 }
                 const stopTime = new Date();
                 if (params.ForceAuditLog ||
-                    (viewEntity?.ID &&
-                        (extraFilter === undefined || extraFilter === null || extraFilter?.trim().length === 0) &&
-                        entityInfo.AuditViewRuns)) {
+                    (viewEntity?.ID && (extraFilter === undefined || extraFilter === null || extraFilter?.trim().length === 0) && entityInfo.AuditViewRuns)) {
                     // ONLY LOG TOP LEVEL VIEW EXECUTION - this would be for views with an ID, and don't have ExtraFilter as ExtraFilter
                     // is only used in the system on a tab or just for ad hoc view execution
                     // we do NOT want to wait for this, so no await,
@@ -1092,7 +1089,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         }
         catch (e) {
             const exceptionStopTime = new Date();
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             return {
                 RowCount: 0,
                 TotalRowCount: 0,
@@ -1183,7 +1180,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                     if (field)
                         fieldList.push(field);
                     else
-                        (0, global_1.LogError)(`Field ${f} not found in entity ${entityInfo.Name}`);
+                        (0, core_1.LogError)(`Field ${f} not found in entity ${entityInfo.Name}`);
                 });
             }
             else {
@@ -1199,7 +1196,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                                 fieldList.push(c.EntityField);
                             }
                             else {
-                                (0, global_1.LogError)(`View Field ${c.Name} doesn't match an Entity Field in entity ${entityInfo.Name}. This can happen if the view was saved with a field that no longer exists in the entity. It is best to update the view to remove this field.`);
+                                (0, core_1.LogError)(`View Field ${c.Name} doesn't match an Entity Field in entity ${entityInfo.Name}. This can happen if the view was saved with a field that no longer exists in the entity. It is best to update the view to remove this field.`);
                             }
                         }
                     });
@@ -1212,7 +1209,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
         }
         finally {
             return fieldList;
@@ -1263,7 +1260,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 else {
                     // we have multiple words, so we need to convert the spaces to AND
                     // but first, let's strip the stopwords out of the string
-                    u = (0, global_1.StripStopWords)(userSearchString);
+                    u = (0, core_1.StripStopWords)(userSearchString);
                     // next, include "AND" between all the words so that we have a full text search on all the words
                     u = u.replace(/ /g, ' AND ');
                 }
@@ -1295,9 +1292,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             const authorization = authorizationName
                 ? this.Authorizations.find((a) => a?.Name?.trim().toLowerCase() === authorizationName.trim().toLowerCase())
                 : null;
-            const auditLogType = auditLogTypeName
-                ? this.AuditLogTypes.find((a) => a?.Name?.trim().toLowerCase() === auditLogTypeName.trim().toLowerCase())
-                : null;
+            const auditLogType = auditLogTypeName ? this.AuditLogTypes.find((a) => a?.Name?.trim().toLowerCase() === auditLogTypeName.trim().toLowerCase()) : null;
             if (!user)
                 throw new Error(`User is a required parameter`);
             if (!auditLogType) {
@@ -1326,7 +1321,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 throw new Error(`Error saving audit log record`);
         }
         catch (err) {
-            (0, global_1.LogError)(err);
+            (0, core_1.LogError)(err);
             return null;
         }
     }
@@ -1350,7 +1345,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
     // START ---- IEntityDataProvider
     /**************************************************************************/
     get ProviderType() {
-        return global_1.ProviderType.Database;
+        return core_1.ProviderType.Database;
     }
     async GetRecordFavoriteStatus(userId, entityName, CompositeKey, contextUser) {
         const id = await this.GetRecordFavoriteID(userId, entityName, CompositeKey, contextUser);
@@ -1366,7 +1361,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 return null;
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e;
         }
     }
@@ -1399,7 +1394,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e;
         }
     }
@@ -1409,7 +1404,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             return this.ExecuteSQL(sSQL, undefined, undefined, contextUser);
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e;
         }
     }
@@ -1429,7 +1424,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             // we do this in SQL by combining the pirmary key name and value for each row using the default separator defined by the CompositeKey class
             // the output of this should be like the following 'Field1|Value1||Field2|Value2||Field3|Value3' where the || is the CompositeKey.DefaultFieldDelimiter and the | is the CompositeKey.DefaultValueDelimiter
             const quotes = entity.FirstPrimaryKey.NeedsQuotes ? "'" : '';
-            const primaryKeySelectString = `CONCAT(${entity.PrimaryKeys.map((pk) => `'${pk.Name}|', CAST(${pk.Name} AS NVARCHAR(MAX))`).join(`,'${global_1.CompositeKey.DefaultFieldDelimiter}',`)})`;
+            const primaryKeySelectString = `CONCAT(${entity.PrimaryKeys.map((pk) => `'${pk.Name}|', CAST(${pk.Name} AS NVARCHAR(MAX))`).join(`,'${core_1.CompositeKey.DefaultFieldDelimiter}',`)})`;
             // for this entity, check to see if it has any fields that are soft links, and for each of those, generate the SQL
             entity.Fields.filter((f) => f.EntityIDFieldName && f.EntityIDFieldName.length > 0).forEach((f) => {
                 // each field in f must be processed
@@ -1458,7 +1453,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             const entityInfo = this.Entities.find((e) => e.Name.trim().toLowerCase() === entityDependency.EntityName?.trim().toLowerCase());
             const quotes = entityInfo.FirstPrimaryKey.NeedsQuotes ? "'" : '';
             const relatedEntityInfo = this.Entities.find((e) => e.Name.trim().toLowerCase() === entityDependency.RelatedEntityName?.trim().toLowerCase());
-            const primaryKeySelectString = `CONCAT(${entityInfo.PrimaryKeys.map((pk) => `'${pk.Name}|', CAST(${pk.Name} AS NVARCHAR(MAX))`).join(`,'${global_1.CompositeKey.DefaultFieldDelimiter}',`)})`;
+            const primaryKeySelectString = `CONCAT(${entityInfo.PrimaryKeys.map((pk) => `'${pk.Name}|', CAST(${pk.Name} AS NVARCHAR(MAX))`).join(`,'${core_1.CompositeKey.DefaultFieldDelimiter}',`)})`;
             if (sSQL.length > 0)
                 sSQL += ' UNION ALL ';
             sSQL += `SELECT
@@ -1508,13 +1503,13 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 // entityInfo.PrimaryKeys.forEach((pk) => {
                 //     pkeyValues.push({FieldName: pk.Name, Value: r[pk.Name]}) // add all of the primary keys, which often is as simple as just "ID", but this is generic way to do it
                 // })
-                const compositeKey = new global_1.CompositeKey();
+                const compositeKey = new core_1.CompositeKey();
                 // the row r will have a PrimaryKeyValue field that is a string that is a concatenation of the primary key field names and values
                 // we need to parse that out so that we can then pass it to the CompositeKey object
                 const pkeys = {};
-                const keyValues = r.PrimaryKeyValue.split(global_1.CompositeKey.DefaultFieldDelimiter);
+                const keyValues = r.PrimaryKeyValue.split(core_1.CompositeKey.DefaultFieldDelimiter);
                 keyValues.forEach((kv) => {
-                    const parts = kv.split(global_1.CompositeKey.DefaultValueDelimiter);
+                    const parts = kv.split(core_1.CompositeKey.DefaultValueDelimiter);
                     pkeys[parts[0]] = parts[1];
                 });
                 compositeKey.LoadFromEntityInfoAndRecord(entityInfo, pkeys);
@@ -1530,7 +1525,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         }
         catch (e) {
             // log and throw
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e;
         }
     }
@@ -1662,7 +1657,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             return result;
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             await this.RollbackTransaction();
             // attempt to persist the status to the DB, although that might fail
             await this.CompleteMergeLogging(mergeRecordLog, result, contextUser);
@@ -1694,7 +1689,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 throw new Error(`Error saving record merge log`);
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e;
         }
     }
@@ -1711,7 +1706,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             if (await recordMergeLog.Save()) {
                 // top level saved, now let's create the deletion detail records for each of the records that were merged
                 for (const d of result.RecordStatus) {
-                    const recordMergeDeletionLog = (await this.GetEntityObject('Record Merge Deletion Logs', contextUser));
+                    const recordMergeDeletionLog = await this.GetEntityObject('Record Merge Deletion Logs', contextUser);
                     recordMergeDeletionLog.NewRecord();
                     recordMergeDeletionLog.RecordMergeLogID = recordMergeLog.ID;
                     recordMergeDeletionLog.DeletedRecordID = d.CompositeKey.Values(); // this would join together all of the primary key values, which is fine as the primary key is a string
@@ -1726,7 +1721,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         }
         catch (e) {
             // do nothing here because we often will get here since some conditions lead to no DB updates possible...
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             // don't bubble up the error here as we're sometimes already in an exception block in caller
         }
     }
@@ -1761,7 +1756,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             let oldData = null;
             // use SQL Server CONCAT function to combine all of the primary key values and then combine them together
             // using the default field delimiter and default value delimiter as defined in the CompositeKey class
-            const concatPKIDString = `CONCAT(${entity.EntityInfo.PrimaryKeys.map((pk) => `'${pk.CodeName}','${global_1.CompositeKey.DefaultValueDelimiter}',${pk.Name}`).join(`,'${global_1.CompositeKey.DefaultFieldDelimiter}',`)})`;
+            const concatPKIDString = `CONCAT(${entity.EntityInfo.PrimaryKeys.map((pk) => `'${pk.CodeName}','${core_1.CompositeKey.DefaultValueDelimiter}',${pk.Name}`).join(`,'${core_1.CompositeKey.DefaultFieldDelimiter}',`)})`;
             if (!bNewRecord)
                 oldData = entity.GetAll(true); // get all the OLD values, only do for existing records, for new records, not relevant
             const logRecordChangeSQL = this.GetLogRecordChangeSQL(entity.GetAll(false), oldData, entity.EntityInfo.Name, '@ID', entity.EntityInfo, bNewRecord ? 'Create' : 'Update', user, false);
@@ -1841,7 +1836,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             const invocationType = baseType === 'validate' ? 'Validate' : before ? 'Before' + baseTypeType : 'After' + baseTypeType;
             const invocationTypeEntity = engine.InvocationTypes.find((i) => i.Name === invocationType);
             if (!invocationTypeEntity) {
-                (0, global_1.LogError)(`Invocation Type ${invocationType} not found in metadata`);
+                (0, core_1.LogError)(`Invocation Type ${invocationType} not found in metadata`);
                 return [];
                 //            throw new Error(`Invocation Type ${invocationType} not found in metadata`);
             }
@@ -1859,7 +1854,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             return results;
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             return [];
         }
     }
@@ -1908,7 +1903,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                                 }
                             }
                             catch (e) {
-                                (0, global_1.LogError)(e.message);
+                                (0, core_1.LogError)(e.message);
                             }
                         }
                     }
@@ -1916,16 +1911,16 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
         }
     }
     async Save(entity, user, options) {
-        const entityResult = new global_1.BaseEntityResult();
+        const entityResult = new core_1.BaseEntityResult();
         try {
             entity.RegisterTransactionPreprocessing();
             const bNewRecord = !entity.IsSaved;
             if (!options)
-                options = new global_1.EntitySaveOptions();
+                options = new core_1.EntitySaveOptions();
             const bReplay = !!options.ReplayOnly;
             if (!bReplay && !bNewRecord && !entity.EntityInfo.AllowUpdateAPI) {
                 // existing record and not allowed to update
@@ -1946,7 +1941,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                         f.ActiveStatusAssertions = false; // turn off warnings for this operation
                         const ret = {
                             FieldName: f.Name,
-                            Value: f.Value,
+                            Value: f.Value
                         };
                         f.ActiveStatusAssertions = tempStatus; // restore the status assertions
                         return ret;
@@ -1991,10 +1986,10 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                         // we are part of a transaction group, so just add our query to the list
                         // and when the transaction is committed, we will send all the queries at once
                         this._bAllowRefresh = false; // stop refreshes of metadata while we're doing work
-                        entity.TransactionGroup.AddTransaction(new global_1.TransactionItem(entity, entityResult.Type === 'create' ? 'Create' : 'Update', sSQL, null, {
+                        entity.TransactionGroup.AddTransaction(new core_1.TransactionItem(entity, entityResult.Type === 'create' ? 'Create' : 'Update', sSQL, null, {
                             dataSource: this._pool,
                             simpleSQLFallback: entity.EntityInfo.TrackRecordChanges ? sqlDetails.simpleSQL : undefined,
-                            entityName: entity.EntityInfo.Name,
+                            entityName: entity.EntityInfo.Name
                         }, (transactionResult, success) => {
                             // we get here whenever the transaction group does gets around to committing
                             // our query.
@@ -2036,7 +2031,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                                 const rawResult = await this.ExecuteSQL(sSQL, null, {
                                     isMutation: true,
                                     description: `Save ${entity.EntityInfo.Name}`,
-                                    simpleSQLFallback: entity.EntityInfo.TrackRecordChanges ? sqlDetails.simpleSQL : undefined,
+                                    simpleSQLFallback: entity.EntityInfo.TrackRecordChanges ? sqlDetails.simpleSQL : undefined
                                 }, user);
                                 result = await this.ProcessEntityRows(rawResult, entity.EntityInfo);
                             }
@@ -2076,7 +2071,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             this._bAllowRefresh = true; // allow refreshes again if we get a failure here
             entityResult.EndedAt = new Date();
             entityResult.Message = e.message;
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e; // rethrow the error
         }
     }
@@ -2193,7 +2188,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             variablesSQL: declarations.length > 0 ? `DECLARE ${declarations.join(',\n        ')}` : '',
             setSQL: setStatements.join('\n'),
             execParams: execParams.join(',\n                '),
-            simpleParams: simpleParams,
+            simpleParams: simpleParams
         };
     }
     /**
@@ -2205,7 +2200,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
     generateSetStatementValue(f, value) {
         let val = value;
         switch (f.TSType) {
-            case global_1.EntityFieldTSType.Boolean:
+            case core_1.EntityFieldTSType.Boolean:
                 // check to see if the value is a string and if it is equal to true, if so, set the value to 1
                 if (typeof value === 'string' && value.trim().toLowerCase() === 'true')
                     val = 1;
@@ -2214,7 +2209,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 else
                     val = value ? 1 : 0;
                 return val.toString();
-            case global_1.EntityFieldTSType.String:
+            case core_1.EntityFieldTSType.String:
                 // Handle string escaping for SET statements
                 if (typeof val === 'string') {
                     val = val.replace(/'/g, "''");
@@ -2226,7 +2221,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                     val = val.replace(/'/g, "''");
                 }
                 return `${f.UnicodePrefix}'${val}'`;
-            case global_1.EntityFieldTSType.Date:
+            case core_1.EntityFieldTSType.Date:
                 if (val !== null && val !== undefined) {
                     if (typeof val === 'number') {
                         // we have a timestamp - milliseconds since Unix Epoch
@@ -2239,7 +2234,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                     val = val.toISOString(); // convert the date to ISO format for storage in the DB
                 }
                 return `'${val}'`;
-            case global_1.EntityFieldTSType.Number:
+            case core_1.EntityFieldTSType.Number:
                 return val.toString();
             default:
                 // For other types, convert to string and quote if needed
@@ -2257,7 +2252,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         let quotes = '';
         let val = value;
         switch (f.TSType) {
-            case global_1.EntityFieldTSType.Boolean:
+            case core_1.EntityFieldTSType.Boolean:
                 // check to see if the value is a string and if it is equal to true, if so, set the value to 1
                 if (typeof value === 'string' && value.trim().toLowerCase() === 'true')
                     val = 1;
@@ -2266,10 +2261,10 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 else
                     val = value ? 1 : 0;
                 break;
-            case global_1.EntityFieldTSType.String:
+            case core_1.EntityFieldTSType.String:
                 quotes = "'";
                 break;
-            case global_1.EntityFieldTSType.Date:
+            case core_1.EntityFieldTSType.Date:
                 quotes = "'";
                 if (val !== null && val !== undefined) {
                     if (typeof val === 'number') {
@@ -2424,7 +2419,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         }
         // Handle arrays recursively
         if (Array.isArray(obj)) {
-            return obj.map((item) => this.escapeQuotesInProperties(item, quoteToEscape));
+            return obj.map(item => this.escapeQuotesInProperties(item, quoteToEscape));
         }
         // Handle objects recursively
         if (typeof obj === 'object') {
@@ -2498,14 +2493,14 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                     bDiff = false; // this branch of logic ensures that undefined and null are treated the same
                 else {
                     switch (f.TSType) {
-                        case global_1.EntityFieldTSType.String:
+                        case core_1.EntityFieldTSType.String:
                             bDiff = oldData[key] !== newData[key];
                             break;
-                        case global_1.EntityFieldTSType.Date:
+                        case core_1.EntityFieldTSType.Date:
                             bDiff = new Date(oldData[key]).getTime() !== new Date(newData[key]).getTime();
                             break;
-                        case global_1.EntityFieldTSType.Number:
-                        case global_1.EntityFieldTSType.Boolean:
+                        case core_1.EntityFieldTSType.Number:
+                        case core_1.EntityFieldTSType.Boolean:
                             bDiff = oldData[key] !== newData[key];
                             break;
                     }
@@ -2558,7 +2553,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             const ret = d[0];
             // we need to post process the retrieval to see if we have any char or nchar fields and we need to remove their trailing spaces
             for (const field of entity.EntityInfo.Fields) {
-                if (field.TSType === global_1.EntityFieldTSType.String &&
+                if (field.TSType === core_1.EntityFieldTSType.String &&
                     field.Type.toLowerCase().includes('char') &&
                     !field.Type.toLowerCase().includes('varchar')) {
                     // trim trailing spaces for char and nchar fields
@@ -2690,11 +2685,11 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         return { fullSQL: sSQL, simpleSQL: sSimpleSQL };
     }
     async Delete(entity, options, user) {
-        const result = new global_1.BaseEntityResult();
+        const result = new core_1.BaseEntityResult();
         try {
             entity.RegisterTransactionPreprocessing();
             if (!options)
-                options = new global_1.EntityDeleteOptions();
+                options = new core_1.EntityDeleteOptions();
             const bReplay = options.ReplayOnly;
             if (!entity.IsSaved && !bReplay)
                 // existing record and not allowed to update
@@ -2722,10 +2717,10 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 entity.RaiseReadyForTransaction();
                 // we are part of a transaction group, so just add our query to the list
                 // and when the transaction is committed, we will send all the queries at once
-                entity.TransactionGroup.AddTransaction(new global_1.TransactionItem(entity, 'Delete', sSQL, null, {
+                entity.TransactionGroup.AddTransaction(new core_1.TransactionItem(entity, 'Delete', sSQL, null, {
                     dataSource: this._pool,
                     simpleSQLFallback: entity.EntityInfo.TrackRecordChanges ? sqlDetails.simpleSQL : undefined,
-                    entityName: entity.EntityInfo.Name,
+                    entityName: entity.EntityInfo.Name
                 }, (transactionResult, success) => {
                     // we get here whenever the transaction group does gets around to committing
                     // our query.
@@ -2766,13 +2761,20 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                     d = await this.ExecuteSQL(sSQL, null, {
                         isMutation: true,
                         description: `Delete ${entity.EntityInfo.Name}`,
-                        simpleSQLFallback: entity.EntityInfo.TrackRecordChanges ? sqlDetails.simpleSQL : undefined,
+                        simpleSQLFallback: entity.EntityInfo.TrackRecordChanges ? sqlDetails.simpleSQL : undefined
                     }, user);
                 }
-                if (d && d[0]) {
+                if (d && d.length > 0) {
                     // SP executed, now make sure the return value matches up as that is how we know the SP was succesfully internally
+                    // Note: When CASCADE operations exist, multiple result sets are returned (d is array of arrays).
+                    // When no CASCADE operations exist, a single result set is returned (d is array of objects).
+                    // We need to handle both cases by checking if the first element is an array.
+                    const isMultipleResultSets = Array.isArray(d[0]);
+                    const deletedRecord = isMultipleResultSets
+                        ? d[d.length - 1][0] // Multiple result sets: get last result set, first row
+                        : d[0]; // Single result set: get first row directly
                     for (const key of entity.PrimaryKeys) {
-                        if (key.Value !== d[0][key.Name]) {
+                        if (key.Value !== deletedRecord[key.Name]) {
                             // we can get here if the sp returns NULL for a given key. The reason that would be the case is if the record
                             // was not found in the DB. This was the existing logic prior to the SP modifications in 2.68.0, just documenting
                             // it here for clarity.
@@ -2796,7 +2798,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             result.Message = e.message;
             result.Success = false;
             result.EndedAt = new Date();
@@ -2907,8 +2909,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                     }
                 }
                 return acc;
-            }, new Date(0) // Unix epoch - lowest possible date to start with
-            );
+            }, new Date(0));
             return {
                 DatasetID: items[0].DatasetID,
                 DatasetName: datasetName,
@@ -3006,7 +3007,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 // the reason we continue below if we have NOT loaded Entities is that when the system first bootstraps, DATASET gets loaded
                 // FIRST before Entities are loaded to load the entity metadata so this would ALWAYS fail :)
                 // entity not found, return a failed result, shouldn't ever get here  due to the foreign key constraint on the table
-                (0, global_1.LogError)(`Entity not found for dataset item ${item.Code} in dataset ${datasetName}`);
+                (0, core_1.LogError)(`Entity not found for dataset item ${item.Code} in dataset ${datasetName}`);
                 return null;
             }
             else {
@@ -3020,7 +3021,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                         }
                     });
                     if (invalidColumns.length > 0) {
-                        (0, global_1.LogError)(`Invalid columns specified for dataset item ${item.Code} in dataset ${datasetName}: ${invalidColumns.join(', ')}`);
+                        (0, core_1.LogError)(`Invalid columns specified for dataset item ${item.Code} in dataset ${datasetName}: ${invalidColumns.join(', ')}`);
                         return null;
                     }
                 }
@@ -3139,7 +3140,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         const appEntities = await this.ExecuteSQL(`SELECT * FROM [${this.MJCoreSchemaName}].vwApplicationEntities ORDER BY ApplicationName`, undefined, undefined, contextUser);
         const ret = [];
         for (let i = 0; i < apps.length; i++) {
-            ret.push(new global_1.ApplicationInfo(this, {
+            ret.push(new core_1.ApplicationInfo(this, {
                 ...apps[i],
                 ApplicationEntities: appEntities.filter((ae) => ae.ApplicationName.trim().toLowerCase() === apps[i].Name.trim().toLowerCase()),
             }));
@@ -3150,7 +3151,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         const alts = await this.ExecuteSQL(`SELECT * FROM [${this.MJCoreSchemaName}].vwAuditLogTypes`, null, undefined, contextUser);
         const ret = [];
         for (let i = 0; i < alts.length; i++) {
-            const alt = new global_1.AuditLogTypeInfo(alts[i]);
+            const alt = new core_1.AuditLogTypeInfo(alts[i]);
             ret.push(alt);
         }
         return ret;
@@ -3160,7 +3161,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         const userRoles = await this.ExecuteSQL(`SELECT * FROM [${this.MJCoreSchemaName}].vwUserRoles ORDER BY UserID`, undefined, undefined, contextUser);
         const ret = [];
         for (let i = 0; i < users.length; i++) {
-            ret.push(new global_1.UserInfo(this, {
+            ret.push(new core_1.UserInfo(this, {
                 ...users[i],
                 UserRoles: userRoles.filter((ur) => ur.UserID === users[i].ID),
             }));
@@ -3172,7 +3173,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
         const authRoles = await this.ExecuteSQL(`SELECT * FROM [${this.MJCoreSchemaName}].vwAuthorizationRoles ORDER BY AuthorizationName`, undefined, undefined, contextUser);
         const ret = [];
         for (let i = 0; i < auths.length; i++) {
-            ret.push(new global_1.AuthorizationInfo(this, {
+            ret.push(new core_1.AuthorizationInfo(this, {
                 ...auths[i],
                 AuthorizationRoles: authRoles.filter((ar) => ar.AuthorizationName.trim().toLowerCase() === auths[i].Name.trim().toLowerCase()),
             }));
@@ -3193,7 +3194,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             return rows;
         }
         // Find all datetime fields in the entity
-        const datetimeFields = entityInfo.Fields.filter((field) => field.TSType === global_1.EntityFieldTSType.Date);
+        const datetimeFields = entityInfo.Fields.filter((field) => field.TSType === core_1.EntityFieldTSType.Date);
         // If there are no datetime fields, return the rows as-is
         if (datetimeFields.length === 0) {
             return rows;
@@ -3295,7 +3296,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 context,
                 options,
                 resolve,
-                reject,
+                reject
             });
         });
     }
@@ -3351,18 +3352,16 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             logSqlStatement: this._logSqlStatement.bind(this),
             clearTransaction: () => {
                 this._transaction = null;
-            },
+            }
         };
         // Convert logging options to internal format
-        const options = loggingOptions
-            ? {
-                description: loggingOptions.description,
-                ignoreLogging: loggingOptions.ignoreLogging,
-                isMutation: loggingOptions.isMutation,
-                simpleSQLFallback: loggingOptions.simpleSQLFallback,
-                contextUser: loggingOptions.contextUser,
-            }
-            : undefined;
+        const options = loggingOptions ? {
+            description: loggingOptions.description,
+            ignoreLogging: loggingOptions.ignoreLogging,
+            isMutation: loggingOptions.isMutation,
+            simpleSQLFallback: loggingOptions.simpleSQLFallback,
+            contextUser: loggingOptions.contextUser
+        } : undefined;
         // Delegate to instance method
         return this._internalExecuteSQLInstance(query, parameters, context, options);
     }
@@ -3381,7 +3380,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 ignoreLogging: options?.ignoreLogging,
                 isMutation: options?.isMutation,
                 simpleSQLFallback: options?.simpleSQLFallback,
-                contextUser: contextUser,
+                contextUser: contextUser
             });
             // Return recordset for consistency with TypeORM behavior
             // If multiple recordsets, return recordsets array
@@ -3412,14 +3411,14 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 logSqlStatement: async (q, p, d, i, m, s, u) => {
                     // Use static logging method
                     await SQLServerDataProvider.LogSQLStatement(q, p, d || 'ExecuteSQLWithPool', m || false, s, u);
-                },
+                }
             };
             // Create options
             const options = {
                 description: 'ExecuteSQLWithPool',
                 ignoreLogging: false,
                 isMutation: false,
-                contextUser: contextUser,
+                contextUser: contextUser
             };
             // Use the static execution method
             const result = await SQLServerDataProvider._internalExecuteSQLStatic(query, parameters, context, options);
@@ -3505,7 +3504,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 transaction: transaction,
                 logSqlStatement: async (q, p, d, i, m, s, u) => {
                     await SQLServerDataProvider.LogSQLStatement(q, p, d || 'Batch execution', m || false, s, u);
-                },
+                }
             };
             // Use named parameters for batch SQL
             const namedParams = batchParameters;
@@ -3514,7 +3513,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 description: 'Batch execution',
                 ignoreLogging: false,
                 isMutation: false,
-                contextUser: contextUser,
+                contextUser: contextUser
             });
             // Return array of recordsets - one for each query
             // Handle both single and multiple recordsets
@@ -3588,14 +3587,14 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 logSqlStatement: this._logSqlStatement.bind(this),
                 clearTransaction: () => {
                     this._transaction = null;
-                },
+                }
             };
             // Execute using instance method (which handles queue for transactions)
             const result = await this._internalExecuteSQLInstance(batchSQL, batchParameters, context, {
                 description: options?.description || 'Batch execution',
                 ignoreLogging: options?.ignoreLogging || false,
                 isMutation: options?.isMutation || false,
-                contextUser: contextUser,
+                contextUser: contextUser
             });
             // Return array of recordsets - one for each query
             // Handle both single and multiple recordsets
@@ -3610,7 +3609,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e;
         }
     }
@@ -3712,13 +3711,13 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 // Create savepoint for nested transaction
                 await this.ExecuteSQL(`SAVE TRANSACTION ${savepointName}`, null, {
                     description: `Creating savepoint ${savepointName} at depth ${this._transactionDepth}`,
-                    ignoreLogging: true,
+                    ignoreLogging: true
                 });
             }
         }
         catch (e) {
             this._transactionDepth--; // Restore depth on error
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e; // force caller to handle
         }
     }
@@ -3749,7 +3748,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e; // force caller to handle
         }
     }
@@ -3775,7 +3774,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 const deferredCount = this._deferredTasks.length;
                 this._deferredTasks = [];
                 if (deferredCount > 0) {
-                    (0, global_1.LogStatus)(`Cleared ${deferredCount} deferred tasks after transaction rollback`);
+                    (0, core_1.LogStatus)(`Cleared ${deferredCount} deferred tasks after transaction rollback`);
                 }
             }
             else {
@@ -3786,7 +3785,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 }
                 await this.ExecuteSQL(`ROLLBACK TRANSACTION ${savepointName}`, null, {
                     description: `Rolling back to savepoint ${savepointName}`,
-                    ignoreLogging: true,
+                    ignoreLogging: true
                 });
                 this._savepointStack.pop();
                 this._transactionDepth--;
@@ -3801,7 +3800,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 this._savepointCounter = 0;
                 this._transactionState$.next(false);
             }
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             throw e; // force caller to handle
         }
     }
@@ -3813,7 +3812,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
     async RefreshIfNeeded() {
         // Skip refresh if a transaction is active
         if (this.isTransactionActive) {
-            (0, global_1.LogStatus)('Skipping metadata refresh - transaction is active');
+            (0, core_1.LogStatus)('Skipping metadata refresh - transaction is active');
             return false;
         }
         // Call parent implementation if no transaction
@@ -3827,7 +3826,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
     async processDeferredTasks() {
         if (this._deferredTasks.length === 0)
             return;
-        (0, global_1.LogStatus)(`Processing ${this._deferredTasks.length} deferred tasks after transaction commit`);
+        (0, core_1.LogStatus)(`Processing ${this._deferredTasks.length} deferred tasks after transaction commit`);
         // Copy and clear the deferred tasks array
         const tasksToProcess = [...this._deferredTasks];
         this._deferredTasks = [];
@@ -3841,11 +3840,11 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                 // Add other task types here as needed
             }
             catch (error) {
-                (0, global_1.LogError)(`Failed to process deferred ${task.type} task: ${error}`);
+                (0, core_1.LogError)(`Failed to process deferred ${task.type} task: ${error}`);
                 // Continue processing other tasks even if one fails
             }
         }
-        (0, global_1.LogStatus)(`Completed processing deferred tasks`);
+        (0, core_1.LogStatus)(`Completed processing deferred tasks`);
     }
     get LocalStorageProvider() {
         if (!this._localStorageProvider)
@@ -3875,13 +3874,13 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
                     return data[0][fields[0]]; // return first field
                 }
                 else {
-                    (0, global_1.LogError)(`Entity ${entityName} record ${CompositeKey.ToString()} not found, returning null`);
+                    (0, core_1.LogError)(`Entity ${entityName} record ${CompositeKey.ToString()} not found, returning null`);
                     return null;
                 }
             }
         }
         catch (e) {
-            (0, global_1.LogError)(e);
+            (0, core_1.LogError)(e);
             return null;
         }
     }
@@ -3894,7 +3893,7 @@ class SQLServerDataProvider extends global_1.DatabaseProviderBase {
             if (!f)
                 f = e.Fields.find((f) => f.Name === 'Name');
             if (!f) {
-                (0, global_1.LogError)(`Entity ${entityName} does not have an IsNameField or a field with the column name of Name, returning null, use recordId`);
+                (0, core_1.LogError)(`Entity ${entityName} does not have an IsNameField or a field with the column name of Name, returning null, use recordId`);
                 return null;
             }
             else {