@memberjunction/sqlserver-dataprovider 2.22.2 → 2.23.0

package/dist/SQLServerDataProvider.js

@@ -1,9 +1,9 @@
 "use strict";
 /**************************************************************************************************************
-* The SQLServerDataProvider provides a data provider for the entities framework that uses SQL Server directly
-* 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.
-**************************************************************************************************************/
+ * The SQLServerDataProvider provides a data provider for the entities framework that uses SQL Server directly
+ * 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.
+ **************************************************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLServerDataProvider = exports.SQLServerProviderConfigData = void 0;
 const core_1 = require("@memberjunction/core");
@@ -14,14 +14,20 @@ const SQLServerTransactionGroup_1 = require("./SQLServerTransactionGroup");
 const UserCache_1 = require("./UserCache");
 const actions_1 = require("@memberjunction/actions");
 class SQLServerProviderConfigData extends core_1.ProviderConfigDataBase {
-    get DataSource() { return this.Data.DataSource; }
-    get CurrentUserEmail() { return this.Data.CurrentUserEmail; }
-    get CheckRefreshIntervalSeconds() { return this.Data.CheckRefreshIntervalSeconds; }
-    constructor(dataSource, currentUserEmail, MJCoreSchemaName, checkRefreshIntervalSeconds = 90 /*default to 90 seconds between checks*/, includeSchemas, excludeSchemas) {
+    get DataSource() {
+        return this.Data.DataSource;
+    }
+    get CurrentUserEmail() {
+        return this.Data.CurrentUserEmail;
+    }
+    get CheckRefreshIntervalSeconds() {
+        return this.Data.CheckRefreshIntervalSeconds;
+    }
+    constructor(dataSource, currentUserEmail, MJCoreSchemaName, checkRefreshIntervalSeconds = 0 /*default to disabling auto refresh */, includeSchemas, excludeSchemas) {
         super({
             DataSource: dataSource,
             CurrentUserEmail: currentUserEmail,
-            CheckRefreshIntervalSeconds: checkRefreshIntervalSeconds
+            CheckRefreshIntervalSeconds: checkRefreshIntervalSeconds,
         }, MJCoreSchemaName, includeSchemas, excludeSchemas);
     }
 }
@@ -32,7 +38,9 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         super(...arguments);
         this._bAllowRefresh = true;
     }
-    get ConfigData() { return super.ConfigData; }
+    get ConfigData() {
+        return super.ConfigData;
+    }
     async Config(configData) {
         try {
             this._dataSource = configData.DataSource;
@@ -41,7 +49,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         }
         catch (e) {
             (0, core_1.LogError)(e);
-            throw (e);
+            throw e;
         }
     }
     /**
@@ -62,7 +70,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             host: dbOptions.host || '',
             port: dbOptions.port || '',
             instanceName: dbOptions.instanceName ? '/' + dbOptions.instanceName : '',
-            database: dbOptions.database || ''
+            database: dbOptions.database || '',
         };
         return options.type + '://' + options.host + ':' + options.port + options.instanceName + '/' + options.database;
     }
@@ -86,9 +94,23 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             const result = await this.ExecuteSQL(sql);
             const end = new Date().getTime();
             if (result)
-                return { Success: true, ReportID: ReportID, Results: result, RowCount: result.length, ExecutionTime: end - start, ErrorMessage: '' };
+                return {
+                    Success: true,
+                    ReportID: ReportID,
+                    Results: result,
+                    RowCount: result.length,
+                    ExecutionTime: end - start,
+                    ErrorMessage: '',
+                };
             else
-                return { Success: false, ReportID: ReportID, Results: [], RowCount: 0, ExecutionTime: end - start, ErrorMessage: 'Error running report SQL' };
+                return {
+                    Success: false,
+                    ReportID: ReportID,
+                    Results: [],
+                    RowCount: 0,
+                    ExecutionTime: end - start,
+                    ErrorMessage: 'Error running report SQL',
+                };
         }
         else
             return { Success: false, ReportID: ReportID, Results: [], RowCount: 0, ExecutionTime: 0, ErrorMessage: 'Report not found' };
@@ -111,9 +133,23 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 const result = await this.ExecuteSQL(sql);
                 const end = new Date().getTime();
                 if (result)
-                    return { Success: true, QueryID: QueryID, Results: result, RowCount: result.length, ExecutionTime: end - start, ErrorMessage: '' };
+                    return {
+                        Success: true,
+                        QueryID: QueryID,
+                        Results: result,
+                        RowCount: result.length,
+                        ExecutionTime: end - start,
+                        ErrorMessage: '',
+                    };
                 else
-                    return { Success: false, QueryID: QueryID, Results: [], RowCount: 0, ExecutionTime: end - start, ErrorMessage: 'Error running query SQL' };
+                    return {
+                        Success: false,
+                        QueryID: QueryID,
+                        Results: [],
+                        RowCount: 0,
+                        ExecutionTime: end - start,
+                        ErrorMessage: 'Error running query SQL',
+                    };
             }
             else
                 return { Success: false, QueryID: QueryID, Results: [], RowCount: 0, ExecutionTime: 0, ErrorMessage: 'Query not found' };
@@ -183,7 +219,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         }
         catch (e) {
             (0, core_1.LogError)(e);
-            throw (e);
+            throw e;
         }
     }
     /**************************************************************************/
@@ -243,7 +279,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 let countSQL = topSQL && topSQL.length > 0 ? `SELECT COUNT(*) AS TotalRowCount FROM [${entityInfo.SchemaName}].${entityInfo.BaseView}` : null;
                 let whereSQL = '';
                 let bHasWhere = false;
-                let userViewRunID = "";
+                let userViewRunID = '';
                 // The view may have a where clause that is part of the view definition. If so, we need to add it to the SQL
                 if (viewEntity?.WhereClause && viewEntity?.WhereClause.length > 0) {
                     const renderedWhere = await this.RenderViewWhereClause(viewEntity, contextUser);
@@ -280,8 +316,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 }
                 // now, check for an exclude UserViewRunID, or exclusion of ALL prior runs
                 // if provided, we need to exclude the records that were part of that run (or all prior runs)
-                if ((excludeUserViewRunID && excludeUserViewRunID.length > 0) ||
-                    (params.ExcludeDataFromAllPriorViewRuns === true)) {
+                if ((excludeUserViewRunID && excludeUserViewRunID.length > 0) || params.ExcludeDataFromAllPriorViewRuns === true) {
                     let sExcludeSQL = `ID NOT IN (SELECT RecordID FROM [${this.MJCoreSchemaName}].vwUserViewRunDetails WHERE EntityID='${viewEntity.EntityID}' AND`;
                     if (params.ExcludeDataFromAllPriorViewRuns === true)
                         sExcludeSQL += ` UserViewID=${viewEntity.ID})`; // exclude ALL prior runs for this view, we do NOT need to also add the UserViewRunID even if it was provided because this will automatically filter that out too
@@ -302,7 +337,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                         bHasWhere = true;
                     }
                 }
-                // NEXT, apply Row Level Security (RLS)  
+                // NEXT, apply Row Level Security (RLS)
                 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, core_1.EntityPermissionType.Read, '');
@@ -325,7 +360,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 // first check params.OrderBy, that takes first priority
                 // if that's not provided, then we check the view definition for its SortState
                 // if that's not provided we do NOT sort
-                const orderBy = params.OrderBy ? params.OrderBy : (viewEntity ? viewEntity.OrderByClause : '');
+                const orderBy = params.OrderBy ? params.OrderBy : viewEntity ? viewEntity.OrderByClause : '';
                 // if we're saving the view results, we need to wrap the entire SQL statement
                 if (viewEntity?.ID && viewEntity?.ID.length > 0 && saveViewResults && user) {
                     const { executeViewSQL, runID } = await this.executeSQLForUserViewRunLogging(viewEntity.ID, viewEntity.EntityBaseView, whereSQL, orderBy, user);
@@ -333,7 +368,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                     userViewRunID = runID;
                 }
                 else if (orderBy && orderBy.length > 0) {
-                    // we only add order by if we're not doing run logging. This is becuase the run logging will 
+                    // we only add order by if we're not doing run logging. This is becuase the run logging will
                     // add the order by to its SELECT query that pulls from the list of records that were returned
                     // there is no point in ordering the rows as they are saved into an audit list anyway so no order-by above
                     // just here for final step before we execute it.
@@ -341,9 +376,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                         throw new Error(`Invalid Order By clause: ${orderBy}, contains one more for forbidden keywords`);
                     viewSQL += ` ORDER BY ${orderBy}`;
                 }
