@memberjunction/sqlserver-dataprovider 6.2.0-edge.4 → 6.2.0-edge.6

package/dist/saveParameters.js

@@ -0,0 +1,229 @@
+/**
+ * Typed parameters for SQL Server saves and deletes.
+ *
+ * A save reaches SQL Server as one statement whose values travel as typed parameters, so its text
+ * is the same for every record of an entity (for a given set of fields) and SQL Server reuses one
+ * plan instead of compiling every save. The statement keeps the DECLARE / SET / EXEC shape the
+ * literal batch has always had; only `SET @Name = <value>` becomes `SET @Name$ = @p$0`.
+ *
+ * Every parameter also carries the literal the batch used to contain for its value.
+ * {@link RenderSaveSQL} puts those literals back and restores the per-record variable suffix, which
+ * gives the text that is logged, captured into migrations, shown in errors and handed to
+ * transaction groups: the statement that ran, with its values written in.
+ */
+import sql from 'mssql';
+import { EntityFieldTSType } from '@memberjunction/core';
+/** One typed input of a save or delete statement. */
+export class SQLServerSaveParameter {
+    constructor(
+    /** Name without the `@`, as the statement references it. */
+    Name, 
+    /** Driver type, from the column's own SQL type. */
+    Type, Value, 
+    /** The literal the batch wrote for this value; {@link RenderSaveSQL} puts it back. */
+    Literal) {
+        this.Name = Name;
+        this.Type = Type;
+        this.Value = Value;
+        this.Literal = Literal;
+    }
+}
+/**
+ * Variable suffix in the statement that runs. Constant, so the text repeats across records. `$` is
+ * valid inside a T-SQL variable name and never appears in a field's CodeName, so the renderer can
+ * find every variable without matching anything else.
+ */
+export const EXECUTED_VARIABLE_SUFFIX = '$';
+/** `@p$<n>` (a parameter) or `@<name>$` (a variable), each not followed by more identifier characters. */
+const STATEMENT_TOKEN = /@p\$(\d+)(?![\w$#@])|(@\w+)\$(?![\w$#@])/g;
+/**
+ * The literal form of a statement built with {@link SaveParameterCollector}: each `@p$<n>` is
+ * replaced by that parameter's literal and each variable gets `variableSuffix` back.
+ */
+export function RenderSaveSQL(executedSQL, parameters, variableSuffix) {
+    return executedSQL.replace(STATEMENT_TOKEN, (match, index, variable) => index !== undefined ? (parameters[Number(index)]?.Literal ?? match) : `${variable}${variableSuffix}`);
+}
+/** True when `parameters` holds a save statement's typed parameters. */
+export function IsSaveParameterList(parameters) {
+    return Array.isArray(parameters) && parameters.length > 0 && parameters.every((p) => p instanceof SQLServerSaveParameter);
+}
+/** Collects one statement's parameters and hands back the `@p$<n>` reference for each. */
+export class SaveParameterCollector {
+    constructor(seed = []) {
+        this.parameters = [...seed];
+    }
+    get Parameters() {
+        return this.parameters;
+    }
+    /**
+     * Adds the parameter for a value of `field` whose literal is `literal` (what the literal batch
+     * writes for it), and returns the reference to write into the statement in its place.
+     */
+    AddField(field, literal) {
+        if (IsKeptAsInlineLiteral(field)) {
+            return literal;
+        }
+        const { Type, Value } = SaveParameterFromLiteral(field, literal);
+        const name = `p$${this.parameters.length}`;
+        this.parameters.push(new SQLServerSaveParameter(name, Type, Value, literal));
+        return `@${name}`;
+    }
+}
+/**
+ * The typed parameter equivalent to `literal`, a value of `field` as the literal batch writes it.
+ * The value is read back from the literal, so it goes through exactly the conversions the literal
+ * always did (booleans to 1/0, dates to ISO-8601, objects to JSON, base64 to bytes) and the bound
+ * value and the logged literal cannot disagree.
+ */
+export function SaveParameterFromLiteral(field, literal) {
+    refuseInlineLiteralType(field);
+    const name = field.Type.trim().toLowerCase();
+    if (field.IsBinaryFieldType) {
+        return { Type: SaveParameterType(field), Value: Buffer.from(literal.slice(2), 'hex') };
+    }
+    if (TEXT_DATE_TYPES.has(name)) {
+        return { Type: SaveParameterType(field), Value: QuotedLiteralText(literal) };
+    }
+    if (EXACT_NUMERIC_TYPES.has(name)) {
+        const asNumber = finiteNumberFromLiteral(field, literal);
+        // An exponent makes the literal a float (`1e-07`), so that one is sent as a float.
+        return /e/i.test(literal) ? { Type: sql.Float(), Value: asNumber } : { Type: SaveParameterType(field), Value: literal };
+    }
+    if (SENT_AS_LITERAL_TEXT.has(name)) {
+        const value = literal.startsWith("'") || literal.startsWith("N'") ? QuotedLiteralText(literal) : literal;
+        return { Type: SaveParameterType(field), Value: value };
+    }
+    switch (field.TSType) {
+        case EntityFieldTSType.Boolean:
+            return { Type: SaveParameterType(field), Value: literal === '1' };
+        case EntityFieldTSType.Number:
+            return { Type: SaveParameterType(field), Value: name === 'bigint' ? bigintFromLiteral(field, literal) : finiteNumberFromLiteral(field, literal) };
+        default:
+            return { Type: SaveParameterType(field), Value: QuotedLiteralText(literal) };
+    }
+}
+/**
+ * A number literal as a number. `Number('')` and `Number(' ')` are 0, and `NaN` binds as NULL, so a
+ * literal that is not a finite number would store a value nobody wrote; the literal batch failed on
+ * it, and so does this.
+ */
+function finiteNumberFromLiteral(field, literal) {
+    const value = Number(literal);
+    if (literal.trim() === '' || !Number.isFinite(value)) {
+        throw new Error(`Field "${field.Name}" has value ${JSON.stringify(literal)}, which is not a number`);
+    }
+    return value;
+}
+/** A bigint literal as a BigInt; a fraction is truncated toward zero, as SQL Server converts it. */
+function bigintFromLiteral(field, literal) {
+    return /^-?\d+$/.test(literal) ? BigInt(literal) : BigInt(Math.trunc(finiteNumberFromLiteral(field, literal)));
+}
+/** The text a `'…'` or `N'…'` literal stores: the quotes removed and each `''` read as one quote. */
+export function QuotedLiteralText(literal) {
+    const open = literal.startsWith('N') ? 2 : 1;
+    return literal.slice(open, -1).replace(/''/g, "'");
+}
+let driverTypesByNameCache;
+/**
+ * The driver's types keyed by lower-cased SQL Server type name (`nvarchar` → `NVarChar`, …). Built
+ * on first use, not at import: loading this module must not depend on the driver's type table.
+ */
+function driverTypesByName() {
+    driverTypesByNameCache ??= new Map(Object.entries(sql.TYPES).map(([name, factory]) => [name.toLowerCase(), factory]));
+    return driverTypesByNameCache;
+}
+/**
+ * Exact numeric types. The driver encodes these through a JavaScript double (`parseFloat`, then
+ * `value * 10^scale`), so `1.005` into `decimal(18,2)` would arrive as `1.00` where the literal
+ * stores `1.01`. They are sent as the literal's own text instead, and the statement's typed
+ * `SET @x DECIMAL(p,s) = @p$n` makes the same exact conversion the literal always got.
+ */
+const EXACT_NUMERIC_TYPES = new Set(['decimal', 'numeric', 'money', 'smallmoney']);
+/**
+ * Date types sent as their ISO-8601 literal text (`varchar(34)`) so the typed `SET @x = @p$n`
+ * performs the conversion on SQL Server, exactly as the literal batch did. None is bound as a JS
+ * `Date`, because tedious mishandles each:
+ * - `datetimeoffset`: tedious encodes `sql.DateTimeOffset()` with `-date.getTimezoneOffset()`,
+ *   which stamps the Node host's local offset instead of the `+00:00` written by `.toISOString()`.
+ * - `smalldatetime`: tedious truncates seconds (`date.getUTCMinutes()`) instead of rounding >=30s
+ *   to the next minute as SQL Server does, and throws a Node `RangeError` for pre-1900 dates.
+ * - `date`, `time`, `datetime`, `datetime2`: tedious encodes them in UTC but range-checks them with
+ *   the host's local `getFullYear()`, so on a server west of UTC `0001-01-01` fails as "Out of
+ *   range", and east of UTC so do `9999-12-31` values — common "no end date" placeholders.
+ */
+const TEXT_DATE_TYPES = new Set(['date', 'time', 'datetime', 'datetime2', 'datetimeoffset', 'smalldatetime']);
+/**
+ * Types a save keeps as their inline literal instead of binding a parameter.
+ * - `sql_variant`: the stored base type comes from whatever is assigned to it. MJ writes these values
+ *   unquoted (`NeedsQuotes` is false), and the literal is what gives SQL Server the right base type
+ *   (`0x1F` is varbinary, `1.10` is numeric(3,2), `3000000000` is numeric(10,0)). No parameter type
+ *   reproduces that: `nvarchar(max)` is rejected (Msg 206), `float` loses precision past 15 digits,
+ *   and `sql.Decimal` goes through a JS number. These saves don't share a plan, as before.
+ */
+const KEPT_AS_INLINE_LITERAL = new Set(['sql_variant']);
+/** Whether a save writes `field`'s value as its inline literal rather than as a typed parameter. */
+export function IsKeptAsInlineLiteral(field) {
+    return KEPT_AS_INLINE_LITERAL.has(field.Type.trim().toLowerCase());
+}
+/** A type kept as its inline literal has no parameter form; binding one would store the wrong base type. */
+function refuseInlineLiteralType(field) {
+    if (IsKeptAsInlineLiteral(field)) {
+        throw new Error(`Field "${field.Name}" has SQL type "${field.Type}", which a save writes as its inline literal, not as a parameter`);
+    }
+}
+/**
+ * Types the driver cannot send as a parameter (`xml` and the CLR types are "not implemented" in
+ * tedious), or that it does not know (`sysname` is an alias for `nvarchar(128)` that SQLServerDialect
+ * does not list in `_stringTypeNames`, so `field.TSType` defaults to `Number`). Their value is sent
+ * as text (`nvarchar(128)` for `sysname`, `nvarchar(max)` for the rest) so Unicode is preserved
+ * while the typed SET converts it as before.
+ */
+const SENT_AS_LITERAL_TEXT = new Set(['xml', 'hierarchyid', 'geography', 'geometry', 'json', 'vector', 'sysname']);
+/** Server-generated types that a save never writes. */
+const NEVER_WRITTEN = new Set(['timestamp', 'rowversion']);
+/**
+ * The driver type for a field's parameter: the SQL Server type of the same name, with the column's
+ * length for the sized string and binary types.
+ * @throws Error for a type that has no parameter form, so a new type fails loudly instead of binding
+ *   wrongly.
+ */
+export function SaveParameterType(field) {
+    refuseInlineLiteralType(field);
+    const name = field.Type.trim().toLowerCase();
+    const length = field.Length > 0 ? field.Length : sql.MAX;
+    switch (name) {
+        case 'varchar':
+        case 'char':
+            return driverTypesByName().get(name)(length);
+        case 'nvarchar':
+        case 'nchar':
+            return driverTypesByName().get(name)(field.Length > 0 ? field.Length / 2 : sql.MAX);
+        case 'binary':
+        case 'varbinary':
+            // The literal is a `0x…` varbinary; a binary(n) variable pads it the same way.
+            return sql.VarBinary(length);
+        case 'ntext':
+            return sql.NVarChar(sql.MAX);
+        case 'text':
+            return sql.VarChar(sql.MAX);
+        case 'image':
+            return sql.VarBinary(sql.MAX);
+        case 'sysname':
+            return sql.NVarChar(128);
+    }
+    if (TEXT_DATE_TYPES.has(name)) {
+        return sql.VarChar(34);
+    }
+    if (EXACT_NUMERIC_TYPES.has(name)) {
+        return sql.VarChar(sql.MAX);
+    }
+    if (SENT_AS_LITERAL_TEXT.has(name)) {
+        return sql.NVarChar(sql.MAX);
+    }
+    const factory = NEVER_WRITTEN.has(name) ? undefined : driverTypesByName().get(name);
+    if (!factory) {
+        throw new Error(`Field "${field.Name}" has SQL type "${field.Type}", which SQLServerDataProvider cannot send as a save parameter`);
+    }
+    return factory();
+}
+//# sourceMappingURL=saveParameters.js.map

package/dist/saveParameters.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"saveParameters.js","sourceRoot":"","sources":["../src/saveParameters.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -20,6 +20,11 @@ export interface ExecuteSQLOptions {
     isMutation?: boolean;
     /** Simple SQL fallback for loggers with logRecordChangeMetadata=false (only for Save/Delete operations) */
     simpleSQLFallback?: string;
+    /**
+     * The statement with its parameter values written in as literals. Set for saves and deletes,
+     * which run with typed parameters: logged in place of the query, and shown in error messages.
+     */
+    literalSQL?: string;
     /**
      * Optional connection source to use instead of the default pool.
      * Used by IS-A chain orchestration to execute SPs on a shared transaction.
@@ -65,6 +70,8 @@ export interface InternalSQLOptions {
     isMutation?: boolean;
     /** Simple SQL fallback for loggers */
     simpleSQLFallback?: string;
+    /** The statement with its parameter values written in; logged and shown in errors instead of the query */
+    literalSQL?: string;
     /** User context for logging */
     contextUser?: UserInfo;
     /** The longest the statement may run, in milliseconds, before it is cancelled on the server */

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,GAAG,MAAM,OAAO,CAAC;AAExB;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,kDAAkD;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uEAAuE;IACvE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,2GAA2G;IAC3G,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC,WAAW,CAAC;IACxD;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,6CAA6C;IAC7C,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC;IACzB,4CAA4C;IAC5C,WAAW,CAAC,EAAE,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;IACrC,qCAAqC;IACrC,eAAe,CAAC,EAAE,CAAG,kLAAkL;IACrM,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,GAAG,EAChB,WAAW,CAAC,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,OAAO,EACvB,UAAU,CAAC,EAAE,OAAO,EACpB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,WAAW,CAAC,EAAE,QAAQ,KACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,4DAA4D;IAC5D,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,kDAAkD;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iDAAiD;IACjD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gDAAgD;IAChD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,sCAAsC;IACtC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,+BAA+B;IAC/B,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,+FAA+F;IAC/F,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,sBAAsB,CAAC,8BAA8B,CAAC;IACrG;;OAEG;IACH,IAAI,cAAc,IAAI,GAAG,CAAC,cAAc,CAEvC;IAED;;OAEG;IACH,IAAI,2BAA2B,IAAI,MAAM,CAExC;gBAGC,cAAc,EAAE,GAAG,CAAC,cAAc,EAClC,gBAAgB,CAAC,EAAE,MAAM,EACzB,2BAA2B,GAAE,MAAU,EACvC,cAAc,CAAC,EAAE,MAAM,EAAE,EACzB,cAAc,CAAC,EAAE,MAAM,EAAE,EACzB,sBAAsB,GAAE,OAAc;CAazC;AAED,MAAM,WAAW,8BAA8B;IAC7C,cAAc,EAAE,GAAG,CAAC,cAAc,CAAC;IACnC,2BAA2B,EAAE,MAAM,CAAC;CACrC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,GAAG,MAAM,OAAO,CAAC;AAExB;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,kDAAkD;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uEAAuE;IACvE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,2GAA2G;IAC3G,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC,WAAW,CAAC;IACxD;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,6CAA6C;IAC7C,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC;IACzB,4CAA4C;IAC5C,WAAW,CAAC,EAAE,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;IACrC,qCAAqC;IACrC,eAAe,CAAC,EAAE,CAAG,kLAAkL;IACrM,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,GAAG,EAChB,WAAW,CAAC,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,OAAO,EACvB,UAAU,CAAC,EAAE,OAAO,EACpB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,WAAW,CAAC,EAAE,QAAQ,KACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,4DAA4D;IAC5D,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,kDAAkD;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iDAAiD;IACjD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gDAAgD;IAChD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,sCAAsC;IACtC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,0GAA0G;IAC1G,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,+FAA+F;IAC/F,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,sBAAsB,CAAC,8BAA8B,CAAC;IACrG;;OAEG;IACH,IAAI,cAAc,IAAI,GAAG,CAAC,cAAc,CAEvC;IAED;;OAEG;IACH,IAAI,2BAA2B,IAAI,MAAM,CAExC;gBAGC,cAAc,EAAE,GAAG,CAAC,cAAc,EAClC,gBAAgB,CAAC,EAAE,MAAM,EACzB,2BAA2B,GAAE,MAAU,EACvC,cAAc,CAAC,EAAE,MAAM,EAAE,EACzB,cAAc,CAAC,EAAE,MAAM,EAAE,EACzB,sBAAsB,GAAE,OAAc;CAazC;AAED,MAAM,WAAW,8BAA8B;IAC7C,cAAc,EAAE,GAAG,CAAC,cAAc,CAAC;IACnC,2BAA2B,EAAE,MAAM,CAAC;CACrC"}

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,sBAAsB,EAAY,MAAM,sBAAsB,CAAC;AA2ExE;;GAEG;AACH,MAAM,OAAO,2BAA4B,SAAQ,sBAAsD;IACrG;;OAEG;IACH,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,IAAI,2BAA2B;QAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC;IAC/C,CAAC;IAED,YACE,cAAkC,EAClC,gBAAyB,EACzB,8BAAsC,CAAC,CAAC,sCAAsC,EAC9E,cAAyB,EACzB,cAAyB,EACzB,yBAAkC,IAAI;QAEtC,KAAK,CACH;YACE,cAAc,EAAE,cAAc;YAC9B,2BAA2B,EAAE,2BAA2B;SACzD,EACD,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,sBAAsB,CACvB,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,sBAAsB,EAAY,MAAM,sBAAsB,CAAC;AAkFxE;;GAEG;AACH,MAAM,OAAO,2BAA4B,SAAQ,sBAAsD;IACrG;;OAEG;IACH,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,IAAI,2BAA2B;QAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC;IAC/C,CAAC;IAED,YACE,cAAkC,EAClC,gBAAyB,EACzB,8BAAsC,CAAC,CAAC,sCAAsC,EAC9E,cAAyB,EACzB,cAAyB,EACzB,yBAAkC,IAAI;QAEtC,KAAK,CACH;YACE,cAAc,EAAE,cAAc;YAC9B,2BAA2B,EAAE,2BAA2B;SACzD,EACD,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,sBAAsB,CACvB,CAAC;IACJ,CAAC;CACF"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@memberjunction/sqlserver-dataprovider",
   "type": "module",
-  "version": "6.2.0-edge.4",
+  "version": "6.2.0-edge.6",
   "description": "MemberJunction: SQL Server Client Data Provider",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,21 +17,21 @@
     "@types/mssql": "^9.1.9"
   },
   "dependencies": {
-    "@memberjunction/actions": "6.2.0-edge.4",
-    "@memberjunction/actions-base": "6.2.0-edge.4",
-    "@memberjunction/ai": "6.2.0-edge.4",
-    "@memberjunction/ai-provider-bundle": "6.2.0-edge.4",
-    "@memberjunction/ai-vector-dupe": "6.2.0-edge.4",
-    "@memberjunction/ai-vectordb": "6.2.0-edge.4",
-    "@memberjunction/aiengine": "6.2.0-edge.4",
-    "@memberjunction/core": "6.2.0-edge.4",
-    "@memberjunction/core-entities": "6.2.0-edge.4",
-    "@memberjunction/encryption": "6.2.0-edge.4",
-    "@memberjunction/generic-database-provider": "6.2.0-edge.4",
-    "@memberjunction/sql-dialect": "6.2.0-edge.4",
-    "@memberjunction/global": "6.2.0-edge.4",
-    "@memberjunction/query-processor": "6.2.0-edge.4",
-    "@memberjunction/queue": "6.2.0-edge.4",
+    "@memberjunction/actions": "6.2.0-edge.6",
+    "@memberjunction/actions-base": "6.2.0-edge.6",
+    "@memberjunction/ai": "6.2.0-edge.6",
+    "@memberjunction/ai-provider-bundle": "6.2.0-edge.6",
+    "@memberjunction/ai-vector-dupe": "6.2.0-edge.6",
+    "@memberjunction/ai-vectordb": "6.2.0-edge.6",
+    "@memberjunction/aiengine": "6.2.0-edge.6",
+    "@memberjunction/core": "6.2.0-edge.6",
+    "@memberjunction/core-entities": "6.2.0-edge.6",
+    "@memberjunction/encryption": "6.2.0-edge.6",
+    "@memberjunction/generic-database-provider": "6.2.0-edge.6",
+    "@memberjunction/sql-dialect": "6.2.0-edge.6",
+    "@memberjunction/global": "6.2.0-edge.6",
+    "@memberjunction/query-processor": "6.2.0-edge.6",
+    "@memberjunction/queue": "6.2.0-edge.6",
     "mssql": "^12.2.0",
     "rxjs": "^7.8.2"
   },