@voltro/sql-mssql 0.69.1 → 0.71.0

package/dist/index.d.ts

@@ -9,6 +9,7 @@ import { DataStore } from '@voltro/database';
 import { DialectReplicationAdapter } from '@voltro/database';
 import { Effect } from 'effect';
 import { EventEmitter } from 'node:events';
+import { InsertIgnoreResult } from '@voltro/database';
 import { Layer } from 'effect';
 import { ManagedRuntime } from 'effect';
 import { MssqlClient } from '@effect/sql-mssql';
@@ -269,6 +270,9 @@ export declare class MssqlStore implements DataStore {
     insertIgnore(t: string, r: Row, options: {
         conflictColumns: ReadonlyArray<string>;
     }): Promise<Readonly<Record<string, unknown>>>;
+    insertIgnoreWithOutcome(t: string, r: Row, options: {
+        conflictColumns: ReadonlyArray<string>;
+    }): Promise<InsertIgnoreResult>;
     private executeUpsert;
     /**
      * Single-statement native MERGE upsert. Builds a parameterised

package/dist/index.js

@@ -1,12 +1,12 @@
 import { MssqlClient as e } from "@effect/sql-mssql";
 import { TYPES as t } from "tedious";
 import { Config as n, Duration as r, Effect as i, Layer as a, ManagedRuntime as o, Option as s, Redacted as c } from "effect";
-import { CDC_OFFSETS_TABLE as l, DEFAULT_ACQUIRE_TIMEOUT_MS as u, EagerCardinalityError as d, MSSQL_TRANSIENT_NUMBERS as f, _voltroMssqlCdcOffsetsTable as p, attachEagerLoads as m, attributionFields as h, bulkInsertLimitsFor as g, causeBranches as _, chunkRowsForInsert as v, compileEagerJson as y, compileJsonPatch as b, compilePredicate as x, compileRawFragment as ee, compileSelect as S, decodeRowsFromSchema as C, encodeRowForSchema as w, externalChangeEvent as te, hasEagerLoads as ne, isTableReactive as T, jsonPatchAssignments as re, makeEagerFallbackReporter as E, observeDbOp as D, qualifyTable as ie, quoteIdent as ae, raiseChangeListenerCeiling as oe, recordsTable as O, requireTable as se, rowKeyColumns as k, runStoreTransaction as A, runWriteRecorders as j, stampGeneratedId as M, stampGeneratedIds as ce, upsertUpdatePatch as N, upsertUpdateValues as P, withCapturedAttribution as le } from "@voltro/database";
-import { EventEmitter as ue } from "node:events";
-import { createLogger as F } from "@voltro/logger";
-import { SqlClient as I, TransactionConnection as L } from "@effect/sql/SqlClient";
+import { CDC_OFFSETS_TABLE as l, DEFAULT_ACQUIRE_TIMEOUT_MS as u, EagerCardinalityError as d, MSSQL_TRANSIENT_NUMBERS as f, _voltroMssqlCdcOffsetsTable as p, attachEagerLoads as m, attributionFields as h, bulkInsertLimitsFor as g, causeBranches as _, chunkRowsForInsert as v, compileEagerJson as y, compileJsonPatch as b, compilePredicate as x, compileRawFragment as S, compileSelect as C, decodeRowsFromSchema as w, encodeRowForSchema as T, externalChangeEvent as E, hasEagerLoads as ee, isTableReactive as D, jsonPatchAssignments as te, makeEagerFallbackReporter as ne, observeDbOp as O, qualifyTable as k, quoteIdent as re, raiseChangeListenerCeiling as ie, recordsTable as A, requireTable as ae, rowKeyColumns as j, runStoreTransaction as oe, runWriteRecorders as M, stampGeneratedId as N, stampGeneratedIds as se, upsertUpdatePatch as P, upsertUpdateValues as F, withCapturedAttribution as ce } from "@voltro/database";
+import { EventEmitter as le } from "node:events";
+import { createLogger as I } from "@voltro/logger";
+import { SqlClient as L, TransactionConnection as R } from "@effect/sql/SqlClient";
 //#region src/sqlLayer.ts
-var R = {
+var ue = {
 	...e.defaultParameterTypes,
 	null: t.NVarChar,
 	Date: t.DateTime2,
@@ -18,7 +18,7 @@ var R = {
 	let i = de(t);
 	return e.layerConfig({
 		server: n.succeed(t.server),
-		parameterTypes: n.succeed(R),
+		parameterTypes: n.succeed(ue),
 		...i === void 0 ? {} : { connectTimeout: n.succeed(r.millis(i)) },
 		...t.port === void 0 ? {} : { port: n.succeed(t.port) },
 		...t.database === void 0 ? {} : { database: n.succeed(t.database) },
@@ -83,15 +83,15 @@ var R = {
 }, W = (e) => _(e).some((e) => {
 	let t = U(e);
 	return t !== void 0 && fe.has(t);
-}), pe = /* @__PURE__ */ new Set(["2601", "2627"]), G = (e) => {
+}), pe = /* @__PURE__ */ new Set(["2601", "2627"]), G = (e) => _(e).some((e) => {
 	let t = U(e);
 	return t !== void 0 && pe.has(t);
-}, K = (e) => W(e) ? "retry" : "noRetry", me = {
+}), K = (e) => W(e) ? "retry" : "noRetry", me = {
 	I: "insert",
 	U: "update",
 	D: "delete"
 }, q = (e, t) => e(i.gen(function* () {
-	let e = yield* I;
+	let e = yield* L;
 	if (((yield* e`
         SELECT COUNT(*) AS ${e("on")}
         FROM sys.change_tracking_databases
@@ -102,13 +102,13 @@ var R = {
            )
            ALTER TABLE ${Y(n)} ENABLE CHANGE_TRACKING WITH (TRACK_COLUMNS_UPDATED = OFF)`);
 })).then(() => void 0), J = (e) => `'${e.replace(/'/g, "''")}'`, Y = (e) => `[${e.replace(/\]/g, "]]")}]`, X = async (e) => {
-	let t = F({ scope: "voltro:mssql:cdc" }), n = e.pollIntervalMs ?? 500;
+	let t = I({ scope: "voltro:mssql:cdc" }), n = e.pollIntervalMs ?? 500;
 	await q(e.run, e.tables);
 	let r = async () => (await e.run(i.gen(function* () {
-		return yield* (yield* I)`SELECT CONVERT(VARCHAR(40), CHANGE_TRACKING_CURRENT_VERSION()) AS v`;
+		return yield* (yield* L)`SELECT CONVERT(VARCHAR(40), CHANGE_TRACKING_CURRENT_VERSION()) AS v`;
 	})))[0]?.v ?? "0", a = e.startVersion ?? await r(), o = !1, s = null, c = !1, l = (e, t) => BigInt(e) > BigInt(t), u = async (n, o) => {
 		let s = await e.run(i.gen(function* () {
-			let e = yield* I, t = e.unsafe(Y(n)), r = (yield* e`
+			let e = yield* L, t = e.unsafe(Y(n)), r = (yield* e`
           SELECT CONVERT(VARCHAR(40), CHANGE_TRACKING_MIN_VALID_VERSION(OBJECT_ID(${e.unsafe(J(n))}))) AS floor`)[0]?.floor;
 			return r != null && BigInt(o) < BigInt(r) ? {
 				resync: !0,
@@ -137,7 +137,7 @@ var R = {
 				new: null
 			});
 			else {
-				let t = C([o], n, "mssql")[0];
+				let t = w([o], n, "mssql")[0];
 				e.onChange({
 					table: n,
 					op: r,
@@ -178,10 +178,10 @@ var R = {
 		},
 		currentVersion: () => a
 	};
-}, Z = F({ scope: "voltro:mssql" }), Q = async (e) => {
+}, Z = I({ scope: "voltro:mssql" }), Q = async (e) => {
 	let t = e.changeStrategy ?? "inline", n = t;
 	t === "cdc" && !e.cdcConfig && (Z.warn("changeStrategy='cdc' requires cdcConfig (replicaId + includeTables); falling back to 'inline'."), n = "inline");
-	let r = e.tracerLayer ? a.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, i = o.make(r), s = new he(await i.runPromise(I), i, n);
+	let r = e.tracerLayer ? a.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, i = o.make(r), s = new he(await i.runPromise(L), i, n);
 	return n === "cdc" && e.cdcConfig && await s.startCdcConsumer(e.cdcConfig), s;
 }, he = class e {
 	sql;
@@ -190,14 +190,14 @@ var R = {
 	namespace;
 	emitter;
 	inflightTxns = 0;
-	reportEagerFallback = E(Z);
+	reportEagerFallback = ne(Z);
 	cdcHandle = null;
 	cdcCheckpointTimer = null;
 	cdcPendingVersion = null;
 	cdcReplicaId = "";
 	cdcStreamName = "default";
 	constructor(e, t, n = "inline", r = null, i) {
-		this.sql = e, this.runtime = t, this.changeStrategy = n, this.namespace = r, this.emitter = i ?? new ue(), oe(this.emitter);
+		this.sql = e, this.runtime = t, this.changeStrategy = n, this.namespace = r, this.emitter = i ?? new le(), ie(this.emitter);
 	}
 	get inlineEmit() {
 		return this.changeStrategy === "inline";
@@ -206,19 +206,19 @@ var R = {
 		return t === this.namespace ? this : new e(this.sql, this.runtime, this.changeStrategy, t, this.emitter);
 	}
 	nsT(e) {
-		return ie(this.namespace, e);
+		return k(this.namespace, e);
 	}
 	__mssqlReplicationFriend = { runEffect: (e) => this.runtime.runPromise(e) };
 	async executeQuery(e, t) {
-		let n = S(e, this.sql, this.namespace), r = t ? i.provideService(n, L, t) : n, a = await D("mssql", "select", () => this.runtime.runPromise(r));
-		return C(a, e.table, "mssql");
+		let n = C(e, this.sql, this.namespace), r = t ? i.provideService(n, R, t) : n, a = await O("mssql", "select", () => this.runtime.runPromise(r));
+		return w(a, e.table, "mssql");
 	}
 	decodeWritten(e, t) {
-		return C([t], e, "mssql")[0] ?? t;
+		return w([t], e, "mssql")[0] ?? t;
 	}
 	async executeInsert(e, t, n, r, a) {
-		t = M(e, t);
-		let o = this.sql, s = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(w(t, e)).returning("*")}`, c = n ? i.provideService(s, L, n) : s, l = (await this.runtime.runPromise(c))[0];
+		t = N(e, t);
+		let o = this.sql, s = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(T(t, e)).returning("*")}`, c = n ? i.provideService(s, R, n) : s, l = (await this.runtime.runPromise(c))[0];
 		if (!l) throw Error(`MssqlStore.insert: row not returned post-insert in '${e}'`);
 		let u = this.decodeWritten(e, l);
 		return await this.routeEvent({
@@ -229,7 +229,7 @@ var R = {
 		}, r, n, a), u;
 	}
 	async executeUpdate(e, t, n, r, a, o) {
-		let s = this.sql, c = s`UPDATE ${s(this.nsT(e))} SET ${s.update(w(n, e)).returning("*")} WHERE ${s.and(k(t).map(([e, t]) => s`${s(e)} = ${t}`))}`, l = r ? i.provideService(c, L, r) : c, u = (await this.runtime.runPromise(l))[0];
+		let s = this.sql, c = s`UPDATE ${s(this.nsT(e))} SET ${s.update(T(n, e)).returning("*")} WHERE ${s.and(j(t).map(([e, t]) => s`${s(e)} = ${t}`))}`, l = r ? i.provideService(c, R, r) : c, u = (await this.runtime.runPromise(l))[0];
 		if (!u) return null;
 		let d = this.decodeWritten(e, u);
 		return await this.routeEvent({
@@ -240,36 +240,38 @@ var R = {
 		}, a, r, o), d;
 	}
 	async executeInsertMany(e, t, n, r, a) {
-		if (t = ce(e, t), t.length === 0) return [];
-		let o = this.sql, s = v(t, g("mssql")), c = (t) => o`INSERT INTO ${o(this.nsT(e))} ${o.insert(t.map((t) => w(t, e))).returning("*")}`, l;
+		if (t = se(e, t), t.length === 0) return [];
+		let o = this.sql, s = v(t, g("mssql")), c = (t) => o`INSERT INTO ${o(this.nsT(e))} ${o.insert(t.map((t) => T(t, e))).returning("*")}`, l;
 		if (s.length === 1) {
-			let e = c(s[0]), t = n ? i.provideService(e, L, n) : e;
+			let e = c(s[0]), t = n ? i.provideService(e, R, n) : e;
 			l = await this.runtime.runPromise(t);
 		} else if (n) {
 			let e = [];
-			for (let t of s) e.push(...await this.runtime.runPromise(i.provideService(c(t), L, n)));
+			for (let t of s) e.push(...await this.runtime.runPromise(i.provideService(c(t), R, n)));
 			l = e;
 		} else l = await this.runtime.runPromise(o.withTransaction(i.map(i.forEach(s, c, { concurrency: 1 }), (e) => e.flat())));
-		let u = t.map((e) => e.id), d = new Map(C(l, e, "mssql").map((e) => [e.id, e])), f = u.map((e) => d.get(e)).filter((e) => e !== void 0), p = f.length === l.length ? f : [...l];
-		for (let t of p) await this.routeEvent({
+		let u = t.map((e) => e.id), d = w(l, e, "mssql"), f = new Map(d.map((e) => [e.id, e])), p = u.map((e) => f.get(e)).filter((e) => e !== void 0), m = p.length === l.length ? p : d;
+		for (let t of m) await this.routeEvent({
 			table: e,
 			op: "insert",
 			old: null,
 			new: t
 		}, r, n, a);
-		return p;
+		return m;
 	}
 	async executePatchJson(e, t, n, r, a, o, s, c) {
-		let l = this.sql, u = w(re(t, n, c), e), d = l.csv([b(l, "mssql", n, r), ...Object.entries(u).map(([e, t]) => l`${l(e)} = ${t}`)]), f = l`UPDATE ${l(this.nsT(e))} SET ${d} OUTPUT INSERTED.* WHERE ${l.and(k(t).map(([e, t]) => l`${l(e)} = ${t}`))}`, p = a ? i.provideService(f, L, a) : f, m = (await this.runtime.runPromise(p))[0];
-		return m ? (await this.routeEvent({
+		let l = this.sql, u = T(te(t, n, c), e), d = l.csv([b(l, "mssql", n, r), ...Object.entries(u).map(([e, t]) => l`${l(e)} = ${t}`)]), f = l`UPDATE ${l(this.nsT(e))} SET ${d} OUTPUT INSERTED.* WHERE ${l.and(j(t).map(([e, t]) => l`${l(e)} = ${t}`))}`, p = a ? i.provideService(f, R, a) : f, m = (await this.runtime.runPromise(p))[0];
+		if (!m) return null;
+		let h = this.decodeWritten(e, m);
+		return await this.routeEvent({
 			table: e,
 			op: "update",
 			old: null,
-			new: m
-		}, o, a, s), m) : null;
+			new: h
+		}, o, a, s), h;
 	}
 	async executeDelete(e, t, n, r, a) {
-		let o = this.sql, s = o`DELETE FROM ${o(this.nsT(e))} OUTPUT DELETED.* WHERE ${o.and(k(t).map(([e, t]) => o`${o(e)} = ${t}`))}`, c = n ? i.provideService(s, L, n) : s, l = (await this.runtime.runPromise(c))[0];
+		let o = this.sql, s = o`DELETE FROM ${o(this.nsT(e))} OUTPUT DELETED.* WHERE ${o.and(j(t).map(([e, t]) => o`${o(e)} = ${t}`))}`, c = n ? i.provideService(s, R, n) : s, l = (await this.runtime.runPromise(c))[0];
 		if (!l) return !1;
 		let u = this.decodeWritten(e, l);
 		return await this.routeEvent({
@@ -280,18 +282,18 @@ var R = {
 		}, r, n, a), !0;
 	}
 	async appendInTxn(e, t, n) {
-		let r = this.sql, a = r`INSERT INTO ${r(this.nsT(e))} ${r.insert(w(t, e))}`;
-		await this.runtime.runPromise(n ? i.provideService(a, L, n) : a);
+		let r = this.sql, a = r`INSERT INTO ${r(this.nsT(e))} ${r.insert(T(t, e))}`;
+		await this.runtime.runPromise(n ? i.provideService(a, R, n) : a);
 	}
 	async maxInTxn(e, t, n, r) {
-		let a = this.sql, o = Object.entries(n).map(([e, t]) => a`${a(e)} = ${t}`), s = a`SELECT MAX(${a(t)}) AS ${a("m")} FROM ${a(this.nsT(e))} WHERE ${a.and(o)}`, c = (await this.runtime.runPromise(r ? i.provideService(s, L, r) : s))[0]?.m;
+		let a = this.sql, o = Object.entries(n).map(([e, t]) => a`${a(e)} = ${t}`), s = a`SELECT MAX(${a(t)}) AS ${a("m")} FROM ${a(this.nsT(e))} WHERE ${a.and(o)}`, c = (await this.runtime.runPromise(r ? i.provideService(s, R, r) : s))[0]?.m;
 		return c == null ? null : Number(c);
 	}
 	async routeEvent(e, t, n = null, r) {
 		e = {
 			...h(r),
 			...e
-		}, O(e.table) && await j({
+		}, A(e.table) && await M({
 			append: (e, t) => this.appendInTxn(e, t, n),
 			maxOf: (e, t, r) => this.maxInTxn(e, t, r, n)
 		}, {
@@ -301,7 +303,7 @@ var R = {
 			prev: e.old,
 			traceId: e.traceId,
 			subjectId: e.subjectId
-		}), T(e.table) && (t === null ? this.inlineEmit && this.emitter.emit("change", e) : t.push(e));
+		}), D(e.table) && (t === null ? this.inlineEmit && this.emitter.emit("change", e) : t.push(e));
 	}
 	query(e) {
 		return this.runWithEager(e, null);
@@ -310,14 +312,14 @@ var R = {
 		return this.rawOn(e, null);
 	}
 	rawOn(e, t) {
-		let n = ee(e, this.sql), r = t ? i.provideService(n, L, t) : n;
-		return D("mssql", "raw", () => this.runtime.runPromise(r));
+		let n = S(e, this.sql), r = t ? i.provideService(n, R, t) : n;
+		return O("mssql", "raw", () => this.runtime.runPromise(r));
 	}
 	async runWithEager(e, t) {
-		if (!ne(e)) return this.executeQuery(e, t);
+		if (!ee(e)) return this.executeQuery(e, t);
 		let n = this.namespace === null ? y(e, this.sql, "mssql") : null;
 		if (n !== null) try {
-			let e = t ? i.provideService(n.fragment, L, t) : n.fragment, r = await D("mssql", "select", () => this.runtime.runPromise(e));
+			let e = t ? i.provideService(n.fragment, R, t) : n.fragment, r = await O("mssql", "select", () => this.runtime.runPromise(e));
 			return n.decode(r);
 		} catch (t) {
 			if (t instanceof d) throw t;
@@ -334,17 +336,17 @@ var R = {
 			reason: "not-compilable"
 		});
 		let r = await this.executeQuery(e, t);
-		return m(r, e.eager, e.sourceTable ?? se(e.table), (e) => this.executeQuery(e, t));
+		return m(r, e.eager, e.sourceTable ?? ae(e.table), (e) => this.executeQuery(e, t));
 	}
 	getInternalRunWithEager() {
 		return this.runWithEager.bind(this);
 	}
 	localWrite(e, t, n) {
-		let r = (e) => O(t) ? this.writeWithRecorders(n, e) : n(e, null, null);
-		return D("mssql", e, () => le(r));
+		let r = (e) => A(t) ? this.writeWithRecorders(n, e) : n(e, null, null);
+		return O("mssql", e, () => ce(r));
 	}
 	async writeWithRecorders(e, t) {
-		let n = [], r = this.sql, a = await this.runtime.runPromise(r.withTransaction(i.flatMap(i.serviceOption(L), (r) => s.isNone(r) ? i.fail(/* @__PURE__ */ Error("MssqlStore.write: TransactionConnection missing.")) : i.tryPromise({
+		let n = [], r = this.sql, a = await this.runtime.runPromise(r.withTransaction(i.flatMap(i.serviceOption(R), (r) => s.isNone(r) ? i.fail(/* @__PURE__ */ Error("MssqlStore.write: TransactionConnection missing.")) : i.tryPromise({
 			try: () => e(t, r.value, n),
 			catch: (e) => e
 		}))));
@@ -373,8 +375,8 @@ var R = {
 		return this.executeDeleteMany(e, t, null, null);
 	}
 	async executeUpdateMany(e, t, n, r, a, o) {
-		let s = this.sql, c = x(n.where, s, this.namespace), l = s`UPDATE ${s(this.nsT(e))} SET ${s.update(w(t, e))} OUTPUT INSERTED.* WHERE ${c}`, u = r ? i.provideService(l, L, r) : l, d = await D("mssql", "update", () => this.runtime.runPromise(u));
-		for (let t of d) await this.routeEvent({
+		let s = this.sql, c = x(n.where, s, this.namespace), l = s`UPDATE ${s(this.nsT(e))} SET ${s.update(T(t, e))} OUTPUT INSERTED.* WHERE ${c}`, u = r ? i.provideService(l, R, r) : l, d = await O("mssql", "update", () => this.runtime.runPromise(u));
+		for (let t of w(d, e, "mssql")) await this.routeEvent({
 			table: e,
 			op: "update",
 			old: null,
@@ -383,8 +385,8 @@ var R = {
 		return d.length;
 	}
 	async executeDeleteMany(e, t, n, r, a) {
-		let o = this.sql, s = x(t.where, o, this.namespace), c = o`DELETE FROM ${o(this.nsT(e))} OUTPUT DELETED.* WHERE ${s}`, l = n ? i.provideService(c, L, n) : c, u = await D("mssql", "delete", () => this.runtime.runPromise(l));
-		for (let t of u) await this.routeEvent({
+		let o = this.sql, s = x(t.where, o, this.namespace), c = o`DELETE FROM ${o(this.nsT(e))} OUTPUT DELETED.* WHERE ${s}`, l = n ? i.provideService(c, R, n) : c, u = await O("mssql", "delete", () => this.runtime.runPromise(l));
+		for (let t of w(u, e, "mssql")) await this.routeEvent({
 			table: e,
 			op: "delete",
 			old: t,
@@ -396,61 +398,73 @@ var R = {
 		return this.localWrite("upsert", e, (r, i, a) => this.executeUpsert(e, t, n, i, a, r));
 	}
 	insertIgnore(e, t, n) {
+		return this.insertIgnoreWithOutcome(e, t, n).then((e) => e.row);
+	}
+	insertIgnoreWithOutcome(e, t, n) {
 		return this.localWrite("upsert", e, (r, i, a) => this.executeInsertIgnore(e, t, n, i, a, r));
 	}
 	async executeUpsert(e, t, n, r, i, a) {
-		if (P(n), t = M(e, t), typeof n.update != "function" && n.conflictColumns.length > 0) return this.mergeUpsert(e, t, {
+		if (F(n), t = N(e, t), typeof n.update != "function" && n.conflictColumns.length > 0) return this.mergeUpsert(e, t, {
 			conflictColumns: n.conflictColumns,
 			...n.update === void 0 ? {} : { update: n.update },
 			...n.updateValues === void 0 ? {} : { updateValues: n.updateValues }
-		}, r, i);
+		}, r, i, a);
 		let o = await this.findByConflict(e, t, n.conflictColumns, r);
-		if (o) return await this.executeUpdate(e, o.id, N(t, o, n), r, i) ?? o;
+		if (o) return await this.executeUpdate(e, o.id, P(t, o, n), r, i, a) ?? o;
 		try {
-			return await this.executeInsert(e, t, r, i);
-		} catch (a) {
-			if (!G(a)) throw a;
-			let o = await this.findByConflict(e, t, n.conflictColumns, r);
-			if (!o) throw a;
-			return await this.executeUpdate(e, o.id, N(t, o, n), r, i) ?? o;
+			return await this.executeInsert(e, t, r, i, a);
+		} catch (o) {
+			if (!G(o)) throw o;
+			let s = await this.findByConflict(e, t, n.conflictColumns, r);
+			if (!s) throw o;
+			return await this.executeUpdate(e, s.id, P(t, s, n), r, i, a) ?? s;
 		}
 	}
-	async mergeUpsert(e, t, n, r, a) {
-		let o = this.sql, s = Object.keys(t), c = Array.isArray(n.update) ? n.update.filter((e) => s.includes(e)) : s.filter((e) => e !== "id" && !n.conflictColumns.includes(e)), l = w(t, e), u = s.map((e) => o`${l[e]}`), d = s.map((e) => o`${o(e)}`), f = n.conflictColumns.map((e) => o`tgt.${o(e)} = src.${o(e)}`), p = s.map((e) => o`${o(e)}`), m = s.map((e) => o`src.${o(e)}`), h = P(n), g = w(h, e), _ = [...c.filter((e) => !Object.hasOwn(h, e)).map((e) => o`tgt.${o(e)} = src.${o(e)}`), ...Object.entries(g).map(([e, t]) => o`tgt.${o(e)} = ${t}`)];
-		_.length === 0 && _.push(o`tgt.${o(n.conflictColumns[0])} = src.${o(n.conflictColumns[0])}`);
-		let v = o`
-      MERGE ${o(this.nsT(e))} WITH (HOLDLOCK) AS tgt
-      USING (VALUES (${o.csv(u)})) AS src (${o.csv(d)})
-      ON ${o.and(f)}
-      WHEN MATCHED THEN UPDATE SET ${o.csv(_)}
-      WHEN NOT MATCHED THEN INSERT (${o.csv(p)}) VALUES (${o.csv(m)})
-      OUTPUT $action AS ${o("__action")}, INSERTED.*;`, y = r ? i.provideService(v, L, r) : v, b = (await this.runtime.runPromise(y))[0];
-		if (!b) throw Error(`MssqlStore.upsert: MERGE returned no row for '${e}'`);
-		let x = b.__action, { __action: ee, ...S } = b, C = this.decodeWritten(e, S);
-		return this.routeEvent({
+	async mergeUpsert(e, t, n, r, a, o) {
+		let s = this.sql, c = Object.keys(t), l = Array.isArray(n.update) ? n.update.filter((e) => c.includes(e)) : c.filter((e) => e !== "id" && !n.conflictColumns.includes(e)), u = T(t, e), d = c.map((e) => s`${u[e]}`), f = c.map((e) => s`${s(e)}`), p = n.conflictColumns.map((e) => s`tgt.${s(e)} = src.${s(e)}`), m = c.map((e) => s`${s(e)}`), h = c.map((e) => s`src.${s(e)}`), g = F(n), _ = T(g, e), v = [...l.filter((e) => !Object.hasOwn(g, e)).map((e) => s`tgt.${s(e)} = src.${s(e)}`), ...Object.entries(_).map(([e, t]) => s`tgt.${s(e)} = ${t}`)];
+		v.length === 0 && v.push(s`tgt.${s(n.conflictColumns[0])} = src.${s(n.conflictColumns[0])}`);
+		let y = s`
+      MERGE ${s(this.nsT(e))} WITH (HOLDLOCK) AS tgt
+      USING (VALUES (${s.csv(d)})) AS src (${s.csv(f)})
+      ON ${s.and(p)}
+      WHEN MATCHED THEN UPDATE SET ${s.csv(v)}
+      WHEN NOT MATCHED THEN INSERT (${s.csv(m)}) VALUES (${s.csv(h)})
+      OUTPUT $action AS ${s("__action")}, INSERTED.*;`, b = r ? i.provideService(y, R, r) : y, x = (await this.runtime.runPromise(b))[0];
+		if (!x) throw Error(`MssqlStore.upsert: MERGE returned no row for '${e}'`);
+		let S = x.__action, { __action: C, ...w } = x, E = this.decodeWritten(e, w);
+		return await this.routeEvent({
 			table: e,
-			op: x === "INSERT" ? "insert" : "update",
+			op: S === "INSERT" ? "insert" : "update",
 			old: null,
-			new: C
-		}, a), C;
+			new: E
+		}, a, r, o), E;
 	}
 	async executeInsertIgnore(e, t, n, r, i, a) {
-		t = M(e, t);
+		t = N(e, t);
 		let o = await this.findByConflict(e, t, n.conflictColumns, r);
-		if (o) return o;
+		if (o) return {
+			row: o,
+			outcome: "ignored"
+		};
 		try {
-			return await this.executeInsert(e, t, r, i);
+			return {
+				row: await this.executeInsert(e, t, r, i, a),
+				outcome: "inserted"
+			};
 		} catch (i) {
 			if (!G(i)) throw i;
 			let a = await this.findByConflict(e, t, n.conflictColumns, r);
 			if (!a) throw i;
-			return a;
+			return {
+				row: a,
+				outcome: "ignored"
+			};
 		}
 	}
 	async findByConflict(e, t, n, r) {
 		if (n.length === 0) return;
-		let a = this.sql, o = n.map((e) => a`${a(e)} = ${t[e]}`), s = a`SELECT TOP 1 * FROM ${a(this.nsT(e))} WHERE ${a.and(o)}`, c = r ? i.provideService(s, L, r) : s;
-		return (await this.runtime.runPromise(c))[0];
+		let a = this.sql, o = n.map((e) => a`${a(e)} = ${t[e]}`), s = a`SELECT TOP 1 * FROM ${a(this.nsT(e))} WHERE ${a.and(o)}`, c = r ? i.provideService(s, R, r) : s, l = (await this.runtime.runPromise(c))[0];
+		return l ? this.decodeWritten(e, l) : void 0;
 	}
 	emitChange(e) {
 		this.emitter.emit("change", e);
@@ -562,13 +576,13 @@ var R = {
 	}
 	async emptyTablesOn(e, t) {
 		if (e.length === 0) return;
-		let n = this.sql, r = (e) => this.nsT(e), a = (e, t) => n.unsafe(`ALTER TABLE ${ae(r(e), "mssql")} ${t ? "WITH CHECK CHECK" : "NOCHECK"} CONSTRAINT ALL`), o = i.acquireUseRelease(i.forEach(e, (e) => a(e, !1), { discard: !0 }), () => i.forEach(e, (e) => n`DELETE FROM ${n(r(e))}`, { discard: !0 }), () => i.orDie(i.ignore(i.forEach(e, (e) => a(e, !0), { discard: !0 })))), s = t === null ? n.withTransaction(o) : i.provideService(o, L, t);
+		let n = this.sql, r = (e) => this.nsT(e), a = (e, t) => n.unsafe(`ALTER TABLE ${re(r(e), "mssql")} ${t ? "WITH CHECK CHECK" : "NOCHECK"} CONSTRAINT ALL`), o = i.acquireUseRelease(i.forEach(e, (e) => a(e, !1), { discard: !0 }), () => i.forEach(e, (e) => n`DELETE FROM ${n(r(e))}`, { discard: !0 }), () => i.orDie(i.ignore(i.forEach(e, (e) => a(e, !0), { discard: !0 })))), s = t === null ? n.withTransaction(o) : i.provideService(o, R, t);
 		await this.runtime.runPromise(s);
 	}
 	async transactional(e) {
 		this.inflightTxns++;
 		try {
-			return await A({
+			return await oe({
 				...this.txnSpec("MssqlStore.transactional"),
 				work: e,
 				makeView: (e, t) => new ge(this, e, t)
@@ -602,7 +616,7 @@ var R = {
 		return this.changeStrategy === "cdc" ? "fleet" : "local";
 	}
 	injectExternalChange(e) {
-		T(e.table) && this.emitter.emit("change", te(e));
+		D(e.table) && this.emitter.emit("change", E(e));
 	}
 	run(e) {
 		return this.runtime.runPromise(e);
@@ -668,6 +682,9 @@ var R = {
 		return this.parent.getInternalExecuteUpsert()(e, t, n, this.txn, this.events, this.attr);
 	}
 	insertIgnore(e, t, n) {
+		return this.insertIgnoreWithOutcome(e, t, n).then((e) => e.row);
+	}
+	insertIgnoreWithOutcome(e, t, n) {
 		return this.parent.getInternalExecuteInsertIgnore()(e, t, n, this.txn, this.events, this.attr);
 	}
 	transactional(e) {
@@ -691,7 +708,7 @@ var R = {
 		let t = $(e);
 		if (t === null) throw Error("mssqlReplicationAdapter: primary is not an MssqlStore (missing __mssqlReplicationFriend).");
 		return t.runEffect(i.gen(function* () {
-			return (yield* (yield* I)`
+			return (yield* (yield* L)`
           SELECT CONVERT(VARCHAR(40), end_of_log_lsn) AS lsn
           FROM sys.dm_hadr_database_replica_states
           WHERE database_id = DB_ID()
@@ -704,7 +721,7 @@ var R = {
 		let t = $(e);
 		if (t === null) throw Error("mssqlReplicationAdapter: replica is not an MssqlStore.");
 		return t.runEffect(i.gen(function* () {
-			return (yield* (yield* I)`
+			return (yield* (yield* L)`
           SELECT CONVERT(VARCHAR(40), last_hardened_lsn) AS lsn
           FROM sys.dm_hadr_database_replica_states
           WHERE database_id = DB_ID()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/sql-mssql",
-  "version": "0.69.1",
+  "version": "0.71.0",
   "description": "SQL Server (mssql) dialect adapter for Voltro's cross-dialect DataStore (OUTPUT-clause returning, OFFSET/FETCH paging, inline reactivity).",
   "keywords": [
     "voltro",
@@ -35,8 +35,8 @@
   "dependencies": {
     "@effect/sql": "^0.52.1",
     "@effect/sql-mssql": "^0.54.0",
-    "@voltro/database": "0.69.1",
-    "@voltro/logger": "0.69.1",
+    "@voltro/database": "0.71.0",
+    "@voltro/logger": "0.71.0",
     "tedious": "18.6.2"
   },
   "peerDependencies": {