-                if (params.StartRow && params.StartRow > 0
-                    && params.MaxRows && params.MaxRows > 0
-                    && entityInfo.FirstPrimaryKey) {
+                if (params.StartRow && params.StartRow > 0 && params.MaxRows && params.MaxRows > 0 && entityInfo.FirstPrimaryKey) {
                     viewSQL += ` ORDER BY ${entityInfo.FirstPrimaryKey.Name} `;
                     viewSQL += ` OFFSET ${params.StartRow} ROWS FETCH NEXT ${params.MaxRows} ROWS ONLY`;
                 }
@@ -360,26 +393,31 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                     }
                 }
                 const stopTime = new Date();
-                if (params.ForceAuditLog || (viewEntity?.ID && (extraFilter === undefined || extraFilter === null || extraFilter?.trim().length === 0) && entityInfo.AuditViewRuns)) {
+                if (params.ForceAuditLog ||
+                    (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, 
+                    // we do NOT want to wait for this, so no await,
                     this.createAuditLogRecord(user, 'Run View', 'Run View', 'Success', JSON.stringify({
                         ViewID: viewEntity?.ID,
                         ViewName: viewEntity?.Name,
                         Description: params.AuditLogDescription,
                         RowCount: retData.length,
-                        SQL: viewSQL
+                        SQL: viewSQL,
                     }), entityInfo.ID, null, params.AuditLogDescription);
                 }
                 return {
-                    RowCount: params.ResultType === 'count_only' ? rowCount : retData.length, /*this property should be total row count if the ResultType='count_only' otherwise it should be the row count of the returned rows */
+                    RowCount: params.ResultType === 'count_only'
+                        ? rowCount
+                        : retData.length /*this property should be total row count if the ResultType='count_only' otherwise it should be the row count of the returned rows */,
                     TotalRowCount: rowCount ? rowCount : retData.length,
                     Results: retData,
                     UserViewRunID: userViewRunID,
                     ExecutionTime: stopTime.getTime() - startTime.getTime(),
                     Success: true,
-                    ErrorMessage: null
+                    ErrorMessage: null,
                 };
             }
             else
@@ -392,10 +430,10 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 RowCount: 0,
                 TotalRowCount: 0,
                 Results: [],
-                UserViewRunID: "",
+                UserViewRunID: '',
                 ExecutionTime: exceptionStopTime.getTime() - startTime.getTime(),
                 Success: false,
-                ErrorMessage: e.message
+                ErrorMessage: e.message,
             };
         }
     }
@@ -424,7 +462,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             /\bunion\b/,
             /\bcast\b/,
             /\bxp_/,
-            /;/
+            /;/,
         ];
         // Check for forbidden patterns
         for (const pattern of forbiddenPatterns) {
@@ -440,10 +478,12 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         if (fieldList.length === 0)
             return '*';
         else
-            return fieldList.map(f => {
+            return fieldList
+                .map((f) => {
                 const asString = f.CodeName === f.Name ? '' : ` AS [${f.CodeName}]`;
                 return `[${f.Name}]${asString}`;
-            }).join(',');
+            })
+                .join(',');
     }
     getRunTimeViewFieldArray(params, viewEntity) {
         const fieldList = [];
@@ -460,7 +500,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             if (params.Fields) {
                 // fields provided, if primary key isn't included, add it first
                 for (const ef of entityInfo.PrimaryKeys) {
-                    if (params.Fields.find(f => f.trim().toLowerCase() === ef.Name.toLowerCase()) === undefined)
+                    if (params.Fields.find((f) => f.trim().toLowerCase() === ef.Name.toLowerCase()) === undefined)
                         fieldList.push(ef); // always include the primary key fields in view run time field list
                 }
                 // now add the rest of the param.Fields to fields
@@ -479,7 +519,8 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 if (viewEntity) {
                     // saved view, figure out it's field list
                     viewEntity.Columns.forEach((c) => {
-                        if (!c.hidden) { // only return the non-hidden fields
+                        if (!c.hidden) {
+                            // only return the non-hidden fields
                             if (c.EntityField) {
                                 fieldList.push(c.EntityField);
                             }
@@ -490,7 +531,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                     });
                     // the below shouldn't happen as the pkey fields should always be included by now, but make SURE...
                     for (const ef of entityInfo.PrimaryKeys) {
-                        if (fieldList.find(f => f.Name?.trim().toLowerCase() === ef.Name?.toLowerCase()) === undefined)
+                        if (fieldList.find((f) => f.Name?.trim().toLowerCase() === ef.Name?.toLowerCase()) === undefined)
                             fieldList.push(ef); // always include the primary key fields in view run time field list
                     }
                 }
@@ -512,13 +553,13 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             `;
         const runIDResult = await this._dataSource.query(sSQL);
         const runID = runIDResult[0].UserViewRunID;
-        const sRetSQL = `SELECT * FROM [${entityInfo.SchemaName}].${entityBaseView} WHERE ${entityInfo.FirstPrimaryKey.Name} IN 
+        const sRetSQL = `SELECT * FROM [${entityInfo.SchemaName}].${entityBaseView} WHERE ${entityInfo.FirstPrimaryKey.Name} IN
                                     (SELECT RecordID FROM [${this.MJCoreSchemaName}].vwUserViewRunDetails WHERE UserViewRunID=${runID})
                                  ${orderBySQL && orderBySQL.length > 0 ? ' ORDER BY ' + orderBySQL : ''}`;
         return { executeViewSQL: sRetSQL, runID: runID };
     }
     createViewUserSearchSQL(entityInfo, userSearchString) {
-        // we have a user search string. 
+        // we have a user search string.
         // if we have full text search, we use that.
         // Otherwise, we need to manually construct the additional filter associated with this. The user search string is just text from the user
         // we need to apply it to one or more fields that are part of the entity that support being part of a user search.
@@ -535,11 +576,11 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             const uUpper = u.toUpperCase();
             if (uUpper.includes(' AND ') || uUpper.includes(' OR ') || uUpper.includes(' NOT ')) {
                 //replace all spaces with %, but add spaces inbetween the original and, or and not keywords
-                u = uUpper.replace(/ /g, "%").replace(/%AND%/g, " AND ").replace(/%OR%/g, " OR ").replace(/%NOT%/g, " NOT ");
+                u = uUpper.replace(/ /g, '%').replace(/%AND%/g, ' AND ').replace(/%OR%/g, ' OR ').replace(/%NOT%/g, ' NOT ');
             }
             else if (uUpper.includes('AND') || uUpper.includes('OR') || uUpper.includes('NOT')) {
                 //leave the string alone, except replacing spaces with %
-                u = u.replace(/ /g, "%");
+                u = u.replace(/ /g, '%');
             }
             else if (u.includes(' ')) {
                 if (u.startsWith('"') && u.endsWith('"')) {
@@ -577,8 +618,12 @@ class SQLServerDataProvider extends core_1.ProviderBase {
     }
     async createAuditLogRecord(user, authorizationName, auditLogTypeName, status, details, entityId, recordId, auditLogDescription) {
         try {
-            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 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;
             if (!user)
                 throw new Error(`User is a required parameter`);
             if (!auditLogType)
@@ -646,14 +691,13 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         }
         catch (e) {
             (0, core_1.LogError)(e);
-            throw (e);
+            throw e;
         }
     }
     async SetRecordFavoriteStatus(userId, entityName, CompositeKey, isFavorite, contextUser) {
         try {
             const currentFavoriteId = await this.GetRecordFavoriteID(userId, entityName, CompositeKey);
-            if ((currentFavoriteId === null && isFavorite === false) ||
-                (currentFavoriteId !== null && isFavorite === true))
+            if ((currentFavoriteId === null && isFavorite === false) || (currentFavoriteId !== null && isFavorite === true))
                 return; // no change
             // if we're here that means we need to invert the status, which either means creating a record or deleting a record
             const e = this.Entities.find((e) => e.Name === entityName);
@@ -680,7 +724,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         }
         catch (e) {
             (0, core_1.LogError)(e);
-            throw (e);
+            throw e;
         }
     }
     async GetRecordChanges(entityName, compositeKey) {
@@ -690,7 +734,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         }
         catch (e) {
             (0, core_1.LogError)(e);
-            throw (e);
+            throw e;
         }
     }
     /**
@@ -709,24 +753,24 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             // 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(`,'${core_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
                 if (sSQL.length > 0)
                     sSQL += ' UNION ALL ';
-                // there is a layer of indirection here because each ROW in each of the entity records for this entity/field combination could point to a DIFFERENT 
+                // there is a layer of indirection here because each ROW in each of the entity records for this entity/field combination could point to a DIFFERENT
                 // entity. We find out which entity it is pointed to via the EntityIDFieldName in the field definition, so we have to filter the rows in the entity
                 // based on that.
-                sSQL += `SELECT 
-                            '${entityName}' AS EntityName, 
-                            '${entity.Name}' AS RelatedEntityName, 
-                            ${primaryKeySelectString} AS PrimaryKeyValue, 
-                            '${f.Name}' AS FieldName 
-                        FROM 
+                sSQL += `SELECT
+                            '${entityName}' AS EntityName,
+                            '${entity.Name}' AS RelatedEntityName,
+                            ${primaryKeySelectString} AS PrimaryKeyValue,
+                            '${f.Name}' AS FieldName
+                        FROM
                             [${entity.SchemaName}].[${entity.BaseView}]
-                        WHERE 
-                            [${f.EntityIDFieldName}] = ${quotes}${entity.ID}${quotes} AND 
+                        WHERE
+                            [${f.EntityIDFieldName}] = ${quotes}${entity.ID}${quotes} AND
                             [${f.Name}] = ${quotes}${compositeKey.GetValueByIndex(0)}${quotes}`; // we only use the first primary key value, this is because we don't yet support composite primary keys
             });
         });
@@ -738,17 +782,17 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             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(`,'${core_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 
-                        '${entityDependency.EntityName}' AS EntityName, 
-                        '${entityDependency.RelatedEntityName}' AS RelatedEntityName, 
-                        ${primaryKeySelectString} AS PrimaryKeyValue, 
-                        '${entityDependency.FieldName}' AS FieldName 
-                    FROM 
+            sSQL += `SELECT
+                        '${entityDependency.EntityName}' AS EntityName,
+                        '${entityDependency.RelatedEntityName}' AS RelatedEntityName,
+                        ${primaryKeySelectString} AS PrimaryKeyValue,
+                        '${entityDependency.FieldName}' AS FieldName
+                    FROM
                         [${relatedEntityInfo.SchemaName}].[${relatedEntityInfo.BaseView}]
-                    WHERE 
+                    WHERE
                         [${entityDependency.FieldName}] = ${this.GetRecordDependencyLinkSQL(entityDependency, entityInfo, relatedEntityInfo, compositeKey)}`;
         }
         return sSQL;
@@ -771,8 +815,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 return recordDependencies;
             }
             // now, we have to construct a query that will return the dependencies for this record, both hard and soft links
-            const sSQL = this.GetHardLinkDependencySQL(entityDependencies, compositeKey) + '\n' +
-                this.GetSoftLinkDependencySQL(entityName, compositeKey);
+            const sSQL = this.GetHardLinkDependencySQL(entityDependencies, compositeKey) + '\n' + this.GetSoftLinkDependencySQL(entityName, compositeKey);
             // now, execute the query
             const result = await this.ExecuteSQL(sSQL);
             if (!result || result.length === 0) {
@@ -803,7 +846,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                     EntityName: r.EntityName,
                     RelatedEntityName: r.RelatedEntityName,
                     FieldName: r.FieldName,
-                    PrimaryKey: compositeKey
+                    PrimaryKey: compositeKey,
                 };
                 recordDependencies.push(recordDependency);
             }
@@ -812,7 +855,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         catch (e) {
             // log and throw
             (0, core_1.LogError)(e);
-            throw (e);
+            throw e;
         }
     }
     GetRecordDependencyLinkSQL(dep, entity, relatedEntity, CompositeKey) {
@@ -834,7 +877,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
     }
     async GetRecordDuplicates(params, contextUser) {
         if (!contextUser) {
-            throw new Error("User context is required to get record duplicates.");
+            throw new Error('User context is required to get record duplicates.');
         }
         const listEntity = await this.GetEntityObject('Lists');
         listEntity.ContextCurrentUser = contextUser;
@@ -857,12 +900,12 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         }
         let response = {
             Status: 'Inprogress',
-            PotentialDuplicateResult: []
+            PotentialDuplicateResult: [],
         };
         return response;
     }
     async MergeRecords(request, contextUser) {
-        const e = this.Entities.find(e => e.Name.trim().toLowerCase() === request.EntityName.trim().toLowerCase());
+        const e = this.Entities.find((e) => e.Name.trim().toLowerCase() === request.EntityName.trim().toLowerCase());
         if (!e || !e.AllowRecordMerge)
             throw new Error(`Entity ${request.EntityName} does not allow record merging, check the AllowRecordMerge property in the entity metadata`);
         const result = {
@@ -875,13 +918,13 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         const mergeRecordLog = await this.StartMergeLogging(request, result, contextUser);
         try {
             /*
-                we will follow this process...
-                * 1. Begin Transaction
-                * 2. The surviving record is loaded and fields are updated from the field map, if provided, and the record is saved. If a FieldMap not provided within the request object, this step is skipped.
-                * 3. For each of the records that will be merged INTO the surviving record, we call the GetEntityDependencies() method and get a list of all other records in the database are linked to the record to be deleted. We then go through each of those dependencies and update the link to point to the SurvivingRecordID and save the record.
-                * 4. The record to be deleted is then deleted.
-                * 5. Commit or Rollback Transaction
-             */
+                      we will follow this process...
+                      * 1. Begin Transaction
+                      * 2. The surviving record is loaded and fields are updated from the field map, if provided, and the record is saved. If a FieldMap not provided within the request object, this step is skipped.
+                      * 3. For each of the records that will be merged INTO the surviving record, we call the GetEntityDependencies() method and get a list of all other records in the database are linked to the record to be deleted. We then go through each of those dependencies and update the link to point to the SurvivingRecordID and save the record.
+                      * 4. The record to be deleted is then deleted.
+                      * 5. Commit or Rollback Transaction
+                   */
             // Step 1 - begin transaction
             await this.BeginTransaction();
             // Step 2 - update the surviving record, but only do this if we were provided a field map
@@ -891,7 +934,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 for (const fieldMap of request.FieldMap) {
                     survivor.Set(fieldMap.FieldName, fieldMap.Value);
                 }
-                if (!await survivor.Save()) {
+                if (!(await survivor.Save())) {
                     result.OverallStatus = 'Error saving survivor record with values from provided field map.';
                     throw new Error(result.OverallStatus);
                 }
@@ -913,13 +956,13 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                     await relatedEntity.InnerLoad(dependency.PrimaryKey);
                     relatedEntity.Set(dependency.FieldName, request.SurvivingRecordCompositeKey.GetValueByIndex(0)); // only support single field foreign keys for now
                     /*
-                    if we later support composite foreign keys, we'll need to do this instead, at the moment this code will break as dependency.KeyValuePair is a single value, not an array
-
-                    for (let pkv of dependency.KeyValuePairs) {
-                        relatedEntity.Set(dependency.FieldName, pkv.Value);
-                    }
-                     */
-                    if (!await relatedEntity.Save()) {
+                              if we later support composite foreign keys, we'll need to do this instead, at the moment this code will break as dependency.KeyValuePair is a single value, not an array
+          
+                              for (let pkv of dependency.KeyValuePairs) {
+                                  relatedEntity.Set(dependency.FieldName, pkv.Value);
+                              }
+                               */
+                    if (!(await relatedEntity.Save())) {
                         newRecStatus.Success = false;
                         newRecStatus.Message = `Error updating dependency record ${dependency.PrimaryKey.ToString} for entity ${dependency.RelatedEntityName} to point to surviving record ${request.SurvivingRecordCompositeKey.ToString()}`;
                         throw new Error(newRecStatus.Message);
@@ -928,7 +971,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 // if we get here, that means that all of the dependencies were updated successfully, so we can now delete the records to be merged
                 const recordToDelete = await this.GetEntityObject(request.EntityName, contextUser);
                 await recordToDelete.InnerLoad(pksToDelete);
-                if (!await recordToDelete.Delete()) {
+                if (!(await recordToDelete.Delete())) {
                     newRecStatus.Message = `Error deleting record ${pksToDelete.ToString()} for entity ${request.EntityName}`;
                     throw new Error(newRecStatus.Message);
                 }
@@ -947,7 +990,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             await this.RollbackTransaction();
             // attempt to persist the status to the DB, although that might fail
             await this.CompleteMergeLogging(mergeRecordLog, result, contextUser);
-            throw (e);
+            throw e;
         }
     }
     async StartMergeLogging(request, result, contextUser) {
@@ -961,7 +1004,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 throw new Error(`contextUser is null and no CurrentUser is set`);
             recordMergeLog.NewRecord();
             recordMergeLog.EntityID = entity.ID;
-            recordMergeLog.SurvivingRecordID = request.SurvivingRecordCompositeKey.Values(); // this would join together all of the primary key values, which is fine as the primary key is a string    
+            recordMergeLog.SurvivingRecordID = request.SurvivingRecordCompositeKey.Values(); // this would join together all of the primary key values, which is fine as the primary key is a string
             recordMergeLog.InitiatedByUserID = contextUser ? contextUser.ID : this.CurrentUser?.ID;
             recordMergeLog.ApprovalStatus = 'Approved';
             recordMergeLog.ApprovedByUserID = contextUser ? contextUser.ID : this.CurrentUser?.ID;
@@ -976,7 +1019,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         }
         catch (e) {
             (0, core_1.LogError)(e);
-            throw (e);
+            throw e;
         }
     }
     async CompleteMergeLogging(recordMergeLog, result, contextUser) {
@@ -986,18 +1029,19 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 throw new Error(`contextUser is null and no CurrentUser is set`);
             recordMergeLog.ProcessingStatus = result.Success ? 'Complete' : 'Error';
             recordMergeLog.ProcessingEndedAt = new Date();
-            if (!result.Success) // only create the log record if the merge failed, otherwise it is wasted space
+            if (!result.Success)
+                // only create the log record if the merge failed, otherwise it is wasted space
                 recordMergeLog.ProcessingLog = result.OverallStatus;
             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
                     recordMergeDeletionLog.Status = d.Success ? 'Complete' : 'Error';
                     recordMergeDeletionLog.ProcessingLog = d.Success ? null : d.Message; // only save the message if it failed
-                    if (!await recordMergeDeletionLog.Save())
+                    if (!(await recordMergeDeletionLog.Save()))
                         throw new Error(`Error saving record merge deletion log`);
                 }
             }
@@ -1012,13 +1056,14 @@ class SQLServerDataProvider extends core_1.ProviderBase {
     }
     GetSaveSQL(entity, bNewRecord, spName, user) {
         const sSimpleSQL = `EXEC [${entity.EntityInfo.SchemaName}].${spName} ${this.generateSPParams(entity, !bNewRecord)}`;
-        const recordChangesEntityInfo = this.Entities.find(e => e.Name === 'Record Changes');
+        const recordChangesEntityInfo = this.Entities.find((e) => e.Name === 'Record Changes');
         let sSQL = '';
-        if (entity.EntityInfo.TrackRecordChanges && entity.EntityInfo.Name.trim().toLowerCase() !== 'record changes') { // don't track changes for the record changes entity
+        if (entity.EntityInfo.TrackRecordChanges && entity.EntityInfo.Name.trim().toLowerCase() !== 'record changes') {
+            // don't track changes for the record changes entity
             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}','${core_1.CompositeKey.DefaultValueDelimiter}',${pk.Name}`).join(`,'${core_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
             sSQL = `
@@ -1029,13 +1074,13 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                     INSERT INTO @ResultTable
                     ${sSimpleSQL}
 
-                    DECLARE @ID NVARCHAR(MAX) 
+                    DECLARE @ID NVARCHAR(MAX)
                     SELECT @ID = ${concatPKIDString} FROM @ResultTable
-                    IF @ID IS NOT NULL 
+                    IF @ID IS NOT NULL
                     BEGIN
                         DECLARE @ResultChangesTable TABLE (
-                            ${this.getAllEntityColumnsSQL(recordChangesEntityInfo)}                            
-                        )                              
+                            ${this.getAllEntityColumnsSQL(recordChangesEntityInfo)}
+                        )
 
                         INSERT INTO @ResultChangesTable
                         ${this.GetLogRecordChangeSQL(entity.GetAll(false), oldData, entity.EntityInfo.Name, '@ID', entity.EntityInfo, bNewRecord ? 'Create' : 'Update', user, false)}
@@ -1050,8 +1095,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         return sSQL;
     }
     GetEntityAIActions(entityInfo, before) {
-        return aiengine_1.AIEngine.Instance.EntityAIActions.filter((a) => a.EntityID === entityInfo.ID &&
-            a.TriggerEvent.toLowerCase().trim() === (before ? 'before save' : 'after save'));
+        return aiengine_1.AIEngine.Instance.EntityAIActions.filter((a) => a.EntityID === entityInfo.ID && a.TriggerEvent.toLowerCase().trim() === (before ? 'before save' : 'after save'));
     }
     async HandleEntityActions(entity, baseType, before, user) {
         // use the EntityActionEngine for this
@@ -1060,7 +1104,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             await engine.Config(false, user);
             const newRecord = entity.IsSaved ? false : true;
             const baseTypeType = baseType === 'save' ? (newRecord ? 'Create' : 'Update') : 'Delete';
-            const invocationType = baseType === 'validate' ? 'Validate' : (before ? 'Before' + baseTypeType : 'After' + baseTypeType);
+            const invocationType = baseType === 'validate' ? 'Validate' : before ? 'Before' + baseTypeType : 'After' + baseTypeType;
             const invocationTypeEntity = engine.InvocationTypes.find((i) => i.Name === invocationType);
             if (!invocationTypeEntity) {
                 (0, core_1.LogError)(`Invocation Type ${invocationType} not found in metadata`);
@@ -1074,7 +1118,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                     EntityAction: a,
                     EntityObject: entity,
                     InvocationType: invocationTypeEntity,
-                    ContextUser: user
+                    ContextUser: user,
                 });
                 results.push(result);
             }
@@ -1106,13 +1150,12 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 const ai = aiengine_1.AIEngine.Instance;
                 for (let i = 0; i < actions.length; i++) {
                     const a = actions[i];
-                    if (a.TriggerEvent === 'before save' && before ||
-                        a.TriggerEvent === 'after save' && !before) {
+                    if ((a.TriggerEvent === 'before save' && before) || (a.TriggerEvent === 'after save' && !before)) {
                         const p = {
                             entityAIActionId: a.ID,
                             entityRecord: entity,
                             actionId: a.AIActionID,
-                            modelId: a.AIModelID
+                            modelId: a.AIModelID,
                         };
                         if (before) {
                             // do it with await so we're blocking, as it needs to complete before the record save continues
@@ -1154,11 +1197,13 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             else {
                 // getting here means we are good to save, now check to see if we're dirty and need to save
                 // REMEMBER - this is the provider and the BaseEntity/subclasses handle user-level permission checking already, we just make sure API was turned on for the operation
-                if (entity.Dirty || (options.IgnoreDirtyState || options.ReplayOnly)) {
+                if (entity.Dirty || options.IgnoreDirtyState || options.ReplayOnly) {
                     entityResult.StartedAt = new Date();
                     entityResult.Type = bNewRecord ? 'create' : 'update';
-                    entityResult.OriginalValues = entity.Fields.map(f => { return { FieldName: f.Name, Value: f.Value }; }); // save the original values before we start the process
-                    entity.ResultHistory.push(entityResult); // push the new result as we have started a process        
+                    entityResult.OriginalValues = entity.Fields.map((f) => {
+                        return { FieldName: f.Name, Value: f.Value };
+                    }); // save the original values before we start the process
+                    entity.ResultHistory.push(entityResult); // push the new result as we have started a process
                     // The assumption is that Validate() has already been called by the BaseEntity object that is invoking this provider.
                     // However, we have an extra responsibility in this situation which is to fire off the EntityActions for the Validate invocation type and
                     // make sure they clear. If they don't clear we throw an exception with the message provided.
@@ -1166,7 +1211,10 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                         const validationResult = await this.HandleEntityActions(entity, 'validate', false, user);
                         if (validationResult && validationResult.length > 0) {
                             // one or more actions executed, see the reults and if any failed, concat their messages and return as exception being thrown
-                            const message = validationResult.filter(v => !v.Success).map(v => v.Message).join('\n\n');
+                            const message = validationResult
+                                .filter((v) => !v.Success)
+                                .map((v) => v.Message)
+                                .join('\n\n');
                             if (message) {
                                 entityResult.Success = false;
                                 entityResult.EndedAt = new Date();
@@ -1178,8 +1226,13 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                     else {
                         // we are in replay mode we so do NOT need to do the validation stuff, skipping it...
                     }
-                    const spName = bNewRecord ? (entity.EntityInfo.spCreate && entity.EntityInfo.spCreate.length > 0 ? entity.EntityInfo.spCreate : 'spCreate' + entity.EntityInfo.BaseTable) :
-                        (entity.EntityInfo.spUpdate && entity.EntityInfo.spUpdate.length > 0 ? entity.EntityInfo.spUpdate : 'spUpdate' + entity.EntityInfo.BaseTable);
+                    const spName = bNewRecord
+                        ? entity.EntityInfo.spCreate && entity.EntityInfo.spCreate.length > 0
+                            ? entity.EntityInfo.spCreate
+                            : 'spCreate' + entity.EntityInfo.BaseTable
+                        : entity.EntityInfo.spUpdate && entity.EntityInfo.spUpdate.length > 0
+                            ? entity.EntityInfo.spUpdate
+                            : 'spUpdate' + entity.EntityInfo.BaseTable;
                     if (options.SkipEntityActions !== true /*options set, but not set to skip entity actions*/) {
                         await this.HandleEntityActions(entity, 'save', true, user);
                     }
@@ -1198,7 +1251,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                             this._bAllowRefresh = false; // stop refreshes of metadata while we're doing work
                             entity.TransactionGroup.AddTransaction(new core_1.TransactionItem(entity, sSQL, null, { dataSource: this._dataSource }, (results, success) => {
                                 // we get here whenever the transaction group does gets around to committing
-                                // our query.  
+                                // our query.
                                 this._bAllowRefresh = true; // allow refreshes again
                                 entityResult.EndedAt = new Date();
                                 if (success && results) {
@@ -1214,7 +1267,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                                     resolve(results[0]);
                                 }
                                 else {
-                                    // the transaction failed, nothing to update, but we need to call Reject so the 
+                                    // the transaction failed, nothing to update, but we need to call Reject so the
                                     // promise resolves with a rejection so our outer caller knows
                                     entityResult.Success = false;
                                     entityResult.Message = 'Transaction Failed';
@@ -1276,18 +1329,18 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             const f = entity.EntityInfo.Fields[i];
             if (f.AllowUpdateAPI) {
                 if (!f.SkipValidation) {
-                    // DO NOT INCLUDE any fields where we skip validation, these are fields that are not editable by the user/object 
+                    // DO NOT INCLUDE any fields where we skip validation, these are fields that are not editable by the user/object
                     // model/api because they're special fields like ID, CreatedAt, etc. or they're virtual or auto-increment, etc.
                     let value = entity.Get(f.Name);
                     if (f.Type.trim().toLowerCase() === 'datetimeoffset') {
                         value = new Date(value).toISOString();
                     }
                     else if (!isUpdate && f.Type.trim().toLowerCase() === 'uniqueidentifier') {
-                        // in the case of unique identifiers, for CREATE procs only, 
+                        // in the case of unique identifiers, for CREATE procs only,
                         // we need to check to see if the value we have in the entity object is a function like newid() or newsquentialid()
-                        // in those cases we should just skip the parameter entirely because that means there is a default value that should be used 
+                        // in those cases we should just skip the parameter entirely because that means there is a default value that should be used
                         // and that will be handled by the database not by us
-                        // instead of just checking for specific functions like newid(), we can instead check for any string that includes () 
+                        // instead of just checking for specific functions like newid(), we can instead check for any string that includes ()
                         // this way we can handle any function that the database might support in the future
                         if (typeof value === 'string' && value.includes('()')) {
                             continue; // skip this field entirely by going to the next iteration of the loop
@@ -1362,7 +1415,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         }
         else
             pVal = paramValue;
-        return (paramValue === null || paramValue === undefined) ? "NULL" : quoteString + pVal + quoteString;
+        return paramValue === null || paramValue === undefined ? 'NULL' : quoteString + pVal + quoteString;
     }
     GetLogRecordChangeSQL(newData, oldData, entityName, recordID, entityInfo, type, user, wrapRecordIdInQuotes) {
         const fullRecordJSON = JSON.stringify(this.escapeQuotesInProperties(newData ? newData : oldData, "'")); // stringify old data if we don't have new - means we are DELETING A RECORD
@@ -1371,14 +1424,14 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         if (changesKeys.length > 0 || oldData === null /*new record*/ || newData === null /*deleted record*/) {
             const changesJSON = changes !== null ? JSON.stringify(changes) : '';
             const quotes = wrapRecordIdInQuotes ? "'" : '';
-            const sSQL = `EXEC [${this.MJCoreSchemaName}].spCreateRecordChange_Internal @EntityName='${entityName}', 
-                                                                                        @RecordID=${quotes}${recordID}${quotes}, 
+            const sSQL = `EXEC [${this.MJCoreSchemaName}].spCreateRecordChange_Internal @EntityName='${entityName}',
+                                                                                        @RecordID=${quotes}${recordID}${quotes},
                                                                                         @UserID='${user.ID}',
                                                                                         @Type='${type}',
-                                                                                        @ChangesJSON='${changesJSON}', 
-                                                                                        @ChangesDescription='${oldData && newData ? this.CreateUserDescriptionOfChanges(changes) : !oldData ? 'Record Created' : 'Record Deleted'}', 
-                                                                                        @FullRecordJSON='${fullRecordJSON}', 
-                                                                                        @Status='Complete', 
+                                                                                        @ChangesJSON='${changesJSON}',
+                                                                                        @ChangesDescription='${oldData && newData ? this.CreateUserDescriptionOfChanges(changes) : !oldData ? 'Record Created' : 'Record Deleted'}',
+                                                                                        @FullRecordJSON='${fullRecordJSON}',
+                                                                                        @Status='Complete',
                                                                                         @Comments=null`;
             return sSQL;
         }
@@ -1407,11 +1460,14 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             if (sRet.length > 0) {
                 sRet += '\n';
             }
-            if (change.oldValue && change.newValue) // both old and new values set, show change
+            if (change.oldValue && change.newValue)
+                // both old and new values set, show change
                 sRet += `${change.field} changed from ${this.trimString(change.oldValue, maxValueLength, cutOffText)} to ${this.trimString(change.newValue, maxValueLength, cutOffText)}`;
-            else if (change.newValue) // old value was blank, new value isn't
+            else if (change.newValue)
+                // old value was blank, new value isn't
                 sRet += `${change.field} set to ${this.trimString(change.newValue, maxValueLength, cutOffText)}`;
-            else if (change.oldValue) // new value is blank, old value wasn't
+            else if (change.oldValue)
+                // new value is blank, old value wasn't
                 sRet += `${change.field} cleared from ${this.trimString(change.oldValue, maxValueLength, cutOffText)}`;
         }
         return sRet.replace(/'/g, "''");
@@ -1451,12 +1507,11 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         else {
             const changes = {};
             for (const key in newData) {
-                const f = entityInfo.Fields.find(f => f.Name.toLowerCase() === key.toLowerCase());
+                const f = entityInfo.Fields.find((f) => f.Name.toLowerCase() === key.toLowerCase());
                 let bDiff = false;
                 if (f.ReadOnly)
                     bDiff = false; // read only fields are never different, they can change in the database, but we don't consider them to be a change for record changes purposes.
-                else if ((oldData[key] == undefined || oldData[key] == null) &&
-                    (newData[key] == undefined || newData[key] == null))
+                else if ((oldData[key] == undefined || oldData[key] == null) && (newData[key] == undefined || newData[key] == null))
                     bDiff = false; // this branch of logic ensures that undefined and null are treated the same
                 else {
                     switch (f.TSType) {
@@ -1464,7 +1519,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                             bDiff = oldData[key] !== newData[key];
                             break;
                         case core_1.EntityFieldTSType.Date:
-                            bDiff = (new Date(oldData[key]).getTime() !== new Date(newData[key]).getTime());
+                            bDiff = new Date(oldData[key]).getTime() !== new Date(newData[key]).getTime();
                             break;
                         case core_1.EntityFieldTSType.Number:
                         case core_1.EntityFieldTSType.Boolean:
@@ -1475,14 +1530,12 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 if (bDiff) {
                     // make sure we escape things properly
                     const r = new RegExp(quoteToEscape, 'g');
-                    const o = (oldData[key] && typeof oldData[key] === 'string') ?
-                        oldData[key].replace(r, quoteToEscape + quoteToEscape) : oldData[key];
-                    const n = (newData[key] && typeof newData[key] === 'string') ?
-                        newData[key].replace(r, quoteToEscape + quoteToEscape) : newData[key];
+                    const o = oldData[key] && typeof oldData[key] === 'string' ? oldData[key].replace(r, quoteToEscape + quoteToEscape) : oldData[key];
+                    const n = newData[key] && typeof newData[key] === 'string' ? newData[key].replace(r, quoteToEscape + quoteToEscape) : newData[key];
                     changes[key] = {
                         field: key,
                         oldValue: o,
-                        newValue: n
+                        newValue: n,
                     };
                 }
             }
@@ -1505,28 +1558,29 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             if (EntityRelationshipsToLoad && EntityRelationshipsToLoad.length > 0) {
                 for (let i = 0; i < EntityRelationshipsToLoad.length; i++) {
                     const rel = EntityRelationshipsToLoad[i];
-                    const relInfo = entity.EntityInfo.RelatedEntities.find(r => r.RelatedEntity == rel);
+                    const relInfo = entity.EntityInfo.RelatedEntities.find((r) => r.RelatedEntity == rel);
                     if (relInfo) {
                         let relSql = '';
-                        const relEntitySchemaName = this.Entities.find(e => e.Name.trim().toLowerCase() === relInfo.RelatedEntity.trim().toLowerCase())?.SchemaName;
+                        const relEntitySchemaName = this.Entities.find((e) => e.Name.trim().toLowerCase() === relInfo.RelatedEntity.trim().toLowerCase())?.SchemaName;
                         const quotes = entity.FirstPrimaryKey.NeedsQuotes ? "'" : '';
                         if (relInfo.Type.trim().toLowerCase() === 'one to many')
                             // one to many - simple query
-                            relSql = `  SELECT 
-                                            * 
-                                        FROM 
-                                            [${relEntitySchemaName}].[${relInfo.RelatedEntityBaseView}] 
-                                        WHERE 
-                                            [${relInfo.RelatedEntityJoinField}] = ${quotes}${ret[entity.FirstPrimaryKey.Name]}${quotes}`; // don't yet support composite foreign keys
+                            relSql = `  SELECT
+                                            *
+                                        FROM
+                                            [${relEntitySchemaName}].[${relInfo.RelatedEntityBaseView}]
+                                        WHERE
+                                            [${relInfo.RelatedEntityJoinField}] = ${quotes}${ret[entity.FirstPrimaryKey.Name]}${quotes}`;
+                        // don't yet support composite foreign keys
+                        // many to many - need to use join view
                         else
-                            // many to many - need to use join view
-                            relSql = `  SELECT 
-                                            _theview.* 
-                                        FROM 
-                                            [${relEntitySchemaName}].[${relInfo.RelatedEntityBaseView}] _theview 
-                                        INNER JOIN 
-                                            [${relEntitySchemaName}].[${relInfo.JoinView}] _jv ON _theview.[${relInfo.RelatedEntityJoinField}] = _jv.[${relInfo.JoinEntityInverseJoinField}] 
-                                        WHERE 
+                            relSql = `  SELECT
+                                            _theview.*
+                                        FROM
+                                            [${relEntitySchemaName}].[${relInfo.RelatedEntityBaseView}] _theview
+                                        INNER JOIN
+                                            [${relEntitySchemaName}].[${relInfo.JoinView}] _jv ON _theview.[${relInfo.RelatedEntityJoinField}] = _jv.[${relInfo.JoinEntityInverseJoinField}]
+                                        WHERE
                                             _jv.${relInfo.JoinEntityJoinField} = ${quotes}${ret[entity.FirstPrimaryKey.Name]}${quotes}`; // don't yet support composite foreign keys
                         const relData = await this.ExecuteSQL(relSql);
                         if (relData && relData.length > 0) {
@@ -1549,8 +1603,9 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             return `@${f.CodeName}=${quotes}${kv.Value}${quotes}`;
         }).join(', ');
         const sSimpleSQL = `EXEC [${entity.EntityInfo.SchemaName}].[${spName}] ${sParams}`;
-        const recordChangesEntityInfo = this.Entities.find(e => e.Name === 'Record Changes');
-        if (entity.EntityInfo.TrackRecordChanges && entity.EntityInfo.Name.trim().toLowerCase() !== 'record changes') { // don't track changes for the record changes entity
+        const recordChangesEntityInfo = this.Entities.find((e) => e.Name === 'Record Changes');
+        if (entity.EntityInfo.TrackRecordChanges && entity.EntityInfo.Name.trim().toLowerCase() !== 'record changes') {
+            // don't track changes for the record changes entity
             const oldData = entity.GetAll(true); // get all the OLD values
             const sTableDeclare = entity.PrimaryKeys.map((pk) => {
                 return `${pk.CodeName} ${pk.EntityFieldInfo.SQLFullType}`;
@@ -1581,11 +1636,11 @@ class SQLServerDataProvider extends core_1.ProviderBase {
 
                     DECLARE ${sVariableDeclare}
                     SELECT ${sSelectDeclare} FROM @ResultTable
-                    IF ${sIF} 
+                    IF ${sIF}
                     BEGIN
                         DECLARE @ResultChangesTable TABLE (
-                            ${this.getAllEntityColumnsSQL(recordChangesEntityInfo)}                            
-                        )                              
+                            ${this.getAllEntityColumnsSQL(recordChangesEntityInfo)}
+                        )
 
                         INSERT INTO @ResultChangesTable
                         ${this.GetLogRecordChangeSQL(null /*pass in null for new data for deleted records*/, oldData, entity.EntityInfo.Name, sCombinedPrimaryKey, entity.EntityInfo, 'Delete', user, true)}
@@ -1615,7 +1670,9 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 throw new Error(`Delete() isn't callable for ${entity.EntityInfo.Name} as AllowDeleteAPI is false`);
             result.StartedAt = new Date();
             result.Type = 'delete';
-            result.OriginalValues = entity.Fields.map(f => { return { FieldName: f.Name, Value: f.Value }; }); // save the original values before we start the process
+            result.OriginalValues = entity.Fields.map((f) => {
+                return { FieldName: f.Name, Value: f.Value };
+            }); // save the original values before we start the process
             entity.ResultHistory.push(result); // push the new result as we have started a process
             // REMEMBER - this is the provider and the BaseEntity/subclasses handle user-level permission checking already, we just make sure API was turned on for the operation
             // if we get here we can delete, so build the SQL and then handle appropriately either as part of TransGroup or directly...
@@ -1633,7 +1690,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                     // and when the transaction is committed, we will send all the queries at once
                     entity.TransactionGroup.AddTransaction(new core_1.TransactionItem(entity, sSQL, null, { dataSource: this._dataSource }, (results, success) => {
                         // we get here whenever the transaction group does gets around to committing
-                        // our query.  
+                        // our query.
                         result.EndedAt = new Date();
                         if (success && results) {
                             // Entity AI Actions and Actions - fired off async, NO await on purpose
@@ -1652,9 +1709,9 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                             result.Success = true;
                             resolve(true);
                         }
+                        // the transaction failed, nothing to update, but we need to call Reject so the
+                        // promise resolves with a rejection so our outer caller knows
                         else
-                            // the transaction failed, nothing to update, but we need to call Reject so the 
-                            // promise resolves with a rejection so our outer caller knows
                             result.Success = false;
                         result.Message = 'Transaction failed to commit';
                         reject(results);
@@ -1701,23 +1758,23 @@ class SQLServerDataProvider extends core_1.ProviderBase {
     // START ---- IMetadataProvider
     /**************************************************************************/
     async GetDatasetByName(datasetName, itemFilters) {
-        const sSQL = `SELECT 
+        const sSQL = `SELECT
                         di.*,
                         e.BaseView EntityBaseView,
                         e.SchemaName EntitySchemaName,
                         di.__mj_UpdatedAt AS DatasetItemUpdatedAt,
                         d.__mj_UpdatedAt AS DatasetUpdatedAt
-                    FROM 
-                        [${this.MJCoreSchemaName}].vwDatasets d 
-                    INNER JOIN 
-                        [${this.MJCoreSchemaName}].vwDatasetItems di 
+                    FROM
+                        [${this.MJCoreSchemaName}].vwDatasets d
+                    INNER JOIN
+                        [${this.MJCoreSchemaName}].vwDatasetItems di
                     ON
                         d.ID = di.DatasetID
-                    INNER JOIN 
-                        [${this.MJCoreSchemaName}].vwEntities e 
+                    INNER JOIN
+                        [${this.MJCoreSchemaName}].vwEntities e
                     ON
                         di.EntityID = e.ID
-                    WHERE 
+                    WHERE
                         d.Name = @0`;
         const items = await this.ExecuteSQL(sSQL, [datasetName]);
         // now we have the dataset and the items, we need to get the update date from the items underlying entities
@@ -1729,7 +1786,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             // execute all promises in parallel
             const results = await Promise.all(promises);
             // determine overall success
-            const bSuccess = results.every(result => result.Success);
+            const bSuccess = results.every((result) => result.Success);
             // get the latest update date from all the results
             const latestUpdateDate = results.reduce((acc, result) => {
                 if (result.LatestUpdatedDate && result.LatestUpdatedDate > acc) {
@@ -1743,12 +1800,12 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 Success: bSuccess,
                 Status: '',
                 LatestUpdateDate: latestUpdateDate,
-                Results: results
+                Results: results,
             };
         }
         else {
             return {
-                DatasetID: "",
+                DatasetID: '',
                 DatasetName: datasetName,
                 Success: false,
                 Status: 'No Dataset or Items found for DatasetName: ' + datasetName,
@@ -1760,7 +1817,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
     async GetDatasetItem(item, itemFilters, datasetName) {
         let filterSQL = '';
         if (itemFilters && itemFilters.length > 0) {
-            const filter = itemFilters.find(f => f.ItemCode === item.Code);
+            const filter = itemFilters.find((f) => f.ItemCode === item.Code);
             if (filter)
                 filterSQL = (item.WhereClause ? ' AND ' : ' WHERE ') + '(' + filter.Filter + ')';
         }
@@ -1777,7 +1834,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 Results: null,
                 LatestUpdateDate: null,
                 Status: 'Invalid columns specified for dataset item',
-                Success: false
+                Success: false,
             };
         }
         const itemSQL = `SELECT ${columns} FROM [${item.EntitySchemaName}].[${item.EntityBaseView}] ${item.WhereClause ? 'WHERE ' + item.WhereClause : ''}${filterSQL}`;
@@ -1801,7 +1858,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             Code: item.Code,
             Results: itemData,
             LatestUpdateDate: latestUpdateDate,
-            Success: itemData !== null && itemData !== undefined
+            Success: itemData !== null && itemData !== undefined,
         };
     }
     /**
@@ -1812,10 +1869,10 @@ class SQLServerDataProvider extends core_1.ProviderBase {
      * @returns
      */
     GetColumnsForDatasetItem(item, datasetName) {
-        const specifiedColumns = item.Columns ? item.Columns.split(',').map(col => col.trim()) : [];
+        const specifiedColumns = item.Columns ? item.Columns.split(',').map((col) => col.trim()) : [];
         if (specifiedColumns.length > 0) {
-            // validate that the columns specified are valid within the entity metadata 
-            const entity = this.Entities.find(e => e.ID === item.EntityID);
+            // validate that the columns specified are valid within the entity metadata
+            const entity = this.Entities.find((e) => e.ID === item.EntityID);
             if (!entity && this.Entities.length > 0) {
                 // we have loaded entities (e.g. Entites.length > 0) but the entity wasn't found, log an error and return a failed result
                 // the reason we continue below if we have NOT loaded Entities is that when the system first bootstraps, DATASET gets loaded
@@ -1826,11 +1883,11 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             }
             else {
                 if (entity) {
-                    // have a valid entity, now make sure that all of the columns specified are valid 
+                    // have a valid entity, now make sure that all of the columns specified are valid
                     // only do the column validity check if we have an entity, we can get here if the entity wasn't found IF we haven't loaded entities yet per above comment
                     const invalidColumns = [];
                     specifiedColumns.forEach((col) => {
-                        if (!entity.Fields.find(f => f.Name.trim().toLowerCase() === col.trim().toLowerCase())) {
+                        if (!entity.Fields.find((f) => f.Name.trim().toLowerCase() === col.trim().toLowerCase())) {
                             invalidColumns.push(col);
                         }
                     });
@@ -1841,35 +1898,34 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 }
                 // check to see if the specified columns include the DateFieldToCheck
                 // in the below we only check entity metadata if we have it, if we don't have it, we just add the special fields back in
-                if (item.DateFieldToCheck && item.DateFieldToCheck.trim().length > 0 &&
-                    specifiedColumns.indexOf(item.DateFieldToCheck) === -1) {
+                if (item.DateFieldToCheck && item.DateFieldToCheck.trim().length > 0 && specifiedColumns.indexOf(item.DateFieldToCheck) === -1) {
                     // we only check the entity if we have it, otherwise we just add it back in
-                    if (!entity || entity.Fields.find(f => f.Name.trim().toLowerCase() === item.DateFieldToCheck.trim().toLowerCase()))
+                    if (!entity || entity.Fields.find((f) => f.Name.trim().toLowerCase() === item.DateFieldToCheck.trim().toLowerCase()))
                         specifiedColumns.push(item.DateFieldToCheck);
                 }
             }
         }
-        return specifiedColumns.length > 0 ? specifiedColumns.map(colName => `[${colName.trim()}]`).join(',') : '*';
+        return specifiedColumns.length > 0 ? specifiedColumns.map((colName) => `[${colName.trim()}]`).join(',') : '*';
     }
     async GetDatasetStatusByName(datasetName, itemFilters) {
         const sSQL = `
-            SELECT 
+            SELECT
                 di.*,
                 e.BaseView EntityBaseView,
                 e.SchemaName EntitySchemaName,
                 d.__mj_UpdatedAt AS DatasetUpdatedAt,
-                di.__mj_UpdatedAt AS DatasetItemUpdatedAt 
-            FROM 
-                [${this.MJCoreSchemaName}].vwDatasets d 
-            INNER JOIN 
-                [${this.MJCoreSchemaName}].vwDatasetItems di 
+                di.__mj_UpdatedAt AS DatasetItemUpdatedAt
+            FROM
+                [${this.MJCoreSchemaName}].vwDatasets d
+            INNER JOIN
+                [${this.MJCoreSchemaName}].vwDatasetItems di
             ON
                 d.ID = di.DatasetID
             INNER JOIN
                 [${this.MJCoreSchemaName}].vwEntities e
             ON
                 di.EntityID = e.ID
-            WHERE 
+            WHERE
                 d.Name = @0`;
         const items = await this.ExecuteSQL(sSQL, [datasetName]);
         // now we have the dataset and the items, we need to get the update date from the items underlying entities
@@ -1880,22 +1936,22 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             items.forEach((item, index) => {
                 let filterSQL = '';
                 if (itemFilters && itemFilters.length > 0) {
-                    const filter = itemFilters.find(f => f.ItemCode === item.Code);
+                    const filter = itemFilters.find((f) => f.ItemCode === item.Code);
                     if (filter)
                         filterSQL = ' WHERE ' + filter.Filter;
                 }
                 const itemUpdatedAt = new Date(item.DatasetItemUpdatedAt);
                 const datasetUpdatedAt = new Date(item.DatasetUpdatedAt);
                 const datasetMaxUpdatedAt = new Date(Math.max(itemUpdatedAt.getTime(), datasetUpdatedAt.getTime())).toISOString();
-                const itemSQL = `SELECT 
-                                        CASE 
-                                            WHEN MAX(${item.DateFieldToCheck}) > '${datasetMaxUpdatedAt}' THEN MAX(${item.DateFieldToCheck}) 
-                                            ELSE '${datasetMaxUpdatedAt}' 
+                const itemSQL = `SELECT
+                                        CASE
+                                            WHEN MAX(${item.DateFieldToCheck}) > '${datasetMaxUpdatedAt}' THEN MAX(${item.DateFieldToCheck})
+                                            ELSE '${datasetMaxUpdatedAt}'
                                         END AS UpdateDate,
-                                        COUNT(*) AS TheRowCount, 
-                                        '${item.EntityID}' AS EntityID, 
-                                        '${item.Entity}' AS EntityName 
-                                 FROM 
+                                        COUNT(*) AS TheRowCount,
+                                        '${item.EntityID}' AS EntityID,
+                                        '${item.Entity}' AS EntityName
+                                 FROM
                                     [${item.EntitySchemaName}].[${item.EntityBaseView}]${filterSQL}`;
                 combinedSQL += itemSQL;
                 if (index < items.length - 1) {
@@ -1905,13 +1961,13 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             const itemUpdateDates = await this.ExecuteSQL(combinedSQL);
             if (itemUpdateDates && itemUpdateDates.length > 0) {
                 let latestUpdateDate = new Date(1900, 1, 1);
-                itemUpdateDates.forEach(itemUpdate => {
+                itemUpdateDates.forEach((itemUpdate) => {
                     const updateDate = new Date(itemUpdate.UpdateDate);
                     updateDates.push({
                         EntityID: itemUpdate.EntityID,
                         EntityName: itemUpdate.EntityName,
                         RowCount: itemUpdate.TheRowCount,
-                        UpdateDate: updateDate
+                        UpdateDate: updateDate,
                     });
                     if (updateDate > latestUpdateDate) {
                         latestUpdateDate = updateDate;
@@ -1923,7 +1979,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                     Success: true,
                     Status: '',
                     LatestUpdateDate: latestUpdateDate,
-                    EntityUpdateDates: updateDates
+                    EntityUpdateDates: updateDates,
                 };
             }
             else {
@@ -1933,18 +1989,18 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                     Success: false,
                     Status: 'No update dates found for DatasetName: ' + datasetName,
                     LatestUpdateDate: null,
-                    EntityUpdateDates: null
+                    EntityUpdateDates: null,
                 };
             }
         }
         else {
             return {
-                DatasetID: "",
+                DatasetID: '',
                 DatasetName: datasetName,
                 Success: false,
                 Status: 'No Dataset or Items found for DatasetName: ' + datasetName,
                 EntityUpdateDates: null,
-                LatestUpdateDate: null
+                LatestUpdateDate: null,
             };
         }
     }
@@ -1955,7 +2011,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         for (let i = 0; i < apps.length; i++) {
             ret.push(new core_1.ApplicationInfo(this, {
                 ...apps[i],
-                ApplicationEntities: appEntities.filter(ae => ae.ApplicationName.trim().toLowerCase() === apps[i].Name.trim().toLowerCase())
+                ApplicationEntities: appEntities.filter((ae) => ae.ApplicationName.trim().toLowerCase() === apps[i].Name.trim().toLowerCase()),
             }));
         }
         return ret;
@@ -1976,7 +2032,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         for (let i = 0; i < users.length; i++) {
             ret.push(new core_1.UserInfo(this, {
                 ...users[i],
-                UserRoles: userRoles.filter(ur => ur.UserID === users[i].ID)
+                UserRoles: userRoles.filter((ur) => ur.UserID === users[i].ID),
             }));
         }
         return ret;
@@ -1988,7 +2044,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         for (let i = 0; i < auths.length; i++) {
             ret.push(new core_1.AuthorizationInfo(this, {
                 ...auths[i],
-                AuthorizationRoles: authRoles.filter(ar => ar.AuthorizationName.trim().toLowerCase() === auths[i].Name.trim().toLowerCase())
+                AuthorizationRoles: authRoles.filter((ar) => ar.AuthorizationName.trim().toLowerCase() === auths[i].Name.trim().toLowerCase()),
             }));
         }
         return ret;
@@ -1999,7 +2055,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         else if (this._currentUserEmail && this._currentUserEmail.length > 0) {
             // attempt to lookup current user from email since this.CurrentUser is null for some reason (unexpected)
             if (UserCache_1.UserCache && UserCache_1.UserCache.Users)
-                return UserCache_1.UserCache.Users.find(u => u.Email.trim().toLowerCase() === this._currentUserEmail.trim().toLowerCase());
+                return UserCache_1.UserCache.Users.find((u) => u.Email.trim().toLowerCase() === this._currentUserEmail.trim().toLowerCase());
         }
         // if we get here we can't get the current user
         return null;
@@ -2010,7 +2066,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
             const userRoles = await this.ExecuteSQL(`SELECT * FROM [${this.MJCoreSchemaName}].vwUserRoles WHERE UserID='${user[0].ID}'`);
             return new core_1.UserInfo(this, {
                 ...user[0],
-                UserRoles: userRoles ? userRoles : []
+                UserRoles: userRoles ? userRoles : [],
             });
         }
         else
@@ -2104,7 +2160,13 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         const result = [];
         for (let i = 0; i < info.length; i++) {
             const r = await this.GetEntityRecordName(info[i].EntityName, info[i].CompositeKey);
-            result.push({ EntityName: info[i].EntityName, CompositeKey: info[i].CompositeKey, RecordName: r, Success: r ? true : false, Status: r ? 'Success' : 'Error' });
+            result.push({
+                EntityName: info[i].EntityName,
+                CompositeKey: info[i].CompositeKey,
+                RecordName: r,
+                Success: r ? true : false,
+                Status: r ? 'Success' : 'Error',
+            });
         }
         return result;
     }
@@ -2129,13 +2191,13 @@ class SQLServerDataProvider extends core_1.ProviderBase {
         }
     }
     GetEntityRecordNameSQL(entityName, CompositeKey) {
-        const e = this.Entities.find(e => e.Name === entityName);
+        const e = this.Entities.find((e) => e.Name === entityName);
         if (!e)
             throw new Error(`Entity ${entityName} not found`);
         else {
-            let f = e.Fields.find(f => f.IsNameField);
+            let f = e.Fields.find((f) => f.IsNameField);
             if (!f)
-                f = e.Fields.find(f => f.Name === 'Name');
+                f = e.Fields.find((f) => f.Name === 'Name');
             if (!f) {
                 (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;
@@ -2145,7 +2207,7 @@ class SQLServerDataProvider extends core_1.ProviderBase {
                 let sql = `SELECT [${f.Name}] FROM [${e.SchemaName}].[${e.BaseView}] WHERE `;
                 let where = '';
                 for (let pkv of CompositeKey.KeyValuePairs) {
-                    const pk = e.PrimaryKeys.find(pk => pk.Name === pkv.FieldName);
+                    const pk = e.PrimaryKeys.find((pk) => pk.Name === pkv.FieldName);
                     const quotes = pk.NeedsQuotes ? "'" : '';
                     if (where.length > 0)
                         where += ' AND ';