@aiao/rxdb-adapter-pglite 0.0.15 → 0.0.17

package/dist/index.js

@@ -1,8 +1,7 @@
-import { PropertyType as N, RxDBChange as ie, getEntityMetadata as D, EntityLocalCreatedEvent as oe, EntityLocalRemovedEvent as Ve, EntityLocalUpdatedEvent as me, RelationKind as F, RepositoryBase as Fn, getEntityStatus as J, RxDBBranch as ne, parseRxDBChangeKey as Ae, getEntityType as Re, RxDBAdapterLocalBase as kn } from "@aiao/rxdb";
-import { EventDispatcher as Wn, traverseObjectKeys as Gn, isFunction as It, isString as Hn, AsyncQueueExecutor as Vn } from "@aiao/utils";
+import { PropertyType as _, RxDBChange as le, getEntityMetadata as C, EntityLocalCreatedEvent as ue, EntityLocalRemovedEvent as Ke, EntityLocalUpdatedEvent as ge, RelationKind as B, RepositoryBase as Bn, getEntityStatus as J, RxDBBranch as re, parseRxDBChangeKey as Re, getEntityType as Se, RxDBAdapterLocalBase as kn } from "@aiao/rxdb";
+import { EventDispatcher as Wn, traverseObjectKeys as Gn, isFunction as Ot, isString as Hn, AsyncQueueExecutor as Vn } from "@aiao/utils";
 import { PGlite as Kn } from "@electric-sql/pglite";
-import Ot from "object-hash";
-import { ReplaySubject as Jn, defer as be, of as Se, from as Ie, map as Yn } from "rxjs";
+import { ReplaySubject as Jn, defer as Ie, of as Oe, from as De, map as Yn } from "rxjs";
 const Qn = "pglite";
 var K = /* @__PURE__ */ ((e) => (e.INSERT = "INSERT", e.UPDATE = "UPDATE", e.DELETE = "DELETE", e))(K || {});
 class x extends Error {
@@ -18,205 +17,222 @@ class x extends Error {
     super(t), this.name = "RxdbAdapterPGliteError", this.code = n, this.originalError = r, Object.setPrototypeOf(this, x.prototype);
   }
 }
-const vt = (e, t = "public") => `"${t}"."${e}"`, P = (e) => vt(e.tableName, e.namespace), Dt = (e) => {
+const Dt = (e, t = "public") => `"${t}"."${e}"`, P = (e) => Dt(e.tableName, e.namespace), Ct = (e) => {
   switch (e.type) {
-    case N.uuid:
+    case _.uuid:
       return "uuid";
-    case N.string:
-    case N.enum:
+    case _.string:
+    case _.enum:
       return "varchar";
-    case N.json:
+    case _.json:
+    case _.keyValue:
       return "jsonb";
-    case N.number:
+    case _.number:
       return "numeric";
-    case N.integer:
+    case _.integer:
       return "integer";
-    case N.boolean:
+    case _.boolean:
       return "boolean";
-    case N.date:
+    case _.date:
       return "timestamptz";
+    case _.stringArray:
+      return "text[]";
+    case _.numberArray:
+      return "numeric[]";
   }
   throw new x("rxDBColumnTypeToPGliteType: type '" + e.type + "' not support");
 }, Xn = (e) => {
   switch (e.type) {
-    case N.uuid:
+    case _.uuid:
       return "uuid_ops";
-    case N.string:
-    case N.enum:
+    case _.string:
+    case _.enum:
       return "bpchar_ops";
-    case N.json:
+    case _.json:
       return "jsonb_ops";
-    case N.number:
+    case _.number:
       return "numeric_ops";
-    case N.integer:
+    case _.integer:
       return "int4_ops";
     default:
       throw new x(`rxDBColumnTypeToPGliteTypeIndexName: type '${e.type}' not support`);
   }
-}, Ct = (e, t) => `idx_${e.namespace}_${e.tableName}_${t.name}`, tt = (e, t) => {
+}, Lt = (e, t) => `idx_${e.namespace}_${e.tableName}_${t.name}`, nt = (e, t) => {
   if (e == null)
     return null;
   switch (t.type) {
-    case N.json:
-    case N.keyValue:
-    case N.stringArray:
-    case N.numberArray:
+    case _.json:
+    case _.keyValue:
       return JSON.stringify(e);
-    case N.date:
+    case _.stringArray:
+      return Array.isArray(e) ? e : JSON.parse(String(e));
+    case _.numberArray:
+      return (Array.isArray(e) ? e : JSON.parse(String(e))).map(Number);
+    case _.date:
       return e instanceof Date ? e.toISOString() : e;
-    case N.boolean:
+    case _.boolean:
       return !!e;
-    case N.number:
-    case N.integer:
+    case _.number:
+    case _.integer:
       return Number(e);
-    case N.enum:
-    case N.string:
-    case N.uuid:
+    case _.enum:
+    case _.string:
+    case _.uuid:
     default:
       return String(e);
   }
-}, Ke = (e, t) => {
+}, Je = (e, t) => {
   const n = {}, r = Object.keys(t), s = e.foreignKeyNames || [], a = e.foreignKeyColumnNames || s;
-  for (let i = 0; i < r.length; i++) {
-    const o = r[i], c = s.indexOf(o);
+  for (let o = 0; o < r.length; o++) {
+    const i = r[o], c = s.indexOf(i);
     if (c !== -1) {
-      n[a[c]] = t[o];
+      n[a[c]] = t[i];
       continue;
     }
-    if (a.indexOf(o) !== -1) {
-      n[o] = t[o];
+    if (a.indexOf(i) !== -1) {
+      n[i] = t[i];
       continue;
     }
-    const l = e.propertyMap.get(o);
-    if (l) {
-      n[l.columnName] = tt(t[o], l);
+    const u = e.propertyMap.get(i);
+    if (u) {
+      n[u.columnName] = nt(t[i], u);
       continue;
     }
-    const d = e.columnNameToPropertyName?.get(o);
-    if (d) {
-      const f = e.propertyMap.get(d);
-      f && (n[o] = tt(t[o], f));
+    const h = e.columnNameToPropertyName?.get(i);
+    if (h) {
+      const p = e.propertyMap.get(h);
+      p && (n[i] = nt(t[i], p));
     }
   }
   return n;
-}, Lt = (e, t) => {
+}, vt = (e, t) => {
   const n = {};
-  for (const [a, i] of e.propertyMap)
-    a in t && (n[i.columnName] = t[a]);
+  for (const [a, o] of e.propertyMap)
+    a in t && (n[o.columnName] = t[a]);
   const r = e.foreignKeyNames || [], s = e.foreignKeyColumnNames || r;
   for (let a = 0; a < r.length; a++) {
-    const i = r[a];
-    i in t && (n[s[a]] = t[i]);
+    const o = r[a];
+    o in t && (n[s[a]] = t[o]);
   }
   return n;
 }, zn = (e, t) => {
   const n = {};
-  for (const [a, i] of e.propertyMap)
-    a in t && i.readonly !== !0 && (n[i.columnName] = t[a]);
+  for (const [a, o] of e.propertyMap)
+    a in t && o.readonly !== !0 && (n[o.columnName] = t[a]);
   const r = e.foreignKeyNames || [], s = e.foreignKeyColumnNames || r;
   for (let a = 0; a < r.length; a++) {
-    const i = r[a];
-    i in t && (n[s[a]] = t[i]);
+    const o = r[a];
+    o in t && (n[s[a]] = t[o]);
   }
   return n;
-}, Zn = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i, Je = (e) => {
+}, Zn = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i, Ye = (e) => {
   if (typeof e == "string") {
     const t = e.replaceAll("'", "''");
     return Zn.test(e) ? `'${t}'::uuid` : `'${t}'`;
   }
-  return e == null ? "NULL" : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : e instanceof Date ? `'${e.toISOString()}'` : Array.isArray(e) ? `ARRAY[${e.map((n) => Je(n)).join(", ")}]` : typeof e == "object" ? `'${JSON.stringify(e).replaceAll("'", "''")}'::jsonb` : String(e);
-}, nt = (e, t = []) => !t || t.length === 0 ? e : e.replace(/\$(\d+)/g, (n, r) => {
+  return e == null ? "NULL" : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : e instanceof Date ? `'${e.toISOString()}'` : Array.isArray(e) ? `ARRAY[${e.map((n) => Ye(n)).join(", ")}]` : typeof e == "object" ? `'${JSON.stringify(e).replaceAll("'", "''")}'::jsonb` : String(e);
+}, st = (e, t = []) => !t || t.length === 0 ? e : e.replace(/\$(\d+)/g, (n, r) => {
   const s = parseInt(r, 10) - 1;
   if (s < 0 || s >= t.length)
     throw new x(`Parameter index ${r} out of range (have ${t.length} params)`);
-  return Je(t[s]);
-}), Z = (e, t) => {
+  return Ye(t[s]);
+}), ee = (e, t) => {
   const n = {}, r = e.foreignKeyNames || [], s = e.foreignKeyColumnNames || r, a = e.columnNameToPropertyName;
-  return Object.keys(t).forEach((i) => {
-    const o = t[i], c = s.indexOf(i);
+  return Object.keys(t).forEach((o) => {
+    const i = t[o], c = s.indexOf(o);
     if (c !== -1) {
-      n[r[c]] = o;
+      n[r[c]] = i;
       return;
     }
-    const u = a?.get(i);
-    if (u) {
-      const l = e.propertyMap.get(u);
-      l && (l.type === N.number && typeof o == "string" ? n[u] = parseFloat(o) : l.type === N.integer && typeof o == "string" ? n[u] = parseInt(o, 10) : n[u] = o);
+    const l = a?.get(o);
+    if (l) {
+      const u = e.propertyMap.get(l);
+      u && (u.type === _.number && typeof i == "string" ? n[l] = parseFloat(i) : u.type === _.integer && typeof i == "string" ? n[l] = parseInt(i, 10) : u.type === _.numberArray && Array.isArray(i) ? n[l] = i.map((h) => typeof h == "string" ? parseFloat(h) : Number(h)) : u.type === _.keyValue ? n[l] = ae(i, u) : n[l] = i);
       return;
     }
     if (!a) {
-      const l = e.propertyMap.get(i);
-      if (l) {
-        l.type === N.number && typeof o == "string" ? n[i] = parseFloat(o) : l.type === N.integer && typeof o == "string" ? n[i] = parseInt(o, 10) : n[i] = o;
+      const u = e.propertyMap.get(o);
+      if (u) {
+        u.type === _.number && typeof i == "string" ? n[o] = parseFloat(i) : u.type === _.integer && typeof i == "string" ? n[o] = parseInt(i, 10) : u.type === _.numberArray && Array.isArray(i) ? n[o] = i.map((h) => typeof h == "string" ? parseFloat(h) : Number(h)) : u.type === _.keyValue ? n[o] = ae(i, u) : n[o] = i;
         return;
       }
     }
-    e.isForeignKey(i), n[i] = o;
+    e.isForeignKey(o), n[o] = i;
   }), n;
-}, Le = (e, t) => {
+}, ae = (e, t) => {
   if (e == null) return e;
   switch (t.type) {
-    case N.date:
+    case _.date:
       return e instanceof Date ? e : new Date(e);
-    case N.json:
-    case N.keyValue:
-    case N.stringArray:
-    case N.numberArray:
+    case _.keyValue: {
+      if (!e || typeof e != "object") return e;
+      const n = t.properties;
+      if (n && n.length > 0) {
+        const r = { ...e };
+        for (const s of n)
+          s.name in r && (r[s.name] = ae(r[s.name], s));
+        return r;
+      }
       return e;
-    case N.boolean:
+    }
+    case _.json:
+    case _.stringArray:
+    case _.numberArray:
+      return e;
+    case _.boolean:
       return !!e;
     default:
       return e;
   }
-}, st = (e, t) => (Object.keys(t).forEach((n) => {
+}, rt = (e, t) => (Object.keys(t).forEach((n) => {
   const r = t[n], s = e.propertyMap.get(n);
-  s && (t[n] = Le(r, s));
+  s && (t[n] = ae(r, s));
 }), t);
 var es = Object.defineProperty, Mt = (e) => {
   throw TypeError(e);
-}, ts = (e, t) => () => (e && (t = e(e = 0)), t), ye = (e, t) => {
+}, ts = (e, t) => () => (e && (t = e(e = 0)), t), _e = (e, t) => {
   for (var n in t) es(e, n, { get: t[n], enumerable: !0 });
-}, Ye = (e, t, n) => t.has(e) || Mt("Cannot " + n), h = (e, t, n) => (Ye(e, t, "read from private field"), n ? n.call(e) : t.get(e)), j = (e, t, n) => t.has(e) ? Mt("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, n), v = (e, t, n, r) => (Ye(e, t, "write to private field"), t.set(e, n), n), O = (e, t, n) => (Ye(e, t, "access private method"), n), qt = (e, t, n, r) => ({ set _(s) {
-  v(e, t, s);
+}, Qe = (e, t, n) => t.has(e) || Mt("Cannot " + n), d = (e, t, n) => (Qe(e, t, "read from private field"), n ? n.call(e) : t.get(e)), j = (e, t, n) => t.has(e) ? Mt("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, n), D = (e, t, n, r) => (Qe(e, t, "write to private field"), t.set(e, n), n), O = (e, t, n) => (Qe(e, t, "access private method"), n), qt = (e, t, n, r) => ({ set _(s) {
+  D(e, t, s);
 }, get _() {
-  return h(e, t, r);
+  return d(e, t, r);
 } }), H = ts(() => {
 }), ns = {};
-ye(ns, { ABSTIME: () => ms, ACLITEM: () => As, BIT: () => Is, BOOL: () => Me, BPCHAR: () => Ft, BYTEA: () => qe, CHAR: () => as, CID: () => ls, CIDR: () => Es, CIRCLE: () => _s, DATE: () => Wt, FLOAT4: () => xt, FLOAT8: () => Bt, GTSVECTOR: () => Gs, INET: () => $s, INT2: () => Pt, INT4: () => Ut, INT8: () => Pe, INTERVAL: () => bs, JSON: () => Ue, JSONB: () => Ht, MACADDR: () => Ns, MACADDR8: () => Ts, MONEY: () => ws, NUMERIC: () => vs, OID: () => jt, PATH: () => ds, PG_DEPENDENCIES: () => Fs, PG_LSN: () => xs, PG_NDISTINCT: () => Bs, PG_NODE_TREE: () => hs, POLYGON: () => ps, REFCURSOR: () => Ds, REGCLASS: () => qs, REGCONFIG: () => Hs, REGDICTIONARY: () => Vs, REGNAMESPACE: () => Ks, REGOPER: () => Ls, REGOPERATOR: () => Ms, REGPROC: () => is, REGPROCEDURE: () => Cs, REGROLE: () => Js, REGTYPE: () => Ps, RELTIME: () => ys, SMGR: () => fs, TEXT: () => ce, TID: () => os, TIME: () => Rs, TIMESTAMP: () => Gt, TIMESTAMPTZ: () => je, TIMETZ: () => Ss, TINTERVAL: () => gs, TSQUERY: () => Ws, TSVECTOR: () => ks, TXID_SNAPSHOT: () => js, UUID: () => Us, VARBIT: () => Os, VARCHAR: () => kt, XID: () => cs, XML: () => us, arrayParser: () => tr, arraySerializer: () => Kt, parseType: () => xe, parsers: () => Ys, serializers: () => Qs, types: () => Vt });
+_e(ns, { ABSTIME: () => ms, ACLITEM: () => $s, BIT: () => Is, BOOL: () => qe, BPCHAR: () => Bt, BYTEA: () => Pe, CHAR: () => as, CID: () => ls, CIDR: () => Es, CIRCLE: () => _s, DATE: () => Wt, FLOAT4: () => xt, FLOAT8: () => Ft, GTSVECTOR: () => Gs, INET: () => As, INT2: () => Pt, INT4: () => Ut, INT8: () => Ue, INTERVAL: () => Rs, JSON: () => je, JSONB: () => Ht, MACADDR: () => Ns, MACADDR8: () => Ts, MONEY: () => ws, NUMERIC: () => Ds, OID: () => jt, PATH: () => ds, PG_DEPENDENCIES: () => Bs, PG_LSN: () => xs, PG_NDISTINCT: () => Fs, PG_NODE_TREE: () => hs, POLYGON: () => ps, REFCURSOR: () => Cs, REGCLASS: () => qs, REGCONFIG: () => Hs, REGDICTIONARY: () => Vs, REGNAMESPACE: () => Ks, REGOPER: () => vs, REGOPERATOR: () => Ms, REGPROC: () => is, REGPROCEDURE: () => Ls, REGROLE: () => Js, REGTYPE: () => Ps, RELTIME: () => ys, SMGR: () => fs, TEXT: () => he, TID: () => os, TIME: () => bs, TIMESTAMP: () => Gt, TIMESTAMPTZ: () => xe, TIMETZ: () => Ss, TINTERVAL: () => gs, TSQUERY: () => Ws, TSVECTOR: () => ks, TXID_SNAPSHOT: () => js, UUID: () => Us, VARBIT: () => Os, VARCHAR: () => kt, XID: () => cs, XML: () => us, arrayParser: () => tr, arraySerializer: () => Kt, parseType: () => Fe, parsers: () => Ys, serializers: () => Qs, types: () => Vt });
 H();
-var ss = globalThis.JSON.parse, rs = globalThis.JSON.stringify, Me = 16, qe = 17, as = 18, Pe = 20, Pt = 21, Ut = 23, is = 24, ce = 25, jt = 26, os = 27, cs = 28, ls = 29, Ue = 114, us = 142, hs = 194, fs = 210, ds = 602, ps = 604, Es = 650, xt = 700, Bt = 701, ms = 702, ys = 703, gs = 704, _s = 718, Ts = 774, ws = 790, Ns = 829, $s = 869, As = 1033, Ft = 1042, kt = 1043, Wt = 1082, Rs = 1083, Gt = 1114, je = 1184, bs = 1186, Ss = 1266, Is = 1560, Os = 1562, vs = 1700, Ds = 1790, Cs = 2202, Ls = 2203, Ms = 2204, qs = 2205, Ps = 2206, Us = 2950, js = 2970, xs = 3220, Bs = 3361, Fs = 3402, ks = 3614, Ws = 3615, Gs = 3642, Hs = 3734, Vs = 3769, Ht = 3802, Ks = 4089, Js = 4096, Vt = { string: { to: ce, from: [ce, kt, Ft], serialize: (e) => {
+var ss = globalThis.JSON.parse, rs = globalThis.JSON.stringify, qe = 16, Pe = 17, as = 18, Ue = 20, Pt = 21, Ut = 23, is = 24, he = 25, jt = 26, os = 27, cs = 28, ls = 29, je = 114, us = 142, hs = 194, fs = 210, ds = 602, ps = 604, Es = 650, xt = 700, Ft = 701, ms = 702, ys = 703, gs = 704, _s = 718, Ts = 774, ws = 790, Ns = 829, As = 869, $s = 1033, Bt = 1042, kt = 1043, Wt = 1082, bs = 1083, Gt = 1114, xe = 1184, Rs = 1186, Ss = 1266, Is = 1560, Os = 1562, Ds = 1700, Cs = 1790, Ls = 2202, vs = 2203, Ms = 2204, qs = 2205, Ps = 2206, Us = 2950, js = 2970, xs = 3220, Fs = 3361, Bs = 3402, ks = 3614, Ws = 3615, Gs = 3642, Hs = 3734, Vs = 3769, Ht = 3802, Ks = 4089, Js = 4096, Vt = { string: { to: he, from: [he, kt, Bt], serialize: (e) => {
   if (typeof e == "string") return e;
   if (typeof e == "number") return e.toString();
   throw new Error("Invalid input for string type");
-}, parse: (e) => e }, number: { to: 0, from: [Pt, Ut, jt, xt, Bt], serialize: (e) => e.toString(), parse: (e) => +e }, bigint: { to: Pe, from: [Pe], serialize: (e) => e.toString(), parse: (e) => {
+}, parse: (e) => e }, number: { to: 0, from: [Pt, Ut, jt, xt, Ft], serialize: (e) => e.toString(), parse: (e) => +e }, bigint: { to: Ue, from: [Ue], serialize: (e) => e.toString(), parse: (e) => {
   let t = BigInt(e);
   return t < Number.MIN_SAFE_INTEGER || t > Number.MAX_SAFE_INTEGER ? t : Number(t);
-} }, json: { to: Ue, from: [Ue, Ht], serialize: (e) => typeof e == "string" ? e : rs(e), parse: (e) => ss(e) }, boolean: { to: Me, from: [Me], serialize: (e) => {
+} }, json: { to: je, from: [je, Ht], serialize: (e) => typeof e == "string" ? e : rs(e), parse: (e) => ss(e) }, boolean: { to: qe, from: [qe], serialize: (e) => {
   if (typeof e != "boolean") throw new Error("Invalid input for boolean type");
   return e ? "t" : "f";
-}, parse: (e) => e === "t" }, date: { to: je, from: [Wt, Gt, je], serialize: (e) => {
+}, parse: (e) => e === "t" }, date: { to: xe, from: [Wt, Gt, xe], serialize: (e) => {
   if (typeof e == "string") return e;
   if (typeof e == "number") return new Date(e).toISOString();
   if (e instanceof Date) return e.toISOString();
   throw new Error("Invalid input for date type");
-}, parse: (e) => new Date(e) }, bytea: { to: qe, from: [qe], serialize: (e) => {
+}, parse: (e) => new Date(e) }, bytea: { to: Pe, from: [Pe], serialize: (e) => {
   if (!(e instanceof Uint8Array)) throw new Error("Invalid input for bytea type");
   return "\\x" + Array.from(e).map((t) => t.toString(16).padStart(2, "0")).join("");
 }, parse: (e) => {
   let t = e.slice(2);
   return Uint8Array.from({ length: t.length / 2 }, (n, r) => parseInt(t.substring(r * 2, (r + 1) * 2), 16));
-} } }, Qe = Xs(Vt), Ys = Qe.parsers, Qs = Qe.serializers;
-function xe(e, t, n) {
+} } }, Xe = Xs(Vt), Ys = Xe.parsers, Qs = Xe.serializers;
+function Fe(e, t, n) {
   if (e === null) return null;
-  let r = n?.[t] ?? Qe.parsers[t];
+  let r = n?.[t] ?? Xe.parsers[t];
   return r ? r(e, t) : e;
 }
 function Xs(e) {
   return Object.keys(e).reduce(({ parsers: t, serializers: n }, r) => {
-    let { to: s, from: a, serialize: i, parse: o } = e[r];
-    return n[s] = i, n[r] = i, t[r] = o, Array.isArray(a) ? a.forEach((c) => {
-      t[c] = o, n[c] = i;
-    }) : (t[a] = o, n[a] = i), { parsers: t, serializers: n };
+    let { to: s, from: a, serialize: o, parse: i } = e[r];
+    return n[s] = o, n[r] = o, t[r] = i, Array.isArray(a) ? a.forEach((c) => {
+      t[c] = i, n[c] = o;
+    }) : (t[a] = i, n[a] = o), { parsers: t, serializers: n };
   }, { parsers: {}, serializers: {} });
 }
 var zs = /\\/g, Zs = /"/g;
@@ -229,9 +245,9 @@ function Kt(e, t, n) {
   let r = e[0], s = n === 1020 ? ";" : ",";
   return Array.isArray(r) ? `{${e.map((a) => Kt(a, t, n)).join(s)}}` : `{${e.map((a) => (a === void 0 && (a = null), a === null ? "null" : '"' + er(t ? t(a) : a.toString()) + '"')).join(s)}}`;
 }
-var Oe = { i: 0, char: null, str: "", quoted: !1, last: 0, p: null };
+var Ce = { i: 0, char: null, str: "", quoted: !1, last: 0, p: null };
 function tr(e, t, n) {
-  return Oe.i = Oe.last = 0, Jt(Oe, e, t, n)[0];
+  return Ce.i = Ce.last = 0, Jt(Ce, e, t, n)[0];
 }
 function Jt(e, t, n, r) {
   let s = [], a = r === 1020 ? ";" : ",";
@@ -248,25 +264,25 @@ function Jt(e, t, n, r) {
   return e.last < e.i && s.push(n ? n(t.slice(e.last, e.i + 1)) : t.slice(e.last, e.i + 1)), s;
 }
 var nr = {};
-ye(nr, { parseDescribeStatementResults: () => Yt, parseResults: () => sr });
+_e(nr, { parseDescribeStatementResults: () => Yt, parseResults: () => sr });
 H();
 function sr(e, t, n, r) {
-  let s = [], a = { rows: [], fields: [] }, i = 0, o = { ...t, ...n?.parsers };
+  let s = [], a = { rows: [], fields: [] }, o = 0, i = { ...t, ...n?.parsers };
   return e.forEach((c) => {
     switch (c.name) {
       case "rowDescription": {
-        let u = c;
-        a.fields = u.fields.map((l) => ({ name: l.name, dataTypeID: l.dataTypeID }));
+        let l = c;
+        a.fields = l.fields.map((u) => ({ name: u.name, dataTypeID: u.dataTypeID }));
         break;
       }
       case "dataRow": {
         if (!a) break;
-        let u = c;
-        n?.rowMode === "array" ? a.rows.push(u.fields.map((l, d) => xe(l, a.fields[d].dataTypeID, o))) : a.rows.push(Object.fromEntries(u.fields.map((l, d) => [a.fields[d].name, xe(l, a.fields[d].dataTypeID, o)])));
+        let l = c;
+        n?.rowMode === "array" ? a.rows.push(l.fields.map((u, h) => Fe(u, a.fields[h].dataTypeID, i))) : a.rows.push(Object.fromEntries(l.fields.map((u, h) => [a.fields[h].name, Fe(u, a.fields[h].dataTypeID, i)])));
         break;
       }
       case "commandComplete": {
-        i += rr(c), s.push({ ...a, affectedRows: i, ...r ? { blob: r } : {} }), a = { rows: [], fields: [] };
+        o += rr(c), s.push({ ...a, affectedRows: o, ...r ? { blob: r } : {} }), a = { rows: [], fields: [] };
         break;
       }
     }
@@ -291,7 +307,7 @@ function Yt(e) {
   return t ? t.dataTypeIDs : [];
 }
 var Qt = {};
-ye(Qt, { AuthenticationCleartextPassword: () => on, AuthenticationMD5Password: () => cn, AuthenticationOk: () => an, AuthenticationSASL: () => ln, AuthenticationSASLContinue: () => un, AuthenticationSASLFinal: () => hn, BackendKeyDataMessage: () => gn, CommandCompleteMessage: () => wn, CopyDataMessage: () => fn, CopyResponse: () => dn, DataRowMessage: () => Nn, DatabaseError: () => Be, Field: () => pn, NoticeMessage: () => $n, NotificationResponseMessage: () => _n, ParameterDescriptionMessage: () => mn, ParameterStatusMessage: () => yn, ReadyForQueryMessage: () => Tn, RowDescriptionMessage: () => En, bindComplete: () => zt, closeComplete: () => Zt, copyDone: () => rn, emptyQuery: () => sn, noData: () => en, parseComplete: () => Xt, portalSuspended: () => tn, replicationStart: () => nn });
+_e(Qt, { AuthenticationCleartextPassword: () => on, AuthenticationMD5Password: () => cn, AuthenticationOk: () => an, AuthenticationSASL: () => ln, AuthenticationSASLContinue: () => un, AuthenticationSASLFinal: () => hn, BackendKeyDataMessage: () => gn, CommandCompleteMessage: () => wn, CopyDataMessage: () => fn, CopyResponse: () => dn, DataRowMessage: () => Nn, DatabaseError: () => Be, Field: () => pn, NoticeMessage: () => An, NotificationResponseMessage: () => _n, ParameterDescriptionMessage: () => mn, ParameterStatusMessage: () => yn, ReadyForQueryMessage: () => Tn, RowDescriptionMessage: () => En, bindComplete: () => zt, closeComplete: () => Zt, copyDone: () => rn, emptyQuery: () => sn, noData: () => en, parseComplete: () => Xt, portalSuspended: () => tn, replicationStart: () => nn });
 H();
 var Xt = { name: "parseComplete", length: 5 }, zt = { name: "bindComplete", length: 5 }, Zt = { name: "closeComplete", length: 5 }, en = { name: "noData", length: 5 }, tn = { name: "portalSuspended", length: 5 }, nn = { name: "replicationStart", length: 4 }, sn = { name: "emptyQuery", length: 4 }, rn = { name: "copyDone", length: 4 }, an = class {
   constructor(t) {
@@ -330,8 +346,8 @@ var Xt = { name: "parseComplete", length: 5 }, zt = { name: "bindComplete", leng
     this.length = e, this.name = t, this.binary = n, this.columnTypes = new Array(r);
   }
 }, pn = class {
-  constructor(e, t, n, r, s, a, i) {
-    this.name = e, this.tableID = t, this.columnID = n, this.dataTypeID = r, this.dataTypeSize = s, this.dataTypeModifier = a, this.format = i;
+  constructor(e, t, n, r, s, a, o) {
+    this.name = e, this.tableID = t, this.columnID = n, this.dataTypeID = r, this.dataTypeSize = s, this.dataTypeModifier = a, this.format = o;
   }
 }, En = class {
   constructor(t, n) {
@@ -365,17 +381,17 @@ var Xt = { name: "parseComplete", length: 5 }, zt = { name: "bindComplete", leng
   constructor(e, t) {
     this.length = e, this.fields = t, this.name = "dataRow", this.fieldCount = t.length;
   }
-}, $n = class {
+}, An = class {
   constructor(e, t) {
     this.length = e, this.message = t, this.name = "notice";
   }
 }, ar = {};
-ye(ar, { Parser: () => Cr, messages: () => Qt, serialize: () => re });
+_e(ar, { Parser: () => Lr, messages: () => Qt, serialize: () => oe });
 H();
 H();
 H();
 H();
-function ge(e) {
+function Te(e) {
   let t = e.length;
   for (let n = e.length - 1; n >= 0; n--) {
     let r = e.charCodeAt(n);
@@ -383,157 +399,157 @@ function ge(e) {
   }
   return t;
 }
-var U, M, te, Fe, ee, V, le, X, An, _e = class {
+var U, M, se, ke, ne, V, fe, z, $n, we = class {
   constructor(e = 256) {
-    this.size = e, j(this, V), j(this, U), j(this, M, 5), j(this, te, !1), j(this, Fe, new TextEncoder()), j(this, ee, 0), v(this, U, O(this, V, le).call(this, e));
+    this.size = e, j(this, V), j(this, U), j(this, M, 5), j(this, se, !1), j(this, ke, new TextEncoder()), j(this, ne, 0), D(this, U, O(this, V, fe).call(this, e));
   }
   addInt32(e) {
-    return O(this, V, X).call(this, 4), h(this, U).setInt32(h(this, M), e, h(this, te)), v(this, M, h(this, M) + 4), this;
+    return O(this, V, z).call(this, 4), d(this, U).setInt32(d(this, M), e, d(this, se)), D(this, M, d(this, M) + 4), this;
   }
   addInt16(e) {
-    return O(this, V, X).call(this, 2), h(this, U).setInt16(h(this, M), e, h(this, te)), v(this, M, h(this, M) + 2), this;
+    return O(this, V, z).call(this, 2), d(this, U).setInt16(d(this, M), e, d(this, se)), D(this, M, d(this, M) + 2), this;
   }
   addCString(e) {
-    return e && this.addString(e), O(this, V, X).call(this, 1), h(this, U).setUint8(h(this, M), 0), qt(this, M)._++, this;
+    return e && this.addString(e), O(this, V, z).call(this, 1), d(this, U).setUint8(d(this, M), 0), qt(this, M)._++, this;
   }
   addString(e = "") {
-    let t = ge(e);
-    return O(this, V, X).call(this, t), h(this, Fe).encodeInto(e, new Uint8Array(h(this, U).buffer, h(this, M))), v(this, M, h(this, M) + t), this;
+    let t = Te(e);
+    return O(this, V, z).call(this, t), d(this, ke).encodeInto(e, new Uint8Array(d(this, U).buffer, d(this, M))), D(this, M, d(this, M) + t), this;
   }
   add(e) {
-    return O(this, V, X).call(this, e.byteLength), new Uint8Array(h(this, U).buffer).set(new Uint8Array(e), h(this, M)), v(this, M, h(this, M) + e.byteLength), this;
+    return O(this, V, z).call(this, e.byteLength), new Uint8Array(d(this, U).buffer).set(new Uint8Array(e), d(this, M)), D(this, M, d(this, M) + e.byteLength), this;
   }
   flush(e) {
-    let t = O(this, V, An).call(this, e);
-    return v(this, M, 5), v(this, U, O(this, V, le).call(this, this.size)), new Uint8Array(t);
+    let t = O(this, V, $n).call(this, e);
+    return D(this, M, 5), D(this, U, O(this, V, fe).call(this, this.size)), new Uint8Array(t);
   }
 };
-U = /* @__PURE__ */ new WeakMap(), M = /* @__PURE__ */ new WeakMap(), te = /* @__PURE__ */ new WeakMap(), Fe = /* @__PURE__ */ new WeakMap(), ee = /* @__PURE__ */ new WeakMap(), V = /* @__PURE__ */ new WeakSet(), le = function(e) {
+U = /* @__PURE__ */ new WeakMap(), M = /* @__PURE__ */ new WeakMap(), se = /* @__PURE__ */ new WeakMap(), ke = /* @__PURE__ */ new WeakMap(), ne = /* @__PURE__ */ new WeakMap(), V = /* @__PURE__ */ new WeakSet(), fe = function(e) {
   return new DataView(new ArrayBuffer(e));
-}, X = function(e) {
-  if (h(this, U).byteLength - h(this, M) < e) {
-    let t = h(this, U).buffer, n = t.byteLength + (t.byteLength >> 1) + e;
-    v(this, U, O(this, V, le).call(this, n)), new Uint8Array(h(this, U).buffer).set(new Uint8Array(t));
+}, z = function(e) {
+  if (d(this, U).byteLength - d(this, M) < e) {
+    let t = d(this, U).buffer, n = t.byteLength + (t.byteLength >> 1) + e;
+    D(this, U, O(this, V, fe).call(this, n)), new Uint8Array(d(this, U).buffer).set(new Uint8Array(t));
   }
-}, An = function(e) {
+}, $n = function(e) {
   if (e) {
-    h(this, U).setUint8(h(this, ee), e);
-    let t = h(this, M) - (h(this, ee) + 1);
-    h(this, U).setInt32(h(this, ee) + 1, t, h(this, te));
+    d(this, U).setUint8(d(this, ne), e);
+    let t = d(this, M) - (d(this, ne) + 1);
+    d(this, U).setInt32(d(this, ne) + 1, t, d(this, se));
   }
-  return h(this, U).buffer.slice(e ? 0 : 5, h(this, M));
+  return d(this, U).buffer.slice(e ? 0 : 5, d(this, M));
 };
-var C = new _e(), ir = (e) => {
-  C.addInt16(3).addInt16(0);
-  for (let r of Object.keys(e)) C.addCString(r).addCString(e[r]);
-  C.addCString("client_encoding").addCString("UTF8");
-  let t = C.addCString("").flush(), n = t.byteLength + 4;
-  return new _e().addInt32(n).add(t).flush();
+var L = new we(), ir = (e) => {
+  L.addInt16(3).addInt16(0);
+  for (let r of Object.keys(e)) L.addCString(r).addCString(e[r]);
+  L.addCString("client_encoding").addCString("UTF8");
+  let t = L.addCString("").flush(), n = t.byteLength + 4;
+  return new we().addInt32(n).add(t).flush();
 }, or = () => {
   let e = new DataView(new ArrayBuffer(8));
   return e.setInt32(0, 8, !1), e.setInt32(4, 80877103, !1), new Uint8Array(e.buffer);
-}, cr = (e) => C.addCString(e).flush(112), lr = (e, t) => (C.addCString(e).addInt32(ge(t)).addString(t), C.flush(112)), ur = (e) => C.addString(e).flush(112), hr = (e) => C.addCString(e).flush(81), fr = [], dr = (e) => {
+}, cr = (e) => L.addCString(e).flush(112), lr = (e, t) => (L.addCString(e).addInt32(Te(t)).addString(t), L.flush(112)), ur = (e) => L.addString(e).flush(112), hr = (e) => L.addCString(e).flush(81), fr = [], dr = (e) => {
   let t = e.name ?? "";
   t.length > 63 && (console.error("Warning! Postgres only supports 63 characters for query names."), console.error("You supplied %s (%s)", t, t.length), console.error("This can cause conflicts and silent errors executing queries"));
-  let n = C.addCString(t).addCString(e.text).addInt16(e.types?.length ?? 0);
-  return e.types?.forEach((r) => n.addInt32(r)), C.flush(80);
-}, z = new _e(), pr = (e, t) => {
+  let n = L.addCString(t).addCString(e.text).addInt16(e.types?.length ?? 0);
+  return e.types?.forEach((r) => n.addInt32(r)), L.flush(80);
+}, Z = new we(), pr = (e, t) => {
   for (let n = 0; n < e.length; n++) {
     let r = t ? t(e[n], n) : e[n];
-    if (r === null) C.addInt16(0), z.addInt32(-1);
+    if (r === null) L.addInt16(0), Z.addInt32(-1);
     else if (r instanceof ArrayBuffer || ArrayBuffer.isView(r)) {
       let s = ArrayBuffer.isView(r) ? r.buffer.slice(r.byteOffset, r.byteOffset + r.byteLength) : r;
-      C.addInt16(1), z.addInt32(s.byteLength), z.add(s);
-    } else C.addInt16(0), z.addInt32(ge(r)), z.addString(r);
+      L.addInt16(1), Z.addInt32(s.byteLength), Z.add(s);
+    } else L.addInt16(0), Z.addInt32(Te(r)), Z.addString(r);
   }
 }, Er = (e = {}) => {
   let t = e.portal ?? "", n = e.statement ?? "", r = e.binary ?? !1, s = e.values ?? fr, a = s.length;
-  return C.addCString(t).addCString(n), C.addInt16(a), pr(s, e.valueMapper), C.addInt16(a), C.add(z.flush()), C.addInt16(r ? 1 : 0), C.flush(66);
+  return L.addCString(t).addCString(n), L.addInt16(a), pr(s, e.valueMapper), L.addInt16(a), L.add(Z.flush()), L.addInt16(r ? 1 : 0), L.flush(66);
 }, mr = new Uint8Array([69, 0, 0, 0, 9, 0, 0, 0, 0, 0]), yr = (e) => {
   if (!e || !e.portal && !e.rows) return mr;
-  let t = e.portal ?? "", n = e.rows ?? 0, r = ge(t), s = 4 + r + 1 + 4, a = new DataView(new ArrayBuffer(1 + s));
+  let t = e.portal ?? "", n = e.rows ?? 0, r = Te(t), s = 4 + r + 1 + 4, a = new DataView(new ArrayBuffer(1 + s));
   return a.setUint8(0, 69), a.setInt32(1, s, !1), new TextEncoder().encodeInto(t, new Uint8Array(a.buffer, 5)), a.setUint8(r + 5, 0), a.setUint32(a.byteLength - 4, n, !1), new Uint8Array(a.buffer);
 }, gr = (e, t) => {
   let n = new DataView(new ArrayBuffer(16));
   return n.setInt32(0, 16, !1), n.setInt16(4, 1234, !1), n.setInt16(6, 5678, !1), n.setInt32(8, e, !1), n.setInt32(12, t, !1), new Uint8Array(n.buffer);
-}, Xe = (e, t) => {
-  let n = new _e();
+}, ze = (e, t) => {
+  let n = new we();
   return n.addCString(t), n.flush(e);
-}, _r = C.addCString("P").flush(68), Tr = C.addCString("S").flush(68), wr = (e) => e.name ? Xe(68, `${e.type}${e.name ?? ""}`) : e.type === "P" ? _r : Tr, Nr = (e) => {
+}, _r = L.addCString("P").flush(68), Tr = L.addCString("S").flush(68), wr = (e) => e.name ? ze(68, `${e.type}${e.name ?? ""}`) : e.type === "P" ? _r : Tr, Nr = (e) => {
   let t = `${e.type}${e.name ?? ""}`;
-  return Xe(67, t);
-}, $r = (e) => C.add(e).flush(100), Ar = (e) => Xe(102, e), Te = (e) => new Uint8Array([e, 0, 0, 0, 4]), Rr = Te(72), br = Te(83), Sr = Te(88), Ir = Te(99), re = { startup: ir, password: cr, requestSsl: or, sendSASLInitialResponseMessage: lr, sendSCRAMClientFinalMessage: ur, query: hr, parse: dr, bind: Er, execute: yr, describe: wr, close: Nr, flush: () => Rr, sync: () => br, end: () => Sr, copyData: $r, copyDone: () => Ir, copyFail: Ar, cancel: gr };
+  return ze(67, t);
+}, Ar = (e) => L.add(e).flush(100), $r = (e) => ze(102, e), Ne = (e) => new Uint8Array([e, 0, 0, 0, 4]), br = Ne(72), Rr = Ne(83), Sr = Ne(88), Ir = Ne(99), oe = { startup: ir, password: cr, requestSsl: or, sendSASLInitialResponseMessage: lr, sendSCRAMClientFinalMessage: ur, query: hr, parse: dr, bind: Er, execute: yr, describe: wr, close: Nr, flush: () => br, sync: () => Rr, end: () => Sr, copyData: Ar, copyDone: () => Ir, copyFail: $r, cancel: gr };
 H();
 H();
-var rt = { text: 0, binary: 1 };
+var at = { text: 0, binary: 1 };
 H();
-var Or = new ArrayBuffer(0), Y, q, ke, We, ae, vr = class {
+var Or = new ArrayBuffer(0), Y, q, We, Ge, ce, Dr = class {
   constructor(e = 0) {
-    j(this, Y, new DataView(Or)), j(this, q), j(this, ke, "utf-8"), j(this, We, new TextDecoder(h(this, ke))), j(this, ae, !1), v(this, q, e);
+    j(this, Y, new DataView(Or)), j(this, q), j(this, We, "utf-8"), j(this, Ge, new TextDecoder(d(this, We))), j(this, ce, !1), D(this, q, e);
   }
   setBuffer(e, t) {
-    v(this, q, e), v(this, Y, new DataView(t));
+    D(this, q, e), D(this, Y, new DataView(t));
   }
   int16() {
-    let e = h(this, Y).getInt16(h(this, q), h(this, ae));
-    return v(this, q, h(this, q) + 2), e;
+    let e = d(this, Y).getInt16(d(this, q), d(this, ce));
+    return D(this, q, d(this, q) + 2), e;
   }
   byte() {
-    let e = h(this, Y).getUint8(h(this, q));
+    let e = d(this, Y).getUint8(d(this, q));
     return qt(this, q)._++, e;
   }
   int32() {
-    let e = h(this, Y).getInt32(h(this, q), h(this, ae));
-    return v(this, q, h(this, q) + 4), e;
+    let e = d(this, Y).getInt32(d(this, q), d(this, ce));
+    return D(this, q, d(this, q) + 4), e;
   }
   string(e) {
-    return h(this, We).decode(this.bytes(e));
+    return d(this, Ge).decode(this.bytes(e));
   }
   cstring() {
-    let e = h(this, q), t = e;
-    for (; h(this, Y).getUint8(t++) !== 0; ) ;
+    let e = d(this, q), t = e;
+    for (; d(this, Y).getUint8(t++) !== 0; ) ;
     let n = this.string(t - e - 1);
-    return v(this, q, t), n;
+    return D(this, q, t), n;
   }
   bytes(e) {
-    let t = h(this, Y).buffer.slice(h(this, q), h(this, q) + e);
-    return v(this, q, h(this, q) + e), new Uint8Array(t);
+    let t = d(this, Y).buffer.slice(d(this, q), d(this, q) + e);
+    return D(this, q, d(this, q) + e), new Uint8Array(t);
   }
 };
-Y = /* @__PURE__ */ new WeakMap(), q = /* @__PURE__ */ new WeakMap(), ke = /* @__PURE__ */ new WeakMap(), We = /* @__PURE__ */ new WeakMap(), ae = /* @__PURE__ */ new WeakMap();
-var Ge = 1, Dr = 4, at = Ge + Dr, it = new ArrayBuffer(0), B, W, G, w, L, Rn, bn, ot, ct, lt, ut, ht, ve, ft, dt, pt, Et, mt, yt, gt, _t, De, Cr = class {
+Y = /* @__PURE__ */ new WeakMap(), q = /* @__PURE__ */ new WeakMap(), We = /* @__PURE__ */ new WeakMap(), Ge = /* @__PURE__ */ new WeakMap(), ce = /* @__PURE__ */ new WeakMap();
+var He = 1, Cr = 4, it = He + Cr, ot = new ArrayBuffer(0), F, W, G, w, v, bn, Rn, ct, lt, ut, ht, ft, Le, dt, pt, Et, mt, yt, gt, _t, Tt, ve, Lr = class {
   constructor() {
-    j(this, L), j(this, B, new DataView(it)), j(this, W, 0), j(this, G, 0), j(this, w, new vr());
+    j(this, v), j(this, F, new DataView(ot)), j(this, W, 0), j(this, G, 0), j(this, w, new Dr());
   }
   parse(e, t) {
-    O(this, L, Rn).call(this, ArrayBuffer.isView(e) ? e.buffer.slice(e.byteOffset, e.byteOffset + e.byteLength) : e);
-    let n = h(this, G) + h(this, W), r = h(this, G);
-    for (; r + at <= n; ) {
-      let s = h(this, B).getUint8(r), a = h(this, B).getUint32(r + Ge, !1), i = Ge + a;
-      if (i + r <= n && a > 0) {
-        let o = O(this, L, bn).call(this, r + at, s, a, h(this, B).buffer);
-        t(o), r += i;
+    O(this, v, bn).call(this, ArrayBuffer.isView(e) ? e.buffer.slice(e.byteOffset, e.byteOffset + e.byteLength) : e);
+    let n = d(this, G) + d(this, W), r = d(this, G);
+    for (; r + it <= n; ) {
+      let s = d(this, F).getUint8(r), a = d(this, F).getUint32(r + He, !1), o = He + a;
+      if (o + r <= n && a > 0) {
+        let i = O(this, v, Rn).call(this, r + it, s, a, d(this, F).buffer);
+        t(i), r += o;
       } else break;
     }
-    r === n ? (v(this, B, new DataView(it)), v(this, W, 0), v(this, G, 0)) : (v(this, W, n - r), v(this, G, r));
+    r === n ? (D(this, F, new DataView(ot)), D(this, W, 0), D(this, G, 0)) : (D(this, W, n - r), D(this, G, r));
   }
 };
-B = /* @__PURE__ */ new WeakMap(), W = /* @__PURE__ */ new WeakMap(), G = /* @__PURE__ */ new WeakMap(), w = /* @__PURE__ */ new WeakMap(), L = /* @__PURE__ */ new WeakSet(), Rn = function(e) {
-  if (h(this, W) > 0) {
-    let t = h(this, W) + e.byteLength;
-    if (t + h(this, G) > h(this, B).byteLength) {
+F = /* @__PURE__ */ new WeakMap(), W = /* @__PURE__ */ new WeakMap(), G = /* @__PURE__ */ new WeakMap(), w = /* @__PURE__ */ new WeakMap(), v = /* @__PURE__ */ new WeakSet(), bn = function(e) {
+  if (d(this, W) > 0) {
+    let t = d(this, W) + e.byteLength;
+    if (t + d(this, G) > d(this, F).byteLength) {
       let n;
-      if (t <= h(this, B).byteLength && h(this, G) >= h(this, W)) n = h(this, B).buffer;
+      if (t <= d(this, F).byteLength && d(this, G) >= d(this, W)) n = d(this, F).buffer;
       else {
-        let r = h(this, B).byteLength * 2;
+        let r = d(this, F).byteLength * 2;
         for (; t >= r; ) r *= 2;
         n = new ArrayBuffer(r);
       }
-      new Uint8Array(n).set(new Uint8Array(h(this, B).buffer, h(this, G), h(this, W))), v(this, B, new DataView(n)), v(this, G, 0);
+      new Uint8Array(n).set(new Uint8Array(d(this, F).buffer, d(this, G), d(this, W))), D(this, F, new DataView(n)), D(this, G, 0);
     }
-    new Uint8Array(h(this, B).buffer).set(new Uint8Array(e), h(this, G) + h(this, W)), v(this, W, t);
-  } else v(this, B, new DataView(e)), v(this, G, 0), v(this, W, e.byteLength);
-}, bn = function(e, t, n, r) {
+    new Uint8Array(d(this, F).buffer).set(new Uint8Array(e), d(this, G) + d(this, W)), D(this, W, t);
+  } else D(this, F, new DataView(e)), D(this, G, 0), D(this, W, e.byteLength);
+}, Rn = function(e, t, n, r) {
   switch (t) {
     case 50:
       return zt;
@@ -552,124 +568,124 @@ B = /* @__PURE__ */ new WeakMap(), W = /* @__PURE__ */ new WeakMap(), G = /* @__
     case 73:
       return sn;
     case 68:
-      return O(this, L, mt).call(this, e, n, r);
+      return O(this, v, yt).call(this, e, n, r);
     case 67:
-      return O(this, L, ct).call(this, e, n, r);
+      return O(this, v, lt).call(this, e, n, r);
     case 90:
-      return O(this, L, ot).call(this, e, n, r);
+      return O(this, v, ct).call(this, e, n, r);
     case 65:
-      return O(this, L, ft).call(this, e, n, r);
+      return O(this, v, dt).call(this, e, n, r);
     case 82:
-      return O(this, L, _t).call(this, e, n, r);
+      return O(this, v, Tt).call(this, e, n, r);
     case 83:
-      return O(this, L, yt).call(this, e, n, r);
+      return O(this, v, gt).call(this, e, n, r);
     case 75:
-      return O(this, L, gt).call(this, e, n, r);
+      return O(this, v, _t).call(this, e, n, r);
     case 69:
-      return O(this, L, De).call(this, e, n, r, "error");
+      return O(this, v, ve).call(this, e, n, r, "error");
     case 78:
-      return O(this, L, De).call(this, e, n, r, "notice");
+      return O(this, v, ve).call(this, e, n, r, "notice");
     case 84:
-      return O(this, L, dt).call(this, e, n, r);
+      return O(this, v, pt).call(this, e, n, r);
     case 116:
-      return O(this, L, Et).call(this, e, n, r);
+      return O(this, v, mt).call(this, e, n, r);
     case 71:
-      return O(this, L, ut).call(this, e, n, r);
+      return O(this, v, ht).call(this, e, n, r);
     case 72:
-      return O(this, L, ht).call(this, e, n, r);
+      return O(this, v, ft).call(this, e, n, r);
     case 100:
-      return O(this, L, lt).call(this, e, n, r);
+      return O(this, v, ut).call(this, e, n, r);
     default:
       return new Be("received invalid response: " + t.toString(16), n, "error");
   }
-}, ot = function(e, t, n) {
-  h(this, w).setBuffer(e, n);
-  let r = h(this, w).string(1);
-  return new Tn(t, r);
 }, ct = function(e, t, n) {
-  h(this, w).setBuffer(e, n);
-  let r = h(this, w).cstring();
-  return new wn(t, r);
+  d(this, w).setBuffer(e, n);
+  let r = d(this, w).string(1);
+  return new Tn(t, r);
 }, lt = function(e, t, n) {
+  d(this, w).setBuffer(e, n);
+  let r = d(this, w).cstring();
+  return new wn(t, r);
+}, ut = function(e, t, n) {
   let r = n.slice(e, e + (t - 4));
   return new fn(t, new Uint8Array(r));
-}, ut = function(e, t, n) {
-  return O(this, L, ve).call(this, e, t, n, "copyInResponse");
 }, ht = function(e, t, n) {
-  return O(this, L, ve).call(this, e, t, n, "copyOutResponse");
-}, ve = function(e, t, n, r) {
-  h(this, w).setBuffer(e, n);
-  let s = h(this, w).byte() !== 0, a = h(this, w).int16(), i = new dn(t, r, s, a);
-  for (let o = 0; o < a; o++) i.columnTypes[o] = h(this, w).int16();
-  return i;
+  return O(this, v, Le).call(this, e, t, n, "copyInResponse");
 }, ft = function(e, t, n) {
-  h(this, w).setBuffer(e, n);
-  let r = h(this, w).int32(), s = h(this, w).cstring(), a = h(this, w).cstring();
-  return new _n(t, r, s, a);
+  return O(this, v, Le).call(this, e, t, n, "copyOutResponse");
+}, Le = function(e, t, n, r) {
+  d(this, w).setBuffer(e, n);
+  let s = d(this, w).byte() !== 0, a = d(this, w).int16(), o = new dn(t, r, s, a);
+  for (let i = 0; i < a; i++) o.columnTypes[i] = d(this, w).int16();
+  return o;
 }, dt = function(e, t, n) {
-  h(this, w).setBuffer(e, n);
-  let r = h(this, w).int16(), s = new En(t, r);
-  for (let a = 0; a < r; a++) s.fields[a] = O(this, L, pt).call(this);
-  return s;
-}, pt = function() {
-  let e = h(this, w).cstring(), t = h(this, w).int32(), n = h(this, w).int16(), r = h(this, w).int32(), s = h(this, w).int16(), a = h(this, w).int32(), i = h(this, w).int16() === 0 ? rt.text : rt.binary;
-  return new pn(e, t, n, r, s, a, i);
-}, Et = function(e, t, n) {
-  h(this, w).setBuffer(e, n);
-  let r = h(this, w).int16(), s = new mn(t, r);
-  for (let a = 0; a < r; a++) s.dataTypeIDs[a] = h(this, w).int32();
+  d(this, w).setBuffer(e, n);
+  let r = d(this, w).int32(), s = d(this, w).cstring(), a = d(this, w).cstring();
+  return new _n(t, r, s, a);
+}, pt = function(e, t, n) {
+  d(this, w).setBuffer(e, n);
+  let r = d(this, w).int16(), s = new En(t, r);
+  for (let a = 0; a < r; a++) s.fields[a] = O(this, v, Et).call(this);
   return s;
+}, Et = function() {
+  let e = d(this, w).cstring(), t = d(this, w).int32(), n = d(this, w).int16(), r = d(this, w).int32(), s = d(this, w).int16(), a = d(this, w).int32(), o = d(this, w).int16() === 0 ? at.text : at.binary;
+  return new pn(e, t, n, r, s, a, o);
 }, mt = function(e, t, n) {
-  h(this, w).setBuffer(e, n);
-  let r = h(this, w).int16(), s = new Array(r);
+  d(this, w).setBuffer(e, n);
+  let r = d(this, w).int16(), s = new mn(t, r);
+  for (let a = 0; a < r; a++) s.dataTypeIDs[a] = d(this, w).int32();
+  return s;
+}, yt = function(e, t, n) {
+  d(this, w).setBuffer(e, n);
+  let r = d(this, w).int16(), s = new Array(r);
   for (let a = 0; a < r; a++) {
-    let i = h(this, w).int32();
-    s[a] = i === -1 ? null : h(this, w).string(i);
+    let o = d(this, w).int32();
+    s[a] = o === -1 ? null : d(this, w).string(o);
   }
   return new Nn(t, s);
-}, yt = function(e, t, n) {
-  h(this, w).setBuffer(e, n);
-  let r = h(this, w).cstring(), s = h(this, w).cstring();
-  return new yn(t, r, s);
 }, gt = function(e, t, n) {
-  h(this, w).setBuffer(e, n);
-  let r = h(this, w).int32(), s = h(this, w).int32();
-  return new gn(t, r, s);
+  d(this, w).setBuffer(e, n);
+  let r = d(this, w).cstring(), s = d(this, w).cstring();
+  return new yn(t, r, s);
 }, _t = function(e, t, n) {
-  h(this, w).setBuffer(e, n);
-  let r = h(this, w).int32();
+  d(this, w).setBuffer(e, n);
+  let r = d(this, w).int32(), s = d(this, w).int32();
+  return new gn(t, r, s);
+}, Tt = function(e, t, n) {
+  d(this, w).setBuffer(e, n);
+  let r = d(this, w).int32();
   switch (r) {
     case 0:
       return new an(t);
     case 3:
       return new on(t);
     case 5:
-      return new cn(t, h(this, w).bytes(4));
+      return new cn(t, d(this, w).bytes(4));
     case 10: {
       let s = [];
       for (; ; ) {
-        let a = h(this, w).cstring();
+        let a = d(this, w).cstring();
         if (a.length === 0) return new ln(t, s);
         s.push(a);
       }
     }
     case 11:
-      return new un(t, h(this, w).string(t - 8));
+      return new un(t, d(this, w).string(t - 8));
     case 12:
-      return new hn(t, h(this, w).string(t - 8));
+      return new hn(t, d(this, w).string(t - 8));
     default:
       throw new Error("Unknown authenticationOk message type " + r);
   }
-}, De = function(e, t, n, r) {
-  h(this, w).setBuffer(e, n);
-  let s = {}, a = h(this, w).string(1);
-  for (; a !== "\0"; ) s[a] = h(this, w).cstring(), a = h(this, w).string(1);
-  let i = s.M, o = r === "notice" ? new $n(t, i) : new Be(i, t, r);
-  return o.severity = s.S, o.code = s.C, o.detail = s.D, o.hint = s.H, o.position = s.P, o.internalPosition = s.p, o.internalQuery = s.q, o.where = s.W, o.schema = s.s, o.table = s.t, o.column = s.c, o.dataType = s.d, o.constraint = s.n, o.file = s.F, o.line = s.L, o.routine = s.R, o;
+}, ve = function(e, t, n, r) {
+  d(this, w).setBuffer(e, n);
+  let s = {}, a = d(this, w).string(1);
+  for (; a !== "\0"; ) s[a] = d(this, w).cstring(), a = d(this, w).string(1);
+  let o = s.M, i = r === "notice" ? new An(t, o) : new Be(o, t, r);
+  return i.severity = s.S, i.code = s.C, i.detail = s.D, i.hint = s.H, i.position = s.P, i.internalPosition = s.p, i.internalQuery = s.q, i.where = s.W, i.schema = s.s, i.table = s.t, i.column = s.c, i.dataType = s.d, i.constraint = s.n, i.file = s.F, i.line = s.L, i.routine = s.R, i;
 };
 H();
 typeof process == "object" && typeof process.versions == "object" && process.versions.node;
-var Tt = () => {
+var wt = () => {
   if (globalThis.crypto?.randomUUID) return globalThis.crypto.randomUUID();
   let e = new Uint8Array(16);
   if (globalThis.crypto?.getRandomValues) globalThis.crypto.getRandomValues(e);
@@ -680,262 +696,262 @@ var Tt = () => {
     t.push(n.toString(16).padStart(2, "0"));
   }), t.slice(0, 4).join("") + "-" + t.slice(4, 6).join("") + "-" + t.slice(6, 8).join("") + "-" + t.slice(8, 10).join("") + "-" + t.slice(10).join("");
 };
-async function wt(e, t, n, r) {
+async function Nt(e, t, n, r) {
   if (!n || n.length === 0) return t;
   r = r ?? e;
   let s = [];
   try {
-    await e.execProtocol(re.parse({ text: t }), { syncToFs: !1 }), s.push(...(await e.execProtocol(re.describe({ type: "S" }), { syncToFs: !1 })).messages);
+    await e.execProtocol(oe.parse({ text: t }), { syncToFs: !1 }), s.push(...(await e.execProtocol(oe.describe({ type: "S" }), { syncToFs: !1 })).messages);
   } finally {
-    s.push(...(await e.execProtocol(re.sync(), { syncToFs: !1 })).messages);
+    s.push(...(await e.execProtocol(oe.sync(), { syncToFs: !1 })).messages);
   }
-  let a = Yt(s), i = t.replace(/\$([0-9]+)/g, (o, c) => "%" + c + "L");
-  return (await r.query(`SELECT format($1, ${n.map((o, c) => `$${c + 2}`).join(", ")}) as query`, [i, ...n], { paramTypes: [ce, ...a] })).rows[0].query;
+  let a = Yt(s), o = t.replace(/\$([0-9]+)/g, (i, c) => "%" + c + "L");
+  return (await r.query(`SELECT format($1, ${n.map((i, c) => `$${c + 2}`).join(", ")}) as query`, [o, ...n], { paramTypes: [he, ...a] })).rows[0].query;
 }
-function Nt(e) {
+function At(e) {
   let t, n = !1, r = async () => {
     if (!t) {
       n = !1;
       return;
     }
     n = !0;
-    let { args: s, resolve: a, reject: i } = t;
+    let { args: s, resolve: a, reject: o } = t;
     t = void 0;
     try {
-      let o = await e(...s);
-      a(o);
-    } catch (o) {
-      i(o);
+      let i = await e(...s);
+      a(i);
+    } catch (i) {
+      o(i);
     } finally {
       r();
     }
   };
   return async (...s) => {
     t && t.resolve(void 0);
-    let a = new Promise((i, o) => {
-      t = { args: s, resolve: i, reject: o };
+    let a = new Promise((o, i) => {
+      t = { args: s, resolve: o, reject: i };
     });
     return n || r(), a;
   };
 }
 H();
-var Lr = 5, Mr = async (e, t) => {
-  let n = /* @__PURE__ */ new Set(), r = { async query(s, a, i) {
-    let o, c, u;
-    if (typeof s != "string" && (o = s.signal, a = s.params, i = s.callback, c = s.offset, u = s.limit, s = s.query), c === void 0 != (u === void 0)) throw new Error("offset and limit must be provided together");
-    let l = c !== void 0 && u !== void 0, d;
-    if (l && (typeof c != "number" || isNaN(c) || typeof u != "number" || isNaN(u))) throw new Error("offset and limit must be numbers");
-    let f = i ? [i] : [], p = Tt().replace(/-/g, ""), _ = !1, S, $, A = async () => {
+var vr = 5, Mr = async (e, t) => {
+  let n = /* @__PURE__ */ new Set(), r = { async query(s, a, o) {
+    let i, c, l;
+    if (typeof s != "string" && (i = s.signal, a = s.params, o = s.callback, c = s.offset, l = s.limit, s = s.query), c === void 0 != (l === void 0)) throw new Error("offset and limit must be provided together");
+    let u = c !== void 0 && l !== void 0, h;
+    if (u && (typeof c != "number" || isNaN(c) || typeof l != "number" || isNaN(l))) throw new Error("offset and limit must be numbers");
+    let p = o ? [o] : [], f = wt().replace(/-/g, ""), E = !1, $, A, b = async () => {
       await e.transaction(async (g) => {
-        let R = a && a.length > 0 ? await wt(e, s, a, g) : s;
-        await g.exec(`CREATE OR REPLACE TEMP VIEW live_query_${p}_view AS ${R}`);
-        let I = await $t(g, `live_query_${p}_view`);
-        await At(g, I, n), l ? (await g.exec(`
-              PREPARE live_query_${p}_get(int, int) AS
-              SELECT * FROM live_query_${p}_view
+        let S = a && a.length > 0 ? await Nt(e, s, a, g) : s;
+        await g.exec(`CREATE OR REPLACE TEMP VIEW live_query_${f}_view AS ${S}`);
+        let I = await $t(g, `live_query_${f}_view`);
+        await bt(g, I, n), u ? (await g.exec(`
+              PREPARE live_query_${f}_get(int, int) AS
+              SELECT * FROM live_query_${f}_view
               LIMIT $1 OFFSET $2;
             `), await g.exec(`
-              PREPARE live_query_${p}_get_total_count AS
-              SELECT COUNT(*) FROM live_query_${p}_view;
-            `), d = (await g.query(`EXECUTE live_query_${p}_get_total_count;`)).rows[0].count, S = { ...await g.query(`EXECUTE live_query_${p}_get(${u}, ${c});`), offset: c, limit: u, totalCount: d }) : (await g.exec(`
-              PREPARE live_query_${p}_get AS
-              SELECT * FROM live_query_${p}_view;
-            `), S = await g.query(`EXECUTE live_query_${p}_get;`)), $ = await Promise.all(I.map((y) => g.listen(`"table_change__${y.schema_oid}__${y.table_oid}"`, async () => {
-          b();
+              PREPARE live_query_${f}_get_total_count AS
+              SELECT COUNT(*) FROM live_query_${f}_view;
+            `), h = (await g.query(`EXECUTE live_query_${f}_get_total_count;`)).rows[0].count, $ = { ...await g.query(`EXECUTE live_query_${f}_get(${l}, ${c});`), offset: c, limit: l, totalCount: h }) : (await g.exec(`
+              PREPARE live_query_${f}_get AS
+              SELECT * FROM live_query_${f}_view;
+            `), $ = await g.query(`EXECUTE live_query_${f}_get;`)), A = await Promise.all(I.map((T) => g.listen(`"table_change__${T.schema_oid}__${T.table_oid}"`, async () => {
+          R();
         })));
       });
     };
-    await A();
-    let b = Nt(async ({ offset: g, limit: R } = {}) => {
-      if (!l && (g !== void 0 || R !== void 0)) throw new Error("offset and limit cannot be provided for non-windowed queries");
-      if (g && (typeof g != "number" || isNaN(g)) || R && (typeof R != "number" || isNaN(R))) throw new Error("offset and limit must be numbers");
-      c = g ?? c, u = R ?? u;
-      let I = async (y = 0) => {
-        if (f.length !== 0) {
+    await b();
+    let R = At(async ({ offset: g, limit: S } = {}) => {
+      if (!u && (g !== void 0 || S !== void 0)) throw new Error("offset and limit cannot be provided for non-windowed queries");
+      if (g && (typeof g != "number" || isNaN(g)) || S && (typeof S != "number" || isNaN(S))) throw new Error("offset and limit must be numbers");
+      c = g ?? c, l = S ?? l;
+      let I = async (T = 0) => {
+        if (p.length !== 0) {
           try {
-            l ? S = { ...await e.query(`EXECUTE live_query_${p}_get(${u}, ${c});`), offset: c, limit: u, totalCount: d } : S = await e.query(`EXECUTE live_query_${p}_get;`);
-          } catch (T) {
-            let k = T.message;
-            if (k.startsWith(`prepared statement "live_query_${p}`) && k.endsWith("does not exist")) {
-              if (y > Lr) throw T;
-              await A(), I(y + 1);
-            } else throw T;
+            u ? $ = { ...await e.query(`EXECUTE live_query_${f}_get(${l}, ${c});`), offset: c, limit: l, totalCount: h } : $ = await e.query(`EXECUTE live_query_${f}_get;`);
+          } catch (N) {
+            let k = N.message;
+            if (k.startsWith(`prepared statement "live_query_${f}`) && k.endsWith("does not exist")) {
+              if (T > vr) throw N;
+              await b(), I(T + 1);
+            } else throw N;
           }
-          if (se(f, S), l) {
-            let T = (await e.query(`EXECUTE live_query_${p}_get_total_count;`)).rows[0].count;
-            T !== d && (d = T, b());
+          if (ie(p, $), u) {
+            let N = (await e.query(`EXECUTE live_query_${f}_get_total_count;`)).rows[0].count;
+            N !== h && (h = N, R());
           }
         }
       };
       await I();
-    }), E = (g) => {
-      if (_) throw new Error("Live query is no longer active and cannot be subscribed to");
-      f.push(g);
-    }, m = async (g) => {
-      g ? f = f.filter((R) => R !== R) : f = [], f.length === 0 && !_ && (_ = !0, await e.transaction(async (R) => {
-        await Promise.all($.map((I) => I(R))), await R.exec(`
-              DROP VIEW IF EXISTS live_query_${p}_view;
-              DEALLOCATE live_query_${p}_get;
+    }), m = (g) => {
+      if (E) throw new Error("Live query is no longer active and cannot be subscribed to");
+      p.push(g);
+    }, y = async (g) => {
+      g ? p = p.filter((S) => S !== S) : p = [], p.length === 0 && !E && (E = !0, await e.transaction(async (S) => {
+        await Promise.all(A.map((I) => I(S))), await S.exec(`
+              DROP VIEW IF EXISTS live_query_${f}_view;
+              DEALLOCATE live_query_${f}_get;
             `);
       }));
     };
-    return o?.aborted ? await m() : o?.addEventListener("abort", () => {
-      m();
-    }, { once: !0 }), se(f, S), { initialResults: S, subscribe: E, unsubscribe: m, refresh: b };
-  }, async changes(s, a, i, o) {
+    return i?.aborted ? await y() : i?.addEventListener("abort", () => {
+      y();
+    }, { once: !0 }), ie(p, $), { initialResults: $, subscribe: m, unsubscribe: y, refresh: R };
+  }, async changes(s, a, o, i) {
     let c;
-    if (typeof s != "string" && (c = s.signal, a = s.params, i = s.key, o = s.callback, s = s.query), !i) throw new Error("key is required for changes queries");
-    let u = o ? [o] : [], l = Tt().replace(/-/g, ""), d = !1, f = 1, p, _, S = async () => {
-      await e.transaction(async (E) => {
-        let m = await wt(e, s, a, E);
-        await E.query(`CREATE OR REPLACE TEMP VIEW live_query_${l}_view AS ${m}`);
-        let g = await $t(E, `live_query_${l}_view`);
-        await At(E, g, n);
-        let R = [...(await E.query(`
+    if (typeof s != "string" && (c = s.signal, a = s.params, o = s.key, i = s.callback, s = s.query), !o) throw new Error("key is required for changes queries");
+    let l = i ? [i] : [], u = wt().replace(/-/g, ""), h = !1, p = 1, f, E, $ = async () => {
+      await e.transaction(async (m) => {
+        let y = await Nt(e, s, a, m);
+        await m.query(`CREATE OR REPLACE TEMP VIEW live_query_${u}_view AS ${y}`);
+        let g = await $t(m, `live_query_${u}_view`);
+        await bt(m, g, n);
+        let S = [...(await m.query(`
                 SELECT column_name, data_type, udt_name
                 FROM information_schema.columns 
-                WHERE table_name = 'live_query_${l}_view'
+                WHERE table_name = 'live_query_${u}_view'
               `)).rows, { column_name: "__after__", data_type: "integer" }];
-        await E.exec(`
-            CREATE TEMP TABLE live_query_${l}_state1 (LIKE live_query_${l}_view INCLUDING ALL);
-            CREATE TEMP TABLE live_query_${l}_state2 (LIKE live_query_${l}_view INCLUDING ALL);
+        await m.exec(`
+            CREATE TEMP TABLE live_query_${u}_state1 (LIKE live_query_${u}_view INCLUDING ALL);
+            CREATE TEMP TABLE live_query_${u}_state2 (LIKE live_query_${u}_view INCLUDING ALL);
           `);
         for (let I of [1, 2]) {
-          let y = I === 1 ? 2 : 1;
-          await E.exec(`
-              PREPARE live_query_${l}_diff${I} AS
+          let T = I === 1 ? 2 : 1;
+          await m.exec(`
+              PREPARE live_query_${u}_diff${I} AS
               WITH
-                prev AS (SELECT LAG("${i}") OVER () as __after__, * FROM live_query_${l}_state${y}),
-                curr AS (SELECT LAG("${i}") OVER () as __after__, * FROM live_query_${l}_state${I}),
+                prev AS (SELECT LAG("${o}") OVER () as __after__, * FROM live_query_${u}_state${T}),
+                curr AS (SELECT LAG("${o}") OVER () as __after__, * FROM live_query_${u}_state${I}),
                 data_diff AS (
                   -- INSERT operations: Include all columns
                   SELECT 
                     'INSERT' AS __op__,
-                    ${R.map(({ column_name: T }) => `curr."${T}" AS "${T}"`).join(`,
+                    ${S.map(({ column_name: N }) => `curr."${N}" AS "${N}"`).join(`,
 `)},
                     ARRAY[]::text[] AS __changed_columns__
                   FROM curr
-                  LEFT JOIN prev ON curr.${i} = prev.${i}
-                  WHERE prev.${i} IS NULL
+                  LEFT JOIN prev ON curr.${o} = prev.${o}
+                  WHERE prev.${o} IS NULL
                 UNION ALL
                   -- DELETE operations: Include only the primary key
                   SELECT 
                     'DELETE' AS __op__,
-                    ${R.map(({ column_name: T, data_type: k, udt_name: Q }) => T === i ? `prev."${T}" AS "${T}"` : `NULL${k === "USER-DEFINED" ? `::${Q}` : ""} AS "${T}"`).join(`,
+                    ${S.map(({ column_name: N, data_type: k, udt_name: Q }) => N === o ? `prev."${N}" AS "${N}"` : `NULL${k === "USER-DEFINED" ? `::${Q}` : ""} AS "${N}"`).join(`,
 `)},
                       ARRAY[]::text[] AS __changed_columns__
                   FROM prev
-                  LEFT JOIN curr ON prev.${i} = curr.${i}
-                  WHERE curr.${i} IS NULL
+                  LEFT JOIN curr ON prev.${o} = curr.${o}
+                  WHERE curr.${o} IS NULL
                 UNION ALL
                   -- UPDATE operations: Include only changed columns
                   SELECT 
                     'UPDATE' AS __op__,
-                    ${R.map(({ column_name: T, data_type: k, udt_name: Q }) => T === i ? `curr."${T}" AS "${T}"` : `CASE 
-                              WHEN curr."${T}" IS DISTINCT FROM prev."${T}" 
-                              THEN curr."${T}"
+                    ${S.map(({ column_name: N, data_type: k, udt_name: Q }) => N === o ? `curr."${N}" AS "${N}"` : `CASE 
+                              WHEN curr."${N}" IS DISTINCT FROM prev."${N}" 
+                              THEN curr."${N}"
                               ELSE NULL${k === "USER-DEFINED" ? `::${Q}` : ""}
-                              END AS "${T}"`).join(`,
+                              END AS "${N}"`).join(`,
 `)},
-                      ARRAY(SELECT unnest FROM unnest(ARRAY[${R.filter(({ column_name: T }) => T !== i).map(({ column_name: T }) => `CASE
-                              WHEN curr."${T}" IS DISTINCT FROM prev."${T}" 
-                              THEN '${T}' 
+                      ARRAY(SELECT unnest FROM unnest(ARRAY[${S.filter(({ column_name: N }) => N !== o).map(({ column_name: N }) => `CASE
+                              WHEN curr."${N}" IS DISTINCT FROM prev."${N}" 
+                              THEN '${N}' 
                               ELSE NULL 
                               END`).join(", ")}]) WHERE unnest IS NOT NULL) AS __changed_columns__
                   FROM curr
-                  INNER JOIN prev ON curr.${i} = prev.${i}
+                  INNER JOIN prev ON curr.${o} = prev.${o}
                   WHERE NOT (curr IS NOT DISTINCT FROM prev)
                 )
               SELECT * FROM data_diff;
             `);
         }
-        _ = await Promise.all(g.map((I) => E.listen(`"table_change__${I.schema_oid}__${I.table_oid}"`, async () => {
-          $();
+        E = await Promise.all(g.map((I) => m.listen(`"table_change__${I.schema_oid}__${I.table_oid}"`, async () => {
+          A();
         })));
       });
     };
-    await S();
-    let $ = Nt(async () => {
-      if (u.length === 0 && p) return;
-      let E = !1;
-      for (let m = 0; m < 5; m++) try {
+    await $();
+    let A = At(async () => {
+      if (l.length === 0 && f) return;
+      let m = !1;
+      for (let y = 0; y < 5; y++) try {
         await e.transaction(async (g) => {
           await g.exec(`
-                INSERT INTO live_query_${l}_state${f} 
-                  SELECT * FROM live_query_${l}_view;
-              `), p = await g.query(`EXECUTE live_query_${l}_diff${f};`), f = f === 1 ? 2 : 1, await g.exec(`
-                TRUNCATE live_query_${l}_state${f};
+                INSERT INTO live_query_${u}_state${p} 
+                  SELECT * FROM live_query_${u}_view;
+              `), f = await g.query(`EXECUTE live_query_${u}_diff${p};`), p = p === 1 ? 2 : 1, await g.exec(`
+                TRUNCATE live_query_${u}_state${p};
               `);
         });
         break;
       } catch (g) {
-        if (g.message === `relation "live_query_${l}_state${f}" does not exist`) {
-          E = !0, await S();
+        if (g.message === `relation "live_query_${u}_state${p}" does not exist`) {
+          m = !0, await $();
           continue;
         } else throw g;
       }
-      Pr(u, [...E ? [{ __op__: "RESET" }] : [], ...p.rows]);
-    }), A = (E) => {
-      if (d) throw new Error("Live query is no longer active and cannot be subscribed to");
-      u.push(E);
-    }, b = async (E) => {
-      E ? u = u.filter((m) => m !== m) : u = [], u.length === 0 && !d && (d = !0, await e.transaction(async (m) => {
-        await Promise.all(_.map((g) => g(m))), await m.exec(`
-              DROP VIEW IF EXISTS live_query_${l}_view;
-              DROP TABLE IF EXISTS live_query_${l}_state1;
-              DROP TABLE IF EXISTS live_query_${l}_state2;
-              DEALLOCATE live_query_${l}_diff1;
-              DEALLOCATE live_query_${l}_diff2;
+      Pr(l, [...m ? [{ __op__: "RESET" }] : [], ...f.rows]);
+    }), b = (m) => {
+      if (h) throw new Error("Live query is no longer active and cannot be subscribed to");
+      l.push(m);
+    }, R = async (m) => {
+      m ? l = l.filter((y) => y !== y) : l = [], l.length === 0 && !h && (h = !0, await e.transaction(async (y) => {
+        await Promise.all(E.map((g) => g(y))), await y.exec(`
+              DROP VIEW IF EXISTS live_query_${u}_view;
+              DROP TABLE IF EXISTS live_query_${u}_state1;
+              DROP TABLE IF EXISTS live_query_${u}_state2;
+              DEALLOCATE live_query_${u}_diff1;
+              DEALLOCATE live_query_${u}_diff2;
             `);
       }));
     };
-    return c?.aborted ? await b() : c?.addEventListener("abort", () => {
-      b();
-    }, { once: !0 }), await $(), { fields: p.fields.filter((E) => !["__after__", "__op__", "__changed_columns__"].includes(E.name)), initialChanges: p.rows, subscribe: A, unsubscribe: b, refresh: $ };
-  }, async incrementalQuery(s, a, i, o) {
+    return c?.aborted ? await R() : c?.addEventListener("abort", () => {
+      R();
+    }, { once: !0 }), await A(), { fields: f.fields.filter((m) => !["__after__", "__op__", "__changed_columns__"].includes(m.name)), initialChanges: f.rows, subscribe: b, unsubscribe: R, refresh: A };
+  }, async incrementalQuery(s, a, o, i) {
     let c;
-    if (typeof s != "string" && (c = s.signal, a = s.params, i = s.key, o = s.callback, s = s.query), !i) throw new Error("key is required for incremental queries");
-    let u = o ? [o] : [], l = /* @__PURE__ */ new Map(), d = /* @__PURE__ */ new Map(), f = [], p = !0, { fields: _, unsubscribe: S, refresh: $ } = await r.changes(s, a, i, (E) => {
-      for (let R of E) {
-        let { __op__: I, __changed_columns__: y, ...T } = R;
+    if (typeof s != "string" && (c = s.signal, a = s.params, o = s.key, i = s.callback, s = s.query), !o) throw new Error("key is required for incremental queries");
+    let l = i ? [i] : [], u = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map(), p = [], f = !0, { fields: E, unsubscribe: $, refresh: A } = await r.changes(s, a, o, (m) => {
+      for (let S of m) {
+        let { __op__: I, __changed_columns__: T, ...N } = S;
         switch (I) {
           case "RESET":
-            l.clear(), d.clear();
+            u.clear(), h.clear();
             break;
           case "INSERT":
-            l.set(T[i], T), d.set(T.__after__, T[i]);
+            u.set(N[o], N), h.set(N.__after__, N[o]);
             break;
           case "DELETE": {
-            let k = l.get(T[i]);
-            l.delete(T[i]), k.__after__ !== null && d.delete(k.__after__);
+            let k = u.get(N[o]);
+            u.delete(N[o]), k.__after__ !== null && h.delete(k.__after__);
             break;
           }
           case "UPDATE": {
-            let k = { ...l.get(T[i]) ?? {} };
-            for (let Q of y) k[Q] = T[Q], Q === "__after__" && d.set(T.__after__, T[i]);
-            l.set(T[i], k);
+            let k = { ...u.get(N[o]) ?? {} };
+            for (let Q of T) k[Q] = N[Q], Q === "__after__" && h.set(N.__after__, N[o]);
+            u.set(N[o], k);
             break;
           }
         }
       }
-      let m = [], g = null;
-      for (let R = 0; R < l.size; R++) {
-        let I = d.get(g), y = l.get(I);
-        if (!y) break;
-        let T = { ...y };
-        delete T.__after__, m.push(T), g = I;
+      let y = [], g = null;
+      for (let S = 0; S < u.size; S++) {
+        let I = h.get(g), T = u.get(I);
+        if (!T) break;
+        let N = { ...T };
+        delete N.__after__, y.push(N), g = I;
       }
-      f = m, p || se(u, { rows: m, fields: _ });
+      p = y, f || ie(l, { rows: y, fields: E });
     });
-    p = !1, se(u, { rows: f, fields: _ });
-    let A = (E) => {
-      u.push(E);
-    }, b = async (E) => {
-      E ? u = u.filter((m) => m !== m) : u = [], u.length === 0 && await S();
+    f = !1, ie(l, { rows: p, fields: E });
+    let b = (m) => {
+      l.push(m);
+    }, R = async (m) => {
+      m ? l = l.filter((y) => y !== y) : l = [], l.length === 0 && await $();
     };
-    return c?.aborted ? await b() : c?.addEventListener("abort", () => {
-      b();
-    }, { once: !0 }), { initialResults: { rows: f, fields: _ }, subscribe: A, unsubscribe: b, refresh: $ };
+    return c?.aborted ? await R() : c?.addEventListener("abort", () => {
+      R();
+    }, { once: !0 }), { initialResults: { rows: p, fields: E }, subscribe: b, unsubscribe: R, refresh: A };
   } };
   return { namespaceObj: r };
 }, qr = { name: "Live Queries", setup: Mr };
@@ -986,7 +1002,7 @@ async function $t(e, t) {
       WHERE NOT is_view; -- Exclude intermediate views
     `, [t])).rows.map((n) => ({ table_name: n.table_name, schema_name: n.schema_name, table_oid: n.table_oid, schema_oid: n.schema_oid }));
 }
-async function At(e, t, n) {
+async function bt(e, t, n) {
   let r = t.filter((s) => !n.has(`${s.schema_oid}_${s.table_oid}`)).map((s) => `
       CREATE OR REPLACE FUNCTION "_notify_${s.schema_oid}_${s.table_oid}"() RETURNS TRIGGER AS $$
       BEGIN
@@ -1001,7 +1017,7 @@ async function At(e, t, n) {
 `);
   r.trim() !== "" && await e.exec(r), t.map((s) => n.add(`${s.schema_oid}_${s.table_oid}`));
 }
-var se = (e, t) => {
+var ie = (e, t) => {
   for (let n of e) n(t);
 }, Pr = (e, t) => {
   for (let n of e) n(t);
@@ -1009,7 +1025,7 @@ var se = (e, t) => {
 class Rt extends Wn {
   #e;
   #s;
-  #i = 16;
+  #o = 16;
   // 批量发送间隔 (ms)
   #t = [];
   #r;
@@ -1026,7 +1042,7 @@ class Rt extends Wn {
     for (const s of r)
       await this.#e.exec(`LISTEN "${s}_notify"`);
     this.#e.onNotification((s, a) => {
-      this.#o(s, a);
+      this.#c(s, a);
     });
   }
   sql(t, ...n) {
@@ -1058,7 +1074,7 @@ class Rt extends Wn {
    * @param channel - 通知频道名称
    * @param payload - JSON 格式的 payload
    */
-  #o(t, n) {
+  #c(t, n) {
     try {
       const r = JSON.parse(n), s = t.replace("_notify", "");
       for (const a of r.ids)
@@ -1069,7 +1085,7 @@ class Rt extends Wn {
         });
       this.#r && clearTimeout(this.#r), this.#r = setTimeout(() => {
         this.#a(), this.#r = void 0;
-      }, this.#i);
+      }, this.#o);
     } catch (r) {
       console.error("Failed to parse NOTIFY payload:", r);
     }
@@ -1081,7 +1097,7 @@ class Rt extends Wn {
     const t = Object.groupBy(this.#t, (n) => `${n.type}_${n.tableName}`);
     for (const [, n] of Object.entries(t)) {
       if (!n || n.length === 0) continue;
-      const r = n[0], s = n.map((i) => i.id), a = {
+      const r = n[0], s = n.map((o) => o.id), a = {
         type: r.type,
         dbName: this.#s,
         tableName: r.tableName,
@@ -1096,22 +1112,22 @@ class Rt extends Wn {
 const Sn = (e, t) => {
   const n = P(e), r = t.map((s) => `'${s.id}'`).join(",");
   return `DELETE FROM ${n} WHERE id IN (${r});`;
-}, ue = (e, t, n) => {
-  const r = P(e), s = n?.userId && e.propertyMap.has("createdBy"), a = n?.userId && e.propertyMap.has("updatedBy"), i = [
-    ...Array.from(e.propertyMap.values()).map((u) => u.columnName),
+}, de = (e, t, n) => {
+  const r = P(e), s = n?.userId && e.propertyMap.has("createdBy"), a = n?.userId && e.propertyMap.has("updatedBy"), o = [
+    ...Array.from(e.propertyMap.values()).map((l) => l.columnName),
     ...e.foreignKeyColumnNames || e.foreignKeyNames
-  ], o = [];
-  t.forEach((u) => {
-    const l = Lt(e, u);
-    s && (l.createdBy = n.userId), a && (l.updatedBy = n.userId);
-    const d = Ke(e, l), f = [];
-    i.forEach((p) => {
-      const _ = d[p];
-      f.push(Je(_));
-    }), o.push(`(${f.join(",")})`);
+  ], i = [];
+  t.forEach((l) => {
+    const u = vt(e, l);
+    s && (u.createdBy = n.userId), a && (u.updatedBy = n.userId);
+    const h = Je(e, u), p = [];
+    o.forEach((f) => {
+      const E = h[f];
+      p.push(Ye(E));
+    }), i.push(`(${p.join(",")})`);
   });
-  const c = i.map((u) => `"${u}"`).join(",");
-  return `INSERT INTO ${r} (${c}) VALUES ${o.join(",")};`;
+  const c = o.map((l) => `"${l}"`).join(",");
+  return `INSERT INTO ${r} (${c}) VALUES ${i.join(",")};`;
 }, Ur = (e) => {
   if (e.includes("$")) {
     const [t, n] = e.split("$");
@@ -1134,13 +1150,13 @@ const Sn = (e, t) => {
       return;
     }
     const a = e.rxdb.schemaManager.getEntityMetadata(s.entity, s.namespace);
-    a ? (s.inversePatch && st(a, s.inversePatch), s.patch && st(a, s.patch)) : console.warn(`Entity metadata not found for ${s.namespace}.${s.entity}`);
+    a ? (s.inversePatch && rt(a, s.inversePatch), s.patch && rt(a, s.patch)) : console.warn(`Entity metadata not found for ${s.namespace}.${s.entity}`);
   });
   const n = Object.groupBy(t, (s) => s.type), r = Object.entries(n);
   for (let s = 0; s < r.length; s++) {
-    const [a, i] = r[s];
-    if (!i || i.length === 0) continue;
-    const o = i.filter((c) => c.namespace && c.entity).map(
+    const [a, o] = r[s];
+    if (!o || o.length === 0) continue;
+    const i = o.filter((c) => c.namespace && c.entity).map(
       (c) => ({
         namespace: c.namespace,
         entity: c.entity,
@@ -1151,89 +1167,89 @@ const Sn = (e, t) => {
         recordAt: c.createdAt
       })
     );
-    if (o.length !== 0)
+    if (i.length !== 0)
       switch (a) {
         case "INSERT":
-          e.rxdb.dispatchEvent(new oe(o));
+          e.rxdb.dispatchEvent(new ue(i));
           break;
         case "UPDATE":
-          e.rxdb.dispatchEvent(new me(o));
+          e.rxdb.dispatchEvent(new ge(i));
           break;
         case "DELETE":
-          e.rxdb.dispatchEvent(new Ve(o));
+          e.rxdb.dispatchEvent(new Ke(i));
           break;
       }
   }
-}, Ce = (e, t) => {
+}, Me = (e, t) => {
   const { tableName: n } = t, [r, s] = Ur(n), a = e.rxdb.schemaManager.getEntityTypeByTableName(s, r);
   if (!a) return;
-  const i = e.getRepository(a), o = e.rxdb.schemaManager.getEntityMetadataByTableName(s, r);
-  if (!o) {
+  const o = e.getRepository(a), i = e.rxdb.schemaManager.getEntityMetadataByTableName(s, r);
+  if (!i) {
     console.warn(`Metadata not found for entity ${r}.${s}`);
     return;
   }
-  i.findByRowIds(t.rowIds).then((c) => {
-    const u = c;
-    if (!(!u || u.length === 0))
-      if (a === ie) {
+  o.findByRowIds(t.rowIds).then((c) => {
+    const l = c;
+    if (!(!l || l.length === 0))
+      if (a === le) {
         if (xr(e, c), t.type === K.INSERT) {
-          const l = D(ie), d = c.map((f) => ({
-            namespace: l.namespace,
-            entity: l.name,
-            type: f.type,
-            id: f.id,
-            patch: { ...f },
+          const u = C(le), h = c.map((p) => ({
+            namespace: u.namespace,
+            entity: u.name,
+            type: p.type,
+            id: p.id,
+            patch: { ...p },
             inversePatch: null,
-            recordAt: f.createdAt || /* @__PURE__ */ new Date()
+            recordAt: p.createdAt || /* @__PURE__ */ new Date()
           }));
-          e.rxdb.dispatchEvent(new oe(d));
+          e.rxdb.dispatchEvent(new ue(h));
         }
       } else {
-        const l = jr(t.type), d = u.map((f) => {
-          const p = {
-            namespace: o.namespace,
-            entity: o.name,
-            type: l,
-            id: f.id,
+        const u = jr(t.type), h = l.map((p) => {
+          const f = {
+            namespace: i.namespace,
+            entity: i.name,
+            type: u,
+            id: p.id,
             patch: null,
             inversePatch: null,
-            recordAt: f.createdAt || /* @__PURE__ */ new Date()
+            recordAt: p.createdAt || /* @__PURE__ */ new Date()
           };
           switch (t.type) {
             case K.INSERT:
               return {
-                ...p,
-                patch: { ...f }
+                ...f,
+                patch: { ...p }
               };
             case K.DELETE:
               return {
-                ...p,
-                inversePatch: { ...f }
+                ...f,
+                inversePatch: { ...p }
               };
             case K.UPDATE:
               return {
-                ...p,
+                ...f,
                 // 注意：这里无法获取变更前的数据，只能把整个 entity 作为 patch
                 // 这是 UPDATE hook 的限制，完整的 patch/inversePatch 应该从 RxDBChange 表获取
                 inversePatch: null,
-                patch: { ...f }
+                patch: { ...p }
               };
           }
         });
-        switch (l) {
+        switch (u) {
           case "UPDATE":
             e.rxdb.dispatchEvent(
-              new me(d)
+              new ge(h)
             );
             break;
           case "DELETE":
             e.rxdb.dispatchEvent(
-              new Ve(d)
+              new Ke(h)
             );
             break;
           case "INSERT":
             e.rxdb.dispatchEvent(
-              new oe(d)
+              new ue(h)
             );
             break;
         }
@@ -1241,184 +1257,184 @@ const Sn = (e, t) => {
   }).catch((c) => {
     c.message?.includes("closed") || console.error("Failed to handle RxDBChange event", c);
   });
-}, Br = (e, t) => {
+}, Fr = (e, t) => {
   const n = P(e), r = [t.id];
   return {
     sql: `DELETE FROM ${n} WHERE id = $1;`,
     params: r
   };
 }, In = (e, t, n) => {
-  const r = P(e), s = Lt(e, t);
+  const r = P(e), s = vt(e, t);
   n?.userId && (e.propertyMap.has("createdBy") && (s.createdBy = n.userId), e.propertyMap.has("updatedBy") && (s.updatedBy = n.userId));
   const a = {};
-  Object.keys(s).forEach((f) => {
-    const p = s[f];
-    p != null && (a[f] = p);
+  Object.keys(s).forEach((p) => {
+    const f = s[p];
+    f != null && (a[p] = f);
   });
-  const i = Object.keys(a), o = Ke(e, a), c = [], u = i.map((f, p) => (c.push(o[f]), `$${p + 1}`)), l = i.map((f) => `"${f}"`).join(",");
-  let d = `INSERT INTO ${r} (${l}) VALUES (${u.join(",")})`;
-  return n?.returning !== !1 ? d += " RETURNING *;" : d += ";", { sql: d, params: c };
-}, ze = (e, t, n, r) => {
+  const o = Object.keys(a), i = Je(e, a), c = [], l = o.map((p, f) => (c.push(i[p]), `$${f + 1}`)), u = o.map((p) => `"${p}"`).join(",");
+  let h = `INSERT INTO ${r} (${u}) VALUES (${l.join(",")})`;
+  return n?.returning !== !1 ? h += " RETURNING *;" : h += ";", { sql: h, params: c };
+}, Ze = (e, t, n, r) => {
   const s = zn(e, n);
   e.propertyMap.has("updatedAt") && (s.updatedAt = r?.updatedAt ?? /* @__PURE__ */ new Date()), r?.userId && e.propertyMap.has("updatedBy") && (s.updatedBy = r.userId);
-  const a = Ke(e, s), o = Object.keys(s).map((f, p) => `"${f}" = $${p + 1}`).join(","), c = [...Object.values(a)], u = P(e), l = Array.isArray(t) ? t : [t];
-  let d = `UPDATE ${u} SET ${o} WHERE id `;
+  const a = Je(e, s), i = Object.keys(s).map((p, f) => `"${p}" = $${f + 1}`).join(","), c = [...Object.values(a)], l = P(e), u = Array.isArray(t) ? t : [t];
+  let h = `UPDATE ${l} SET ${i} WHERE id `;
   if (Array.isArray(t)) {
-    const f = c.length + 1;
-    d += `= ANY($${f})`, c.push(l.map((p) => p.id));
+    const p = c.length + 1;
+    h += `= ANY($${p})`, c.push(u.map((f) => f.id));
   } else {
-    const f = c.length + 1;
-    d += `= $${f}`, c.push(t.id);
+    const p = c.length + 1;
+    h += `= $${p}`, c.push(t.id);
   }
-  return r?.returning !== !1 ? d += " RETURNING *;" : d += ";", {
-    sql: d,
+  return r?.returning !== !1 ? h += " RETURNING *;" : h += ";", {
+    sql: h,
     params: c
   };
-}, Ze = "_", On = (e) => e.replaceAll(".", "_"), he = (e, t) => {
+}, et = "_", On = (e) => e.replaceAll(".", "_"), pe = (e, t) => {
   if (e.relationAliasMap.has(t)) return e.relationAliasMap.get(t);
-  const n = t.includes("_") ? t : t.split("_")[0], r = Dn(e, On(n));
+  const n = t.includes("_") ? t : t.split("_")[0], r = Cn(e, On(n));
   return e.relationAliasMap.set(t, r), r;
-}, Fr = (e, t, n, r) => {
+}, Br = (e, t, n, r) => {
   const s = n.slice(0, r);
   let a = t;
-  const i = [];
-  for (const o of s) {
-    if (!a?.relationMap.has(o)) return { relPairs: [] };
-    const c = a.relationMap.get(o);
-    i.push({ metadata: a, relation: c }), a = e.rxdb.schemaManager.getEntityMetadata(c.mappedEntity, c.mappedNamespace);
+  const o = [];
+  for (const i of s) {
+    if (!a?.relationMap.has(i)) return { relPairs: [] };
+    const c = a.relationMap.get(i);
+    o.push({ metadata: a, relation: c }), a = e.rxdb.schemaManager.getEntityMetadata(c.mappedEntity, c.mappedNamespace);
   }
-  return { metaWalker: a, relPairs: i };
+  return { metaWalker: a, relPairs: o };
 }, kr = (e, t, n, r, s) => {
   for (let a = s.length - 1; a > 0; a--) {
-    const i = s.slice(a);
-    if (i.length === 0) continue;
-    const { metaWalker: o, relPairs: c } = Fr(e, n, s, a);
-    if (!o || c.length === 0) continue;
-    const u = i[0], l = i.slice(1).join("."), d = o.propertyMap.get(u);
-    if (d && d.type === N.keyValue) {
-      const f = s.slice(0, a).join(".");
-      vn(e, t, c, f);
-      const p = c[c.length - 1].relation, _ = de(c, f, p), S = he(t, _), $ = l ? `$.${l}` : "$";
-      return t.fieldAliasMap.set(r, `"${S}"."${d.columnName}" ->> '${$.replace("$.", "")}'`), !0;
+    const o = s.slice(a);
+    if (o.length === 0) continue;
+    const { metaWalker: i, relPairs: c } = Br(e, n, s, a);
+    if (!i || c.length === 0) continue;
+    const l = o[0], u = o.slice(1).join("."), h = i.propertyMap.get(l);
+    if (h && h.type === _.keyValue) {
+      const p = s.slice(0, a).join(".");
+      Dn(e, t, c, p);
+      const f = c[c.length - 1].relation, E = me(c, p, f), $ = pe(t, E), A = u ? `$.${u}` : "$";
+      return t.fieldAliasMap.set(r, `"${$}"."${h.columnName}" ->> '${A.replace("$.", "")}'`), !0;
     }
   }
   return !1;
-}, vn = (e, t, n, r) => {
-  n.forEach(({ metadata: s, relation: a }, i) => {
-    let o = e.rxdb.schemaManager.findMappedRelation(s, a);
-    if (!o)
-      if (a.kind === F.ONE_TO_MANY || a.kind === F.MANY_TO_MANY) {
-        const d = s.relationMap.get(a.mappedProperty);
-        d && (o = { metadata: s, relation: d });
-      } else (a.kind === F.MANY_TO_ONE || a.kind === F.ONE_TO_ONE) && (o = { metadata: s, relation: a });
-    if (!o) throw new x("mappedRelation not found");
-    const c = de(n, r, a), u = he(t, c);
-    let l = Ze;
-    if (i > 0) {
-      const d = n[i - 1], f = de(n, r, d.relation);
-      l = he(t, f);
+}, Dn = (e, t, n, r) => {
+  n.forEach(({ metadata: s, relation: a }, o) => {
+    let i = e.rxdb.schemaManager.findMappedRelation(s, a);
+    if (!i)
+      if (a.kind === B.ONE_TO_MANY || a.kind === B.MANY_TO_MANY) {
+        const h = s.relationMap.get(a.mappedProperty);
+        h && (i = { metadata: s, relation: h });
+      } else (a.kind === B.MANY_TO_ONE || a.kind === B.ONE_TO_ONE) && (i = { metadata: s, relation: a });
+    if (!i) throw new x("mappedRelation not found");
+    const c = me(n, r, a), l = pe(t, c);
+    let u = et;
+    if (o > 0) {
+      const h = n[o - 1], p = me(n, r, h.relation);
+      u = pe(t, p);
     }
     switch (a.kind) {
-      case F.ONE_TO_MANY:
+      case B.ONE_TO_MANY:
         Wr(
           t,
-          o,
-          u,
-          l
+          i,
+          l,
+          u
         );
         break;
-      case F.ONE_TO_ONE:
-      case F.MANY_TO_ONE:
+      case B.ONE_TO_ONE:
+      case B.MANY_TO_ONE:
         Gr(
           t,
-          o,
-          u,
+          i,
           l,
+          u,
           a
         );
         break;
-      case F.MANY_TO_MANY:
+      case B.MANY_TO_MANY:
         Hr(
           t,
-          o,
-          u,
+          i,
           l,
+          u,
           a
         );
         break;
     }
   });
 }, Wr = (e, t, n, r) => {
-  const s = fe(e, t.metadata), a = t.relation.columnName, i = `"${n}"."${a}" = ${et(r)}."id"`;
-  s.find((c) => c.joinTableName === n && c.on === i) || s.push({
+  const s = Ee(e, t.metadata), a = t.relation.columnName, o = `"${n}"."${a}" = ${tt(r)}."id"`;
+  s.find((c) => c.joinTableName === n && c.on === o) || s.push({
     joinTableName: n,
-    on: i
+    on: o
   });
 }, Gr = (e, t, n, r, s) => {
-  const a = fe(e, t.metadata), i = `"${n}"."id" = ${et(r)}."${s.columnName}"`;
-  a.find((c) => c.joinTableName === n && c.on === i) || a.push({
+  const a = Ee(e, t.metadata), o = `"${n}"."id" = ${tt(r)}."${s.columnName}"`;
+  a.find((c) => c.joinTableName === n && c.on === o) || a.push({
     joinTableName: n,
-    on: i
+    on: o
   });
 }, Hr = (e, t, n, r, s) => {
-  const a = D(s.junctionEntityType), i = fe(e, a), o = Dn(e, On(`${s.name}_m_n`)), c = `"${o}"."${t.relation.columnName}" = ${et(r)}."id"`;
-  i.find(
-    (p) => p.joinTableName === o && p.on === c
-  ) || i.push({
-    joinTableName: o,
+  const a = C(s.junctionEntityType), o = Ee(e, a), i = Cn(e, On(`${s.name}_m_n`)), c = `"${i}"."${t.relation.columnName}" = ${tt(r)}."id"`;
+  o.find(
+    (f) => f.joinTableName === i && f.on === c
+  ) || o.push({
+    joinTableName: i,
     on: c
   });
-  const l = fe(e, t.metadata), d = `"${n}"."id" = "${o}"."${s.columnName}"`;
-  l.find((p) => p.joinTableName === n && p.on === d) || l.push({
+  const u = Ee(e, t.metadata), h = `"${n}"."id" = "${i}"."${s.columnName}"`;
+  u.find((f) => f.joinTableName === n && f.on === h) || u.push({
     joinTableName: n,
-    on: d
+    on: h
   });
-}, fe = (e, t) => (e.joinMap.has(t) || e.joinMap.set(t, []), e.joinMap.get(t)), Dn = (e, t) => {
+}, Ee = (e, t) => (e.joinMap.has(t) || e.joinMap.set(t, []), e.joinMap.get(t)), Cn = (e, t) => {
   let n = t, r = 1;
   for (; e.usedAliases.has(n); )
     n = `${t}_${r++}`;
   return e.usedAliases.add(n), n;
-}, de = (e, t, n) => e.length === 1 ? n.name : `${t}_${n.name}`, et = (e) => e === Ze ? e : `"${e}"`, Cn = (e, t, n) => {
+}, me = (e, t, n) => e.length === 1 ? n.name : `${t}_${n.name}`, tt = (e) => e === et ? e : `"${e}"`, Ln = (e, t, n) => {
   const r = {
     joinMap: /* @__PURE__ */ new Map(),
     usedAliases: /* @__PURE__ */ new Set(),
     fieldAliasMap: /* @__PURE__ */ new Map(),
     relationAliasMap: /* @__PURE__ */ new Map()
   };
-  Gn(n, (a, i, o) => {
-    const c = i;
-    a !== "field" || !c.includes(".") || Vr(e, r, t, c, o);
+  Gn(n, (a, o, i) => {
+    const c = o;
+    a !== "field" || !c.includes(".") || Vr(e, r, t, c, i);
   });
   const s = [];
-  for (const [a, i] of r.joinMap.entries()) {
-    const o = P(a);
-    for (const c of i)
-      s.push(` LEFT JOIN ${o} "${c.joinTableName}" ON ${c.on}`);
+  for (const [a, o] of r.joinMap.entries()) {
+    const i = P(a);
+    for (const c of o)
+      s.push(` LEFT JOIN ${i} "${c.joinTableName}" ON ${c.on}`);
   }
   return { joinSQL: s.join(""), fieldAliasMap: r.fieldAliasMap };
 }, Vr = (e, t, n, r, s) => {
   const a = r.split(".");
   try {
-    const u = e.rxdb.schemaManager.getFieldRelations(n, r);
-    if (u.isForeignKey) {
-      s.field = u.propertyName;
+    const l = e.rxdb.schemaManager.getFieldRelations(n, r);
+    if (l.isForeignKey) {
+      s.field = l.propertyName;
       return;
     }
-    const l = r.replace(`.${u.propertyName}`, "");
-    vn(e, t, u.relations, l);
-    const d = u.relations[u.relations.length - 1], f = de(u.relations, l, d.relation), p = he(t, f);
-    t.fieldAliasMap.set(r, `"${p}"."${u.property.columnName}"`);
+    const u = r.replace(`.${l.propertyName}`, "");
+    Dn(e, t, l.relations, u);
+    const h = l.relations[l.relations.length - 1], p = me(l.relations, u, h.relation), f = pe(t, p);
+    t.fieldAliasMap.set(r, `"${f}"."${l.property.columnName}"`);
     return;
   } catch {
   }
-  const [i, ...o] = a, c = n.propertyMap.get(i);
-  if (c && c.type === N.keyValue && o.length > 0) {
-    const u = o.join(".");
-    t.fieldAliasMap.set(r, `"${Ze}"."${c.columnName}" ->> '${u}'`);
+  const [o, ...i] = a, c = n.propertyMap.get(o);
+  if (c && c.type === _.keyValue && i.length > 0) {
+    const l = i.join(".");
+    t.fieldAliasMap.set(r, `"${et}"."${c.columnName}" ->> '${l}'`);
     return;
   }
   kr(e, t, n, r, a);
-}, pe = "_", Kr = {
+}, te = "_", Kr = {
   "=": "=",
   "!=": "!=",
   ">": ">",
@@ -1438,10 +1454,10 @@ const Sn = (e, t) => {
 }, Jr = (e, t) => {
   if (e?.length)
     return e.map((n) => {
-      const r = Ln(n.field, t);
-      return `${pe}."${r}" ${n.sort.toUpperCase()}`;
+      const r = vn(n.field, t);
+      return `${te}."${r}" ${n.sort.toUpperCase()}`;
     }).join(", ");
-}, Yr = (e) => Kr[e] || e, Qr = (e) => e && typeof e == "object" && "rules" in e && Array.isArray(e.rules), Ln = (e, t) => {
+}, Yr = (e) => Kr[e] || e, Qr = (e) => e && typeof e == "object" && "rules" in e && Array.isArray(e.rules), vn = (e, t) => {
   if (t && !e.includes(".")) {
     const n = t.propertyMap.get(e);
     if (n)
@@ -1451,96 +1467,97 @@ const Sn = (e, t) => {
       return s[a];
   }
   return e;
-}, Xr = (e, t, n) => {
+}, Xr = (e, t, n, r) => {
   if (t) return t;
   if (!e.includes(".")) {
-    const o = Ln(e, n);
-    return o.toLowerCase() !== o ? `"${o}"` : o;
+    const c = vn(e, n), l = r ? `${te}.` : "";
+    return c.toLowerCase() !== c ? `${l}"${c}"` : `${l}${c}`;
   }
-  const r = e.split("."), s = r[0], a = n?.propertyMap.get(s);
-  if (a && (a.type === N.json || a.type === N.keyValue) && r.length === 2)
-    return `"${a.columnName}" ->> '${r[1]}'`;
+  const s = e.split("."), a = s[0], o = n?.propertyMap.get(a);
+  if (o && (o.type === _.json || o.type === _.keyValue) && s.length === 2)
+    return `"${o.columnName}" ->> '${s[1]}'`;
   const i = e.lastIndexOf(".");
   return `"${e.slice(0, i)}".${e.slice(i + 1)}`;
-}, zr = (e, t, n = /* @__PURE__ */ new Map(), r) => {
-  const s = String(e.field), a = n.get(s), i = Xr(s, a, r), o = e.value, c = e.operator;
-  if (c === "null" || c === "notNull")
-    return c === "null" ? `${i} IS NULL` : `${i} IS NOT NULL`;
-  if (o === null)
-    return c === "=" ? `${i} IS NULL` : c === "!=" ? `${i} IS NOT NULL` : "";
-  let u = s;
-  a && s.includes(".") && (u = s.split(".").pop() || s);
-  const l = r?.propertyMap.get(u.split(".")[0]);
-  if (l && (l.type === N.json || l.type === N.keyValue)) {
-    if (c === "contains" && typeof o == "object" && !Array.isArray(o))
-      return t.push(JSON.stringify(o)), `${i} @> $${t.length}::jsonb`;
-    if (c === "notContains" && typeof o == "object" && !Array.isArray(o))
-      return t.push(JSON.stringify(o)), `NOT (${i} @> $${t.length}::jsonb)`;
-  }
-  if (l && (l.type === N.stringArray || l.type === N.numberArray) && (c === "in" || c === "notIn")) {
-    if (!Array.isArray(o)) return "";
-    t.push(JSON.stringify(o));
-    const f = `${i} @> $${t.length}::jsonb`;
-    return c === "notIn" ? `NOT ${f}` : f;
-  }
-  if (c === "in" || c === "notIn")
-    return Array.isArray(o) ? o.length === 0 ? c === "in" ? "1=0" : "1=1" : (t.push(o), `${i} ${c === "in" ? "= ANY" : "!= ALL"}($${t.length})`) : "";
-  if (c === "between" || c === "notBetween")
-    return !Array.isArray(o) || o.length !== 2 ? "" : (t.push(o[0], o[1]), `${i} ${c === "between" ? "BETWEEN" : "NOT BETWEEN"} $${t.length - 1} AND $${t.length}`);
-  if (["contains", "notContains", "startsWith", "notStartsWith", "endsWith", "notEndsWith"].includes(c)) {
+}, zr = (e, t, n = /* @__PURE__ */ new Map(), r, s) => {
+  const a = String(e.field), o = n.get(a), i = Xr(a, o, r, s), c = e.value, l = e.operator;
+  if (l === "null" || l === "notNull")
+    return l === "null" ? `${i} IS NULL` : `${i} IS NOT NULL`;
+  if (c === null)
+    return l === "=" ? `${i} IS NULL` : l === "!=" ? `${i} IS NOT NULL` : "";
+  let u = a;
+  o && a.includes(".") && (u = a.split(".").pop() || a);
+  const h = r?.propertyMap.get(u.split(".")[0]);
+  if (h && (h.type === _.json || h.type === _.keyValue)) {
+    if (l === "contains" && typeof c == "object" && !Array.isArray(c))
+      return t.push(JSON.stringify(c)), `${i} @> $${t.length}::jsonb`;
+    if (l === "notContains" && typeof c == "object" && !Array.isArray(c))
+      return t.push(JSON.stringify(c)), `NOT (${i} @> $${t.length}::jsonb)`;
+  }
+  if (h && (h.type === _.stringArray || h.type === _.numberArray) && (l === "in" || l === "notIn")) {
+    if (!Array.isArray(c)) return "";
+    const f = h.type === _.stringArray ? "text[]" : "numeric[]";
+    t.push(c);
+    const E = `${i} @> $${t.length}::${f}`;
+    return l === "notIn" ? `NOT ${E}` : E;
+  }
+  if (l === "in" || l === "notIn")
+    return Array.isArray(c) ? c.length === 0 ? l === "in" ? "1=0" : "1=1" : (t.push(c), `${i} ${l === "in" ? "= ANY" : "!= ALL"}($${t.length})`) : "";
+  if (l === "between" || l === "notBetween")
+    return !Array.isArray(c) || c.length !== 2 ? "" : (t.push(c[0], c[1]), `${i} ${l === "between" ? "BETWEEN" : "NOT BETWEEN"} $${t.length - 1} AND $${t.length}`);
+  if (["contains", "notContains", "startsWith", "notStartsWith", "endsWith", "notEndsWith"].includes(l)) {
     let f = "";
-    c === "contains" || c === "notContains" ? f = `%${o}%` : c === "startsWith" || c === "notStartsWith" ? f = `${o}%` : (c === "endsWith" || c === "notEndsWith") && (f = `%${o}`), t.push(f);
-    const p = c.startsWith("not") ? "NOT LIKE" : "LIKE";
-    return `${i} ${p} $${t.length}`;
-  }
-  const d = Yr(c);
-  return t.push(o), l && l.type === N.uuid ? `${i}::uuid ${d} $${t.length}::uuid` : `${i} ${d} $${t.length}`;
-}, we = (e, t, n = /* @__PURE__ */ new Map(), r) => {
-  const s = e.rules.map(
-    (i) => Qr(i) ? we(i, t, n, r) : zr(i, t, n, r)
+    l === "contains" || l === "notContains" ? f = `%${c}%` : l === "startsWith" || l === "notStartsWith" ? f = `${c}%` : (l === "endsWith" || l === "notEndsWith") && (f = `%${c}`), t.push(f);
+    const E = l.startsWith("not") ? "NOT LIKE" : "LIKE";
+    return `${i} ${E} $${t.length}`;
+  }
+  const p = Yr(l);
+  return t.push(c), h && h.type === _.uuid ? `${i}::uuid ${p} $${t.length}::uuid` : `${i} ${p} $${t.length}`;
+}, Ae = (e, t, n = /* @__PURE__ */ new Map(), r, s) => {
+  const a = e.rules.map(
+    (i) => Qr(i) ? Ae(i, t, n, r, s) : zr(i, t, n, r, s)
   ).filter(Boolean);
-  if (!s.length) return "";
-  if (s.length === 1) return s[0];
-  const a = e.combinator.toUpperCase();
-  return `(${s.join(` ${a} `)})`;
+  if (!a.length) return "";
+  if (a.length === 1) return a[0];
+  const o = e.combinator.toUpperCase();
+  return `(${a.join(` ${o} `)})`;
 }, Zr = (e, t) => {
-  let n = `SELECT ${pe}.* FROM ${e.tableName} AS ${pe}`;
-  return e.join && (n += ` ${e.join}`), e.where && (n += ` WHERE ${e.where}`), e.orderBy && (n += ` ORDER BY ${e.orderBy}`), e.limit !== void 0 && (t.push(e.limit), n += ` LIMIT $${t.length}`), e.offset !== void 0 && e.offset > 0 && (t.push(e.offset), n += ` OFFSET $${t.length}`), n;
+  let r = `SELECT ${e.join ? "DISTINCT " : ""}${te}.* FROM ${e.tableName} AS ${te}`;
+  return e.join && (r += ` ${e.join}`), e.where && (r += ` WHERE ${e.where}`), e.orderBy && (r += ` ORDER BY ${e.orderBy}`), e.limit !== void 0 && (t.push(e.limit), r += ` LIMIT $${t.length}`), e.offset !== void 0 && e.offset > 0 && (t.push(e.offset), r += ` OFFSET $${t.length}`), r;
 }, ea = (e) => {
-  let t = `SELECT COUNT(*) as count FROM ${e.tableName} AS ${pe}`;
-  return e.join && (t += ` ${e.join}`), e.where && (t += ` WHERE ${e.where}`), t;
-}, Ee = (e, t, n) => {
-  const r = P(t), s = [], { joinSQL: a, fieldAliasMap: i } = n.where ? Cn(e, t, n.where) : { joinSQL: "", fieldAliasMap: /* @__PURE__ */ new Map() }, o = n.where ? we(n.where, s, i, t) : void 0, c = Jr(n.orderBy, t), u = "limit" in n ? n.limit : void 0, l = "offset" in n ? n.offset : void 0;
+  let n = `SELECT ${e.join ? `COUNT(DISTINCT ${te}.id)` : "COUNT(*)"} as count FROM ${e.tableName} AS ${te}`;
+  return e.join && (n += ` ${e.join}`), e.where && (n += ` WHERE ${e.where}`), n;
+}, ye = (e, t, n) => {
+  const r = P(t), s = [], { joinSQL: a, fieldAliasMap: o } = n.where ? Ln(e, t, n.where) : { joinSQL: "", fieldAliasMap: /* @__PURE__ */ new Map() }, i = !!a, c = n.where ? Ae(n.where, s, o, t, i) : void 0, l = Jr(n.orderBy, t), u = "limit" in n ? n.limit : void 0, h = "offset" in n ? n.offset : void 0;
   return { sql: Zr(
     {
       tableName: r,
-      where: o,
+      where: c,
       join: a,
-      orderBy: c,
+      orderBy: l,
       limit: u,
-      offset: l
+      offset: h
     },
     s
   ), params: s };
 }, ta = (e, t, n) => {
   if (n.groupBy)
     throw new x("groupBy not supported in count queries");
-  const r = P(t), s = [], { joinSQL: a, fieldAliasMap: i } = n.where ? Cn(e, t, n.where) : { joinSQL: "", fieldAliasMap: /* @__PURE__ */ new Map() }, o = n.where ? we(n.where, s, i, t) : void 0;
+  const r = P(t), s = [], { joinSQL: a, fieldAliasMap: o } = n.where ? Ln(e, t, n.where) : { joinSQL: "", fieldAliasMap: /* @__PURE__ */ new Map() }, i = !!a, c = n.where ? Ae(n.where, s, o, t, i) : void 0;
   return { sql: ea({
     tableName: r,
-    where: o,
+    where: c,
     join: a
   }), params: s };
 }, na = (e, t) => {
-  const n = P(e), r = t.map((a, i) => `$${i + 1}`).join(", ");
+  const n = P(e), r = t.map((a, o) => `$${o + 1}`).join(", ");
   return {
     sql: `SELECT * FROM ${n} WHERE id IN (${r})`,
     params: t
   };
 };
-class sa extends Fn {
+class sa extends Bn {
   constructor(t, n) {
-    super(t.rxdb, n), this.adapter = t, this.metadata = D(n);
+    super(t.rxdb, n), this.adapter = t, this.metadata = C(n);
   }
   metadata;
   /**
@@ -1557,11 +1574,11 @@ class sa extends Fn {
   }
   addQueryCache(t, n = !0) {
     return t.rows.map((r) => {
-      const s = Z(this.metadata, r), a = s.id;
-      let i;
-      super.hasEntityRef(a) ? (i = super.getEntityRef(a), n && super.updateEntity(i, s)) : i = this.createEntityRef(s);
-      const o = J(i);
-      return o.local = !0, o.modified = !1, i;
+      const s = ee(this.metadata, r), a = s.id;
+      let o;
+      super.hasEntityRef(a) ? (o = super.getEntityRef(a), n && super.updateEntity(o, s)) : o = this.createEntityRef(s);
+      const i = J(o);
+      return i.local = !0, i.modified = !1, o;
     });
   }
 }
@@ -1580,11 +1597,11 @@ class Mn extends sa {
     return (await this.find({ ...t, limit: 1, offset: 0 }))[0];
   }
   async find(t) {
-    const { sql: n, params: r } = Ee(this.adapter, this.metadata, t), s = await this.adapter.query(n, r);
+    const { sql: n, params: r } = ye(this.adapter, this.metadata, t), s = await this.adapter.query(n, r);
     return this.addQueryCache(s);
   }
   async findAll(t) {
-    const { sql: n, params: r } = Ee(this.adapter, this.metadata, t), s = await this.adapter.query(n, r);
+    const { sql: n, params: r } = ye(this.adapter, this.metadata, t), s = await this.adapter.query(n, r);
     return this.addQueryCache(s);
   }
   async count(t) {
@@ -1597,164 +1614,159 @@ class Mn extends sa {
   }
   async update(t, n) {
     Object.assign(t, n);
-    const { sql: r, params: s } = ze(this.metadata, t, n, this.rxdb.context);
-    return await this.adapter.query(r, s), t;
+    const { sql: r, params: s } = Ze(this.metadata, t, n, this.rxdb.context), a = await this.adapter.query(r, s);
+    return this.addQueryCache(a), t;
   }
   async remove(t) {
-    const { sql: n, params: r } = Br(this.metadata, t);
+    const { sql: n, params: r } = Fr(this.metadata, t);
     return await this.adapter.query(n, r), t;
   }
 }
-const Ne = (e, t, n) => {
-  const { isCount: r, isFindDescendants: s, entityId: a, where: i } = n, o = !a, c = P(t);
-  let u = "";
-  const d = [`c.level < ${n.level || 0}`], f = [];
-  if (o || f.push(a), i) {
-    const A = /* @__PURE__ */ new Map(), b = (m) => {
-      if ("rules" in m)
-        return { ...m, rules: m.rules.map(b) };
-      if (m.field && typeof m.field == "string" && m.field.startsWith("children.")) {
-        const g = m.field.substring(9), I = t.propertyMap.get(g)?.columnName ?? g;
-        A.set(m.field, `children."${I}"`);
+const $e = (e, t, n) => {
+  const { isCount: r, isFindDescendants: s, entityId: a, where: o } = n, i = !a, c = P(t);
+  let l = "";
+  const h = [`c.level < ${n.level || 0}`], p = [];
+  if (i || p.push(a), o) {
+    const b = /* @__PURE__ */ new Map(), R = (y) => {
+      if ("rules" in y)
+        return { ...y, rules: y.rules.map(R) };
+      if (y.field && typeof y.field == "string" && y.field.startsWith("children.")) {
+        const g = y.field.substring(9), I = t.propertyMap.get(g)?.columnName ?? g;
+        b.set(y.field, `children."${I}"`);
       }
-      return m;
+      return y;
     };
-    b(i);
-    const E = we(i, f, A, t);
-    E && d.push(E);
-  }
-  const p = d.filter(Boolean).join(" AND ");
-  p && (u = `WHERE ${p}`);
-  let _ = "*";
-  return r && (o ? _ = "count(*) AS count" : _ = "(count(*) - 1) AS count"), {
+    R(o);
+    const m = Ae(o, p, b, t);
+    m && h.push(m);
+  }
+  const f = h.filter(Boolean).join(" AND ");
+  f && (l = `WHERE ${f}`);
+  let E = "*";
+  return r && (i ? E = "count(*) AS count" : E = "(count(*) - 1) AS count"), {
     sql: `WITH RECURSIVE __children AS (
   SELECT *, 0 AS level
   FROM ${c}
-  WHERE ${o ? '"parentId" IS NULL' : "id = $1"}
+  WHERE ${i ? '"parentId" IS NULL' : "id = $1"}
   UNION ALL
   SELECT children.*, c.level + 1 AS level
   FROM ${c} children
   JOIN __children c ON ${s ? 'children."parentId"::uuid = c.id::uuid' : 'children.id::uuid = c."parentId"::uuid'}
-  ${u}
+  ${l}
 )
 
-SELECT ${_} FROM __children${r ? "" : " ORDER BY level, id"};`,
-    params: f
+SELECT ${E} FROM __children${r ? "" : " ORDER BY level, id"};`,
+    params: p
   };
-}, ra = (e, t, n) => Ne(e, t, { ...n, isFindDescendants: !0 }), aa = (e, t, n) => Ne(e, t, { ...n, isFindDescendants: !0, isCount: !0 }), ia = (e, t, n) => Ne(e, t, { ...n, isFindDescendants: !1 }), oa = (e, t, n) => Ne(e, t, { ...n, isFindDescendants: !1, isCount: !0 });
+}, ra = (e, t, n) => $e(e, t, { ...n, isFindDescendants: !0 }), aa = (e, t, n) => $e(e, t, { ...n, isFindDescendants: !0, isCount: !0 }), ia = (e, t, n) => $e(e, t, { ...n, isFindDescendants: !1 }), oa = (e, t, n) => $e(e, t, { ...n, isFindDescendants: !1, isCount: !0 });
 class ca extends Mn {
   async findDescendants(t) {
     const { sql: n, params: r } = ra(this.adapter, this.metadata, t), s = await this.adapter.query(n, r);
-    return !s.rows || s.rows.length === 0 ? [] : s.rows.map((i) => {
-      const o = Z(this.metadata, i);
-      return this.createEntityRef(o);
+    return !s.rows || s.rows.length === 0 ? [] : s.rows.map((o) => {
+      const i = ee(this.metadata, o);
+      return this.createEntityRef(i);
     });
   }
   async countDescendants(t) {
-    const { sql: n, params: r } = aa(this.adapter, this.metadata, t), a = (await this.adapter.query(n, r)).rows[0], i = a.count || a["?column?"];
-    return parseInt(String(i), 10) || 0;
+    const { sql: n, params: r } = aa(this.adapter, this.metadata, t), a = (await this.adapter.query(n, r)).rows[0], o = a.count || a["?column?"];
+    return parseInt(String(o), 10) || 0;
   }
   async findAncestors(t) {
     const { sql: n, params: r } = ia(this.adapter, this.metadata, t), s = await this.adapter.query(n, r);
-    return !s.rows || s.rows.length === 0 ? [] : s.rows.map((i) => {
-      const o = Z(this.metadata, i);
-      return this.createEntityRef(o);
+    return !s.rows || s.rows.length === 0 ? [] : s.rows.map((o) => {
+      const i = ee(this.metadata, o);
+      return this.createEntityRef(i);
     });
   }
   async countAncestors(t) {
-    const { sql: n, params: r } = oa(this.adapter, this.metadata, t), a = (await this.adapter.query(n, r)).rows[0], i = a.count || a["?column?"];
-    return parseInt(String(i), 10) || 0;
+    const { sql: n, params: r } = oa(this.adapter, this.metadata, t), a = (await this.adapter.query(n, r)).rows[0], o = a.count || a["?column?"];
+    return parseInt(String(o), 10) || 0;
   }
 }
 const la = async (e, t) => {
   const n = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Date();
   for (const [s, a] of t.create.entries()) {
-    const i = Array.from(a);
-    i.forEach((_) => n.add(_));
-    const o = D(s), c = ue(o, i, e.rxdb.context);
+    const o = Array.from(a);
+    o.forEach((E) => n.add(E));
+    const i = C(s), c = de(i, o, e.rxdb.context);
     await e.query(c);
-    const u = i.map((_) => _.id), { sql: l, params: d } = Ee(e, o, {
-      where: { combinator: "and", rules: [{ field: "id", operator: "in", value: u }] }
-    }), f = await e.query(l, d), p = e.getRepository(s);
-    for (const _ of f.rows) {
-      const S = Z(o, _), $ = S.id;
-      if (p.hasEntityRef($)) {
-        const A = p.getEntityRef($);
-        p.updateEntity(A, S);
-        const b = J(A);
-        b.local = !0, b.modified = !1;
+    const l = o.map((E) => E.id), { sql: u, params: h } = ye(e, i, {
+      where: { combinator: "and", rules: [{ field: "id", operator: "in", value: l }] }
+    }), p = await e.query(u, h), f = e.getRepository(s);
+    for (const E of p.rows) {
+      const $ = ee(i, E), A = $.id;
+      if (f.hasEntityRef(A)) {
+        const b = f.getEntityRef(A);
+        f.updateEntity(b, $);
+        const R = J(b);
+        R.local = !0, R.modified = !1;
       }
     }
   }
   for (const [s, a] of t.update.entries()) {
-    const i = Array.from(a);
-    i.forEach((l) => n.add(l));
-    const o = D(s), c = Object.groupBy(i, (l) => {
-      const d = J(l);
-      return Ot(Object.keys(d.patch || {}).sort());
-    }), u = e.getRepository(s);
-    for (const l of Object.values(c)) {
-      if (!l || l.length === 0) continue;
-      const d = l[0], f = J(d), { sql: p, params: _ } = ze(o, l, f.patch || {}, {
+    const o = Array.from(a);
+    o.forEach((p) => n.add(p));
+    const i = C(s), c = e.getRepository(s);
+    for (const p of o) {
+      const f = J(p), { sql: E, params: $ } = Ze(i, p, f.patch || {}, {
         ...e.rxdb.context,
         returning: !1,
-        // 后续用 SELECT 获取
         updatedAt: r
       });
-      await e.query(p, _);
-      const S = l.map((b) => b.id), $ = Ee(e, o, {
-        where: { combinator: "and", rules: [{ field: "id", operator: "in", value: S }] }
-      }), A = await e.query($.sql, $.params);
-      for (const b of A.rows) {
-        const E = Z(o, b), m = E.id;
-        if (u.hasEntityRef(m)) {
-          const g = u.getEntityRef(m);
-          u.updateEntity(g, E);
-          const R = J(g);
-          R.local = !0, R.modified = !1;
-        }
+      await e.query(E, $);
+    }
+    const l = o.map((p) => p.id), u = ye(e, i, {
+      where: { combinator: "and", rules: [{ field: "id", operator: "in", value: l }] }
+    }), h = await e.query(u.sql, u.params);
+    for (const p of h.rows) {
+      const f = ee(i, p), E = f.id;
+      if (c.hasEntityRef(E)) {
+        const $ = c.getEntityRef(E);
+        c.updateEntity($, f);
+        const A = J($);
+        A.local = !0, A.modified = !1;
       }
     }
   }
   for (const [, s] of t.remove.entries()) {
-    const a = Array.from(s), i = D(a[0]?.constructor);
+    const a = Array.from(s), o = C(a[0]?.constructor);
     if (a.length > 0) {
-      const o = Sn(i, a);
-      await e.query(o);
+      const i = Sn(o, a);
+      await e.query(i);
     }
-    for (const o of a) {
-      n.add(o);
-      const c = J(o);
-      c.origin = structuredClone({ ...o }), c.modified = !1, c.removed = !0, c.local = !1;
+    for (const i of a) {
+      n.add(i);
+      const c = J(i);
+      c.origin = structuredClone({ ...i }), c.modified = !1, c.removed = !0, c.local = !1;
     }
   }
   return Array.from(n);
 }, ua = (e, t) => {
   const n = P(t);
   let r = `CREATE TABLE ${n} (`;
-  const s = [], a = [], i = [];
+  const s = [], a = [], o = [];
   t.propertyMap.forEach((c) => {
-    let u = "";
-    u += `"${c.columnName}"`;
-    const l = Dt(c);
-    if (c.primary ? c.type === N.integer ? u += " serial PRIMARY KEY" : u += ` ${l} PRIMARY KEY` : u += ` ${l}`, Reflect.get(c, "default") !== void 0) {
-      let d = c.default;
-      It(c.default) && (d = c.default()), Hn(d) ? ["CURRENT_TIMESTAMP", "now()"].includes(d) ? u += " DEFAULT now()" : u += ` DEFAULT '${d}'` : d instanceof Date ? u += ` DEFAULT '${d.toISOString()}'` : typeof d == "boolean" || typeof d == "number" ? u += ` DEFAULT ${String(d)}` : u += ` DEFAULT '${String(d)}'`;
+    let l = "";
+    l += `"${c.columnName}"`;
+    const u = Ct(c);
+    if (c.primary ? c.type === _.integer ? l += " serial PRIMARY KEY" : l += ` ${u} PRIMARY KEY` : l += ` ${u}`, Reflect.get(c, "default") !== void 0) {
+      let h = c.default;
+      Ot(c.default) && (h = c.default()), Hn(h) ? ["CURRENT_TIMESTAMP", "now()"].includes(h) ? l += " DEFAULT now()" : l += ` DEFAULT '${h}'` : h instanceof Date ? l += ` DEFAULT '${h.toISOString()}'` : typeof h == "boolean" || typeof h == "number" ? l += ` DEFAULT ${String(h)}` : l += ` DEFAULT '${String(h)}'`;
     }
-    if (c.nullable || (u += " NOT NULL"), c.unique && s.push(
-      `CREATE UNIQUE INDEX "${Ct(t, c)}" on ${n} ("${c.columnName}" ${Xn(c)});`
-    ), c.type === N.enum) {
-      const d = c;
-      if (d.enum && d.enum.length > 0) {
-        const f = d.enum.map((p) => `'${String(p).replace(/'/g, "''")}'`).join(", ");
-        a.push(`CHECK ("${c.columnName}" IN (${f}))`);
+    if (c.nullable || (l += " NOT NULL"), c.unique && s.push(
+      `CREATE UNIQUE INDEX "${Lt(t, c)}" on ${n} ("${c.columnName}" ${Xn(c)});`
+    ), c.type === _.enum) {
+      const h = c;
+      if (h.enum && h.enum.length > 0) {
+        const p = h.enum.map((f) => `'${String(f).replace(/'/g, "''")}'`).join(", ");
+        a.push(`CHECK ("${c.columnName}" IN (${p}))`);
       }
     }
-    i.push(u);
+    o.push(l);
   });
-  const o = [...i, ...a];
-  if (o.length)
-    r += o.map((c) => `
+  const i = [...o, ...a];
+  if (i.length)
+    r += i.map((c) => `
 ${c}`).join(","), r += `
 );`;
   else
@@ -1766,55 +1778,53 @@ ${c}`).join(","), r += `
   let n = "";
   const r = P(t);
   return t.indexes && t.indexes.length > 0 && t.indexes.forEach((s) => {
-    const a = `idx_${t.tableName}_${s.name}`, i = s.properties?.map((c) => `"${c}"`).join(", ") || `"${s.name}"`, o = s.unique ? "UNIQUE " : "";
+    const a = `idx_${t.tableName}_${s.name}`, o = s.properties?.map((c) => `"${c}"`).join(", ") || `"${s.name}"`, i = s.unique ? "UNIQUE " : "";
     n += `
-CREATE ${o}INDEX "${a}" ON ${r}(${i});`;
+CREATE ${i}INDEX "${a}" ON ${r}(${o});`;
   }), n;
 }, fa = (e, t) => {
   let n = "";
   const r = P(t);
   return Array.from(t.relationMap.values()).forEach((s) => {
     switch (s.kind) {
-      case F.ONE_TO_ONE:
-      case F.MANY_TO_ONE:
+      case B.ONE_TO_ONE:
+      case B.MANY_TO_ONE:
         {
           const a = s.columnName;
-          let i = "uuid";
+          let o = "uuid";
           if (s.mappedEntity)
             try {
-              const c = e.rxdb.schemaManager.getEntityMetadata(
+              const i = e.rxdb.schemaManager.getEntityMetadata(
                 s.mappedEntity,
                 s.mappedNamespace
               );
-              if (c) {
-                const u = Array.from(c.propertyMap.values()).find(
+              if (i) {
+                const c = Array.from(i.propertyMap.values()).find(
                   (l) => l.primary
                 );
-                u && (i = Dt(u));
+                c && (o = Ct(c));
               }
             } catch {
             }
           if (n += `
-ALTER TABLE ${r} ADD COLUMN "${a}" ${i}`, s.nullable || (n += " NOT NULL"), s.kind === F.MANY_TO_ONE && Reflect.get(s, "default") !== void 0) {
-            const c = s;
-            let u = c.default;
-            It(c.default) && (u = c.default()), n += ` DEFAULT '${u}'`;
+ALTER TABLE ${r} ADD COLUMN "${a}" ${o}`, s.nullable || (n += " NOT NULL"), s.kind === B.MANY_TO_ONE && Reflect.get(s, "default") !== void 0) {
+            const i = s;
+            let c = i.default;
+            Ot(i.default) && (c = i.default()), n += ` DEFAULT '${c}'`;
           }
-          n += ";";
-          const o = s.mappedEntity === t.name;
-          if (s.mappedEntity && !o) {
-            const c = e.rxdb.schemaManager.getEntityMetadata(
+          if (n += ";", s.mappedEntity) {
+            const i = e.rxdb.schemaManager.getEntityMetadata(
               s.mappedEntity,
               s.mappedNamespace
-            ), u = vt(
-              c?.tableName ?? s.mappedEntity,
+            ), c = Dt(
+              i?.tableName ?? s.mappedEntity,
               s.mappedNamespace || t.namespace
             ), l = `${r}_${a}_fk`.replace(/"/g, "");
             n += `
-ALTER TABLE ${r} ADD CONSTRAINT "${l}" FOREIGN KEY ("${a}") REFERENCES ${u}(id)`, s.onDelete ? n += ` ON DELETE ${s.onDelete}` : s.kind === F.MANY_TO_ONE && (s.nullable ? n += " ON DELETE SET NULL" : n += " ON DELETE CASCADE"), n += " DEFERRABLE INITIALLY DEFERRED", n += ";";
+ALTER TABLE ${r} ADD CONSTRAINT "${l}" FOREIGN KEY ("${a}") REFERENCES ${c}(id)`, s.onDelete ? n += ` ON DELETE ${s.onDelete}` : s.kind === B.MANY_TO_ONE && (s.nullable ? n += " ON DELETE SET NULL" : n += " ON DELETE CASCADE"), n += " DEFERRABLE INITIALLY DEFERRED", n += ";";
           }
-          (s.unique || s.kind === F.ONE_TO_ONE) && (n += `
-CREATE UNIQUE INDEX "${Ct(t, s)}" ON ${r}("${a}");`);
+          (s.unique || s.kind === B.ONE_TO_ONE) && (n += `
+CREATE UNIQUE INDEX "${Lt(t, s)}" ON ${r}("${a}");`);
         }
         break;
     }
@@ -1890,7 +1900,7 @@ END $$;
 function Da(e) {
   return `DROP TRIGGER IF EXISTS "${`${e}_notify_trigger`}" ON "${e}";`;
 }
-function pa(e = ["RxDBChange", "RxDBBranch", "RxDBMigration"]) {
+function pa(e = ["rxdb_change", "rxdb_branch", "rxdb_migration"]) {
   const t = [];
   t.push(da());
   for (const n of e)
@@ -1899,23 +1909,23 @@ function pa(e = ["RxDBChange", "RxDBBranch", "RxDBMigration"]) {
 
 `);
 }
-function $e(e, t = {}) {
-  const n = P(e), r = D(ie), s = P(r), {
+function be(e, t = {}) {
+  const n = P(e), r = C(le), s = P(r), {
     propertyMap: a,
-    name: i,
-    tableName: o,
+    name: o,
+    tableName: i,
     foreignKeyNames: c,
-    foreignKeyColumnNames: u,
-    namespace: l
-  } = e, { branchId: d, transactionId: f } = t, p = `"${o}_change_trigger"`, _ = [];
-  for (const [y, T] of a)
-    y !== "id" && _.push({ jsName: y, dbColumn: T.columnName });
-  const S = u || c;
-  for (let y = 0; y < c.length; y++)
-    c[y] !== "id" && _.push({ jsName: c[y], dbColumn: S[y] });
-  const $ = 'type, namespace, entity, "branchId", "transactionId", "entityId", "inversePatch", patch', A = f ? `'${f}'` : "NULL", b = d || "main", E = `"${l}"."${o}_change_trigger_fn"`, m = `'${l}','${i}','${b}',${A}`, g = `
+    foreignKeyColumnNames: l,
+    namespace: u
+  } = e, { branchId: h, transactionId: p } = t, f = `"${i}_change_trigger"`, E = [];
+  for (const [T, N] of a)
+    T !== "id" && E.push({ jsName: T, dbColumn: N.columnName });
+  const $ = l || c;
+  for (let T = 0; T < c.length; T++)
+    c[T] !== "id" && E.push({ jsName: c[T], dbColumn: $[T] });
+  const A = 'type, namespace, entity, "branchId", "transactionId", "entityId", "inversePatch", patch', b = p ? `'${p}'` : "NULL", R = h || "main", m = `"${u}"."${i}_change_trigger_fn"`, y = `'${u}','${o}','${R}',${b}`, g = `
 -- 创建或替换触发器函数
-CREATE OR REPLACE FUNCTION ${E}()
+CREATE OR REPLACE FUNCTION ${m}()
 RETURNS TRIGGER AS $$
 DECLARE
   old_values JSONB;
@@ -1923,32 +1933,34 @@ DECLARE
 BEGIN
   -- INSERT 操作
   IF (TG_OP = 'INSERT') THEN
-    INSERT INTO ${s} (${$})
+    INSERT INTO ${s} (${A})
     VALUES (
       'INSERT',
-      ${m},
+      ${y},
       NEW.id,
       NULL,
-      jsonb_build_object(${_.map((y) => `'${y.jsName}', NEW."${y.dbColumn}"`).join(", ")})
+      jsonb_build_object(${E.map((T) => `'${T.jsName}', NEW."${T.dbColumn}"`).join(", ")})
     );
     RETURN NEW;
 
   -- UPDATE 操作
   ELSIF (TG_OP = 'UPDATE') THEN
     -- 只在字段真正变更时记录
-    IF (${_.map((y) => `OLD."${y.dbColumn}" IS DISTINCT FROM NEW."${y.dbColumn}"`).join(" OR ")}) THEN
-      -- 构建变更前的值 (inversePatch - 只包含变更的字段)
-      old_values := jsonb_build_object(${_.map((y) => `'${y.jsName}', CASE WHEN OLD."${y.dbColumn}" IS DISTINCT FROM NEW."${y.dbColumn}" THEN to_jsonb(OLD."${y.dbColumn}") ELSE NULL END`).join(", ")});
-      old_values := jsonb_strip_nulls(old_values);
+    IF (${E.map((T) => `OLD."${T.dbColumn}" IS DISTINCT FROM NEW."${T.dbColumn}"`).join(" OR ")}) THEN
+      -- 构建变更前的值 (inversePatch - 只包含变更的字段，保留 NULL 值)
+      old_values := '{}'::jsonb;
+      ${E.map((T) => `IF OLD."${T.dbColumn}" IS DISTINCT FROM NEW."${T.dbColumn}" THEN old_values := old_values || jsonb_build_object('${T.jsName}', to_jsonb(OLD."${T.dbColumn}")); END IF;`).join(`
+      `)}
 
-      -- 构建变更后的值 (patch - 只包含变更的字段)
-      new_values := jsonb_build_object(${_.map((y) => `'${y.jsName}', CASE WHEN OLD."${y.dbColumn}" IS DISTINCT FROM NEW."${y.dbColumn}" THEN to_jsonb(NEW."${y.dbColumn}") ELSE NULL END`).join(", ")});
-      new_values := jsonb_strip_nulls(new_values);
+      -- 构建变更后的值 (patch - 只包含变更的字段，保留 NULL 值)
+      new_values := '{}'::jsonb;
+      ${E.map((T) => `IF OLD."${T.dbColumn}" IS DISTINCT FROM NEW."${T.dbColumn}" THEN new_values := new_values || jsonb_build_object('${T.jsName}', to_jsonb(NEW."${T.dbColumn}")); END IF;`).join(`
+      `)}
 
-      INSERT INTO ${s} (${$})
+      INSERT INTO ${s} (${A})
       VALUES (
         'UPDATE',
-        ${m},
+        ${y},
         NEW.id,
         old_values,
         new_values
@@ -1958,12 +1970,12 @@ BEGIN
 
   -- DELETE 操作
   ELSIF (TG_OP = 'DELETE') THEN
-    INSERT INTO ${s} (${$})
+    INSERT INTO ${s} (${A})
     VALUES (
       'DELETE',
-      ${m},
+      ${y},
       OLD.id,
-      jsonb_build_object(${_.map((y) => `'${y.jsName}', OLD."${y.dbColumn}"`).join(", ")}),
+      jsonb_build_object(${E.map((T) => `'${T.jsName}', OLD."${T.dbColumn}"`).join(", ")}),
       NULL
     );
     RETURN OLD;
@@ -1971,15 +1983,15 @@ BEGIN
 
   RETURN NULL;
 END;
-$$ LANGUAGE plpgsql;`, R = `
+$$ LANGUAGE plpgsql;`, S = `
 -- 删除已存在的触发器
-DROP TRIGGER IF EXISTS ${p} ON ${n}`, I = `
+DROP TRIGGER IF EXISTS ${f} ON ${n}`, I = `
 -- 创建触发器 (监听 INSERT, UPDATE, DELETE)
-CREATE TRIGGER ${p}
+CREATE TRIGGER ${f}
   AFTER INSERT OR UPDATE OR DELETE ON ${n}
   FOR EACH ROW
-  EXECUTE FUNCTION ${E}()`;
-  return [g, R, I].join(`
+  EXECUTE FUNCTION ${m}()`;
+  return [g, S, I].join(`
 ---STATEMENT_SEPARATOR---
 `);
 }
@@ -1993,71 +2005,71 @@ const Ea = async (e, t, n) => {
     limit: 1
   })).length > 0)
     throw new x(`Branch ID (${t}) already exists`);
-  let i;
+  let o;
   if (n) {
     const c = await s.get(n);
     if (!c)
       throw new x(`Change ID (${n}) not found`);
     if (!c.branchId)
       throw new x(`Change record (${n}) has no branchId`);
-    i = await r.get(c.branchId);
+    o = await r.get(c.branchId);
   } else
-    i = (await r.find({
+    o = (await r.find({
       where: {
         combinator: "and",
         rules: [{ field: "activated", operator: "=", value: !0 }]
       },
       limit: 1
     }))[0];
-  if (!i)
+  if (!o)
     throw new x("Source branch not found");
   n || (n = (await s.find({
     where: {
       combinator: "and",
       rules: [
-        { field: "branchId", operator: "=", value: i.id },
+        { field: "branchId", operator: "=", value: o.id },
         { field: "revertChangeId", operator: "=", value: null }
       ]
     },
     orderBy: [{ field: "id", sort: "desc" }],
     limit: 1
   }))[0]?.id ?? null);
-  const o = new ne();
-  return o.id = t, o.activated = !1, o.local = !0, o.remote = !1, o.fromChangeId = n ?? null, o.parentId = i.id, await r.create(o);
+  const i = new re();
+  return i.id = t, i.activated = !1, i.local = !0, i.remote = !1, i.fromChangeId = n ?? null, i.parentId = o.id, await r.create(i);
 };
 function ma(e) {
-  const t = P(e), { tableName: n, namespace: r } = e, s = `"${n}_change_trigger"`, a = `"${r}"."${n}_change_trigger_fn"`, i = `DROP TRIGGER IF EXISTS ${s} ON ${t}`, o = `DROP FUNCTION IF EXISTS ${a}() CASCADE`;
-  return [i, o].join(`
+  const t = P(e), { tableName: n, namespace: r } = e, s = `"${n}_change_trigger"`, a = `"${r}"."${n}_change_trigger_fn"`, o = `DROP TRIGGER IF EXISTS ${s} ON ${t}`, i = `DROP FUNCTION IF EXISTS ${a}() CASCADE`;
+  return [o, i].join(`
 ---STATEMENT_SEPARATOR---
 `);
 }
 function Un(e) {
   const t = [];
   return e.rxdb.config.entities.forEach((n) => {
-    const r = D(n);
+    const r = C(n);
     r.log !== !1 && t.push(ma(r));
   }), t.join(`
 ---STATEMENT_SEPARATOR---
 `);
 }
-const He = (e, t, n, r = !1) => {
+const Ve = (e, t, n, r = !1) => {
   if (!n.rows || n.rows.length === 0)
     return [];
-  const s = D(t), a = [], i = e.rxdb.entityManager;
-  for (const o of n.rows) {
-    const c = Z(s, o), u = c.id;
-    let l;
-    if (i.hasEntityRef(t, u)) {
-      if (l = i.getEntityRef(t, u), s.computedPropertyMap.forEach((p, _) => {
-        _ in c && (l[_] = c[_]);
+  const s = C(t), a = [], o = e.rxdb.entityManager;
+  for (const i of n.rows) {
+    const c = ee(s, i), l = c.id;
+    let u;
+    if (o.hasEntityRef(t, l)) {
+      if (u = o.getEntityRef(t, l), s.computedPropertyMap.forEach((f, E) => {
+        E in c && (u[E] = c[E]);
       }), r) {
-        const p = J(l);
-        p.origin = { ...c }, Object.assign(l, c), p.local = !0, p.modified = !1;
+        const f = J(u);
+        f.origin = { ...c }, Object.assign(u, c), f.local = !0, f.modified = !1;
       }
     } else
-      l = i.createEntityRef(t, c);
-    const f = J(l);
-    f.local = !0, f.modified = !1, a.push(l);
+      u = o.createEntityRef(t, c);
+    const p = J(u);
+    p.local = !0, p.modified = !1, a.push(u);
   }
   return a;
 }, ya = (e, t, n) => {
@@ -2068,92 +2080,98 @@ const He = (e, t, n, r = !1) => {
       a.local = !1, a.removed = !0, a.modified = !1;
     }
   }
+}, X = (e, t) => {
+  if (!e) return null;
+  const n = { ...e };
+  for (const r of Object.keys(n)) {
+    const s = t.propertyMap.get(r);
+    s && (n[r] = ae(n[r], s));
+  }
+  return n;
 }, jn = (e, t) => {
-  const { deletes: n, inserts: r, updates: s } = t, a = { deletes: [], inserts: [], updates: [] }, i = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map();
-  for (const [f, p] of n.entries()) {
-    const [_, S, $] = Ae(f), A = `${_}:${S}`, b = i.get(A);
-    b ? b.add($) : i.set(A, /* @__PURE__ */ new Set([$]));
-    let E = o.get(A);
-    E || (E = /* @__PURE__ */ new Map(), o.set(A, E)), E.set($, {
-      patch: p.patch,
-      inversePatch: p.inversePatch
+  const { deletes: n, inserts: r, updates: s } = t, a = { deletes: [], inserts: [], updates: [] }, o = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map();
+  for (const [p, f] of n.entries()) {
+    const [E, $, A] = Re(p), b = `${E}:${$}`, R = o.get(b);
+    R ? R.add(A) : o.set(b, /* @__PURE__ */ new Set([A]));
+    let m = i.get(b);
+    m || (m = /* @__PURE__ */ new Map(), i.set(b, m));
+    const y = e.rxdb.schemaManager.getEntityMetadata($, E);
+    m.set(A, {
+      patch: y ? X(f.patch, y) : f.patch,
+      inversePatch: y ? X(f.inversePatch, y) : f.inversePatch
     });
   }
-  for (const [f, p] of i) {
-    const [_, S] = f.split(":"), $ = e.rxdb.schemaManager.getEntityMetadata(S, _), A = P($), b = $.propertyMap.get("id").type === "integer", E = Array.from(p), m = b ? `DELETE FROM ${A} WHERE id = ANY($1::integer[]);` : `DELETE FROM ${A} WHERE id = ANY($1);`;
+  for (const [p, f] of o) {
+    const [E, $] = p.split(":"), A = e.rxdb.schemaManager.getEntityMetadata($, E), b = P(A), R = A.propertyMap.get("id").type === "integer", m = Array.from(f), y = R ? `DELETE FROM ${b} WHERE id = ANY($1::integer[]);` : `DELETE FROM ${b} WHERE id = ANY($1);`;
     a.deletes.push({
-      metadata: $,
-      ids: p,
-      sql: m,
-      params: [E],
-      changes: o.get(f)
+      metadata: A,
+      ids: f,
+      sql: y,
+      params: [m],
+      changes: i.get(p)
     });
   }
-  const c = /* @__PURE__ */ new Map(), u = /* @__PURE__ */ new Map();
-  for (const [f, p] of r.entries()) {
-    const [_, S, $] = Ae(f), A = `${_}:${S}`, b = c.get(A), E = { ...p.patch, id: $ };
-    b ? b.push(E) : c.set(A, [E]);
-    let m = u.get(A);
-    m || (m = /* @__PURE__ */ new Map(), u.set(A, m)), m.set($, {
-      patch: p.patch,
-      inversePatch: p.inversePatch
+  const c = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map();
+  for (const [p, f] of r.entries()) {
+    const [E, $, A] = Re(p), b = `${E}:${$}`, R = c.get(b), m = { ...f.patch, id: A };
+    R ? R.push(m) : c.set(b, [m]);
+    let y = l.get(b);
+    y || (y = /* @__PURE__ */ new Map(), l.set(b, y));
+    const g = e.rxdb.schemaManager.getEntityMetadata($, E);
+    y.set(A, {
+      patch: g ? X(f.patch, g) : f.patch,
+      inversePatch: g ? X(f.inversePatch, g) : f.inversePatch
     });
   }
-  for (const [f, p] of c) {
-    const [_, S] = f.split(":"), $ = e.rxdb.schemaManager.getEntityMetadata(S, _), A = [];
-    p.forEach((E) => {
-      for (const [I, y] of $.propertyMap)
-        E[I] === void 0 && y.default !== void 0 && (typeof y.default == "function" ? E[I] = y.default() : E[I] = y.default);
-      const { sql: m, params: g } = In($, E, { returning: !1 }), R = m.replace(";", ga($));
-      A.push(nt(R, g));
+  for (const [p, f] of c) {
+    const [E, $] = p.split(":"), A = e.rxdb.schemaManager.getEntityMetadata($, E), b = [];
+    f.forEach((m) => {
+      for (const [I, T] of A.propertyMap)
+        m[I] === void 0 && T.default !== void 0 && (typeof T.default == "function" ? m[I] = T.default() : m[I] = T.default);
+      const { sql: y, params: g } = In(A, m, { returning: !1 }), S = y.replace(";", ga(A));
+      b.push(st(S, g));
     });
-    const b = A.join("---STATEMENT_SEPARATOR---");
+    const R = b.join("---STATEMENT_SEPARATOR---");
     a.inserts.push({
-      metadata: $,
-      ids: new Set(p.filter((E) => E != null).map((E) => E.id)),
-      sql: b,
+      metadata: A,
+      ids: new Set(f.filter((m) => m != null).map((m) => m.id)),
+      sql: R,
       params: [],
       // 已经内联到 SQL 中
-      changes: u.get(f)
+      changes: l.get(p)
     });
   }
-  const l = /* @__PURE__ */ new Map(), d = /* @__PURE__ */ new Map();
-  for (const [f, p] of s.entries()) {
-    const [_, S, $] = Ae(f), A = `${_}:${S}`, b = l.get(A), E = { ...p.patch, id: $ };
-    b ? b.push(E) : l.set(A, [E]);
-    let m = d.get(A);
-    m || (m = /* @__PURE__ */ new Map(), d.set(A, m));
-    const g = e.rxdb.schemaManager.getEntityMetadata(S, _), R = p.patch ? { ...p.patch } : null, I = p.inversePatch ? { ...p.inversePatch } : null;
-    g && (R && Object.keys(R).forEach((y) => {
-      const T = g.propertyMap.get(y);
-      T && (R[y] = Le(R[y], T));
-    }), I && Object.keys(I).forEach((y) => {
-      const T = g.propertyMap.get(y);
-      T && (I[y] = Le(I[y], T));
-    })), m.set($, {
-      patch: R,
-      inversePatch: I
+  const u = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map();
+  for (const [p, f] of s.entries()) {
+    const [E, $, A] = Re(p), b = `${E}:${$}`, R = u.get(b), m = { ...f.patch, id: A };
+    R ? R.push(m) : u.set(b, [m]);
+    let y = h.get(b);
+    y || (y = /* @__PURE__ */ new Map(), h.set(b, y));
+    const g = e.rxdb.schemaManager.getEntityMetadata($, E);
+    y.set(A, {
+      patch: g ? X(f.patch, g) : f.patch,
+      inversePatch: g ? X(f.inversePatch, g) : f.inversePatch
     });
   }
-  for (const [f, p] of l) {
-    const [_, S] = f.split(":"), $ = e.rxdb.schemaManager.getEntityMetadata(S, _), A = [];
-    p.forEach((E) => {
-      let m;
-      $.propertyMap.has("updatedAt") && (m = E.updatedAt);
-      const { id: g, ...R } = E, { sql: I, params: y } = ze($, { id: g }, R, {
-        updatedAt: m,
+  for (const [p, f] of u) {
+    const [E, $] = p.split(":"), A = e.rxdb.schemaManager.getEntityMetadata($, E), b = [];
+    f.forEach((m) => {
+      let y;
+      A.propertyMap.has("updatedAt") && (y = m.updatedAt);
+      const { id: g, ...S } = m, { sql: I, params: T } = Ze(A, { id: g }, S, {
+        updatedAt: y,
         returning: !1
       });
-      A.push(nt(I, y));
+      b.push(st(I, T));
     });
-    const b = A.join("---STATEMENT_SEPARATOR---");
+    const R = b.join("---STATEMENT_SEPARATOR---");
     a.updates.push({
-      metadata: $,
-      ids: new Set(p.filter((E) => E != null).map((E) => E.id)),
-      sql: b,
+      metadata: A,
+      ids: new Set(f.filter((m) => m != null).map((m) => m.id)),
+      sql: R,
       params: [],
       // 已经内联到 SQL 中
-      changes: d.get(f)
+      changes: h.get(p)
     });
   }
   return a;
@@ -2167,19 +2185,19 @@ function _a(e) {
 }
 const xn = (e, t) => {
   const n = [];
-  e.rxdb.config.entities.forEach((o) => {
-    const c = D(o);
+  e.rxdb.config.entities.forEach((i) => {
+    const c = C(i);
     if (c.log !== !1)
       try {
-        const u = $e(c, {
+        const l = be(c, {
           branchId: t
         });
-        u.trim() && n.push(u);
-      } catch (u) {
-        console.warn(`Failed to generate trigger SQL for entity ${c.name}:`, u);
+        l.trim() && n.push(l);
+      } catch (l) {
+        console.warn(`Failed to generate trigger SQL for entity ${c.name}:`, l);
       }
   });
-  const r = D(ne), s = P(r), a = t.replace(/'/g, "''"), i = `
+  const r = C(re), s = P(r), a = t.replace(/'/g, "''"), o = `
     UPDATE ${s}
     SET
       activated = CASE
@@ -2192,7 +2210,7 @@ const xn = (e, t) => {
       END
     WHERE id = '${a}' OR activated = TRUE
     RETURNING *`;
-  return n.push(i), n.join(`
+  return n.push(o), n.join(`
 ---STATEMENT_SEPARATOR---
 `);
 }, Ta = async (e, t) => {
@@ -2200,53 +2218,53 @@ const xn = (e, t) => {
   let a;
   try {
     await e.transaction(async () => {
-      const u = Un(e);
-      if (u) {
-        const l = u.split("---STATEMENT_SEPARATOR---").filter((d) => d.trim());
-        for (const d of l)
-          await e.query(d.trim());
+      const l = Un(e);
+      if (l) {
+        const u = l.split("---STATEMENT_SEPARATOR---").filter((h) => h.trim());
+        for (const h of u)
+          await e.query(h.trim());
       }
       if (s) {
         if (s.deletes.length)
-          for (const l of s.deletes)
-            l.params.length > 0 ? await e.query(l.sql, l.params) : await e.query(l.sql);
+          for (const u of s.deletes)
+            u.params.length > 0 ? await e.query(u.sql, u.params) : await e.query(u.sql);
         if (s.inserts.length)
-          for (const l of s.inserts)
-            l.successResults = await e.query(l.sql);
+          for (const u of s.inserts)
+            u.successResults = await e.query(u.sql);
         if (s.updates.length)
-          for (const l of s.updates)
-            l.successResults = await e.query(l.sql);
+          for (const u of s.updates)
+            u.successResults = await e.query(u.sql);
       }
       r?.updateRxDBChangeSequence !== void 0 && await e.setRxDBChangeSequence(r.updateRxDBChangeSequence);
     }, !1);
-    const o = xn(e, n).split("---STATEMENT_SEPARATOR---").filter((u) => u.trim());
-    for (const u of o) {
-      const l = await e.query(u.trim());
-      u.includes("RETURNING") && (a = l);
+    const i = xn(e, n).split("---STATEMENT_SEPARATOR---").filter((l) => l.trim());
+    for (const l of i) {
+      const u = await e.query(l.trim());
+      l.includes("RETURNING") && (a = u);
     }
-    const c = (u, l) => {
-      if (l.length === 0) return;
-      const d = l.map((f) => {
-        const p = { ...f };
+    const c = (l, u) => {
+      if (u.length === 0) return;
+      const h = u.map((p) => {
+        const f = { ...p };
         return {
-          namespace: u.namespace,
-          entity: u.name,
+          namespace: l.namespace,
+          entity: l.name,
           type: "UPDATE",
-          id: f.id,
-          patch: p,
-          inversePatch: p,
-          recordAt: f.createdAt
+          id: p.id,
+          patch: f,
+          inversePatch: f,
+          recordAt: p.createdAt
         };
       });
-      e.rxdb.dispatchEvent(new me(d));
+      e.rxdb.dispatchEvent(new ge(h));
     };
     if (a) {
-      const u = _a(a), l = He(e, ne, u, !0), d = D(ne);
-      c(d, l);
+      const l = _a(a), u = Ve(e, re, l, !0), h = C(re);
+      c(h, u);
     }
-    s && Bn(e, s);
-  } catch (i) {
-    throw new x(`switch branch ${n} failed: ` + i);
+    s && Fn(e, s);
+  } catch (o) {
+    throw new x(`switch branch ${n} failed: ` + o);
   }
 };
 async function wa(e, t, n, r = !1) {
@@ -2254,95 +2272,95 @@ async function wa(e, t, n, r = !1) {
     if (r) {
       const s = Un(e);
       if (s) {
-        const a = s.split("---STATEMENT_SEPARATOR---").filter((i) => i.trim());
-        for (const i of a)
-          await e.query(i.trim());
+        const a = s.split("---STATEMENT_SEPARATOR---").filter((o) => o.trim());
+        for (const o of a)
+          await e.query(o.trim());
       }
     }
     for (const s of t.deletes)
       s.params.length > 0 ? await e.query(s.sql, s.params) : await e.query(s.sql);
     for (const s of t.inserts) {
-      const a = s.sql.split("---STATEMENT_SEPARATOR---").filter((i) => i.trim());
-      for (const i of a)
-        await e.query(i.trim());
+      const a = s.sql.split("---STATEMENT_SEPARATOR---").filter((o) => o.trim());
+      for (const o of a)
+        await e.query(o.trim());
       s.successResults = { rows: [], affectedRows: a.length, fields: [] };
     }
     for (const s of t.updates) {
-      const a = s.sql.split("---STATEMENT_SEPARATOR---").filter((i) => i.trim());
-      for (const i of a)
-        await e.query(i.trim());
+      const a = s.sql.split("---STATEMENT_SEPARATOR---").filter((o) => o.trim());
+      for (const o of a)
+        await e.query(o.trim());
       s.successResults = { rows: [], affectedRows: a.length, fields: [] };
     }
   }, !1), r) {
-    const s = await e.rxdb.versionManager.getCurrentBranch(), i = xn(e, s.id).split("---STATEMENT_SEPARATOR---").filter((o) => o.trim());
-    for (const o of i)
-      await e.query(o.trim());
+    const s = await e.rxdb.versionManager.getCurrentBranch(), o = xn(e, s.id).split("---STATEMENT_SEPARATOR---").filter((i) => i.trim());
+    for (const i of o)
+      await e.query(i.trim());
   }
-  Bn(e, t);
+  Fn(e, t);
 }
-function Bn(e, t) {
+function Fn(e, t) {
   for (const n of t.deletes) {
-    const r = Re(n.metadata);
+    const r = Se(n.metadata);
     ya(e, r, Array.from(n.ids));
-    const s = n.metadata, a = Array.from(n.ids).map((i) => {
-      const o = n.changes.get(String(i));
+    const s = n.metadata, a = Array.from(n.ids).map((o) => {
+      const i = n.changes.get(String(o));
       return {
         namespace: s.namespace,
         entity: s.name,
         type: "DELETE",
-        id: i,
+        id: o,
         patch: null,
-        inversePatch: o?.inversePatch ?? null,
+        inversePatch: i?.inversePatch ?? null,
         recordAt: /* @__PURE__ */ new Date()
       };
     });
-    e.rxdb.dispatchEvent(new Ve(a));
+    e.rxdb.dispatchEvent(new Ke(a));
   }
   for (const n of t.inserts) {
-    const r = Re(n.metadata), s = bt(n.successResults), a = He(e, r, s), i = n.metadata, o = a.map((c) => {
-      const u = n.changes.get(String(c.id));
+    const r = Se(n.metadata), s = St(n.successResults), a = Ve(e, r, s), o = n.metadata, i = a.map((c) => {
+      const l = n.changes.get(String(c.id));
       return {
-        namespace: i.namespace,
-        entity: i.name,
+        namespace: o.namespace,
+        entity: o.name,
         type: "INSERT",
         id: c.id,
-        patch: u?.patch ?? { ...c },
-        inversePatch: u?.inversePatch ?? null,
+        patch: l?.patch ?? { ...c },
+        inversePatch: l?.inversePatch ?? null,
         recordAt: c.createdAt
       };
     });
-    e.rxdb.dispatchEvent(new oe(o));
+    e.rxdb.dispatchEvent(new ue(i));
   }
   for (const n of t.updates) {
-    const r = Re(n.metadata), s = bt(n.successResults), a = He(e, r, s, !0), i = n.metadata, o = a.map((c) => {
-      const u = n.changes.get(String(c.id));
+    const r = Se(n.metadata), s = St(n.successResults), a = Ve(e, r, s, !0), o = n.metadata, i = a.map((c) => {
+      const l = n.changes.get(String(c.id));
       return {
-        namespace: i.namespace,
-        entity: i.name,
+        namespace: o.namespace,
+        entity: o.name,
         type: "UPDATE",
         id: c.id,
-        patch: u?.patch ?? { ...c },
-        inversePatch: u?.inversePatch ?? null,
+        patch: l?.patch ?? { ...c },
+        inversePatch: l?.inversePatch ?? null,
         recordAt: c.updatedAt || c.createdAt || /* @__PURE__ */ new Date()
       };
     });
-    e.rxdb.dispatchEvent(new me(o));
+    e.rxdb.dispatchEvent(new ge(i));
   }
 }
-function bt(e) {
+function St(e) {
   return {
     rows: e.rows,
     rowsAffected: e.affectedRows ?? e.rows.length,
     elapsed: 0
   };
 }
-function St(e, t, n) {
+function It(e, t, n) {
   const r = [];
   return e.rxdb.config.entities.forEach((s) => {
-    const a = D(s);
+    const a = C(s);
     if (a.log !== !1) {
-      const o = $e(a, { branchId: t, transactionId: n }).split("---STATEMENT_SEPARATOR---").map((c) => c.trim()).filter((c) => c.length > 0);
-      r.push(...o);
+      const i = be(a, { branchId: t, transactionId: n }).split("---STATEMENT_SEPARATOR---").map((c) => c.trim()).filter((c) => c.length > 0);
+      r.push(...i);
     }
   }), r;
 }
@@ -2361,13 +2379,13 @@ class Ca extends kn {
   /** 仓库实例缓存，避免重复创建 */
   #s = /* @__PURE__ */ new Map();
   /** PGlite 客户端缓存 */
-  #i;
+  #o;
   /** 事务锁标志，防止事务嵌套 */
   #t = !1;
   /** 查询任务队列执行器，确保查询按顺序执行 */
   #r = new Vn(1);
   /** 客户端初始化 Promise，确保单例 */
-  #o;
+  #c;
   /** 当前活跃的事务对象 */
   #a;
   /** 适配器名称 */
@@ -2382,16 +2400,16 @@ class Ca extends kn {
    * @returns Observable<Map<string, string>> - id → updatedAt 映射
    */
   getMetadataByIds(t, n) {
-    return be(() => {
+    return Ie(() => {
       if (n.length === 0)
-        return Se(/* @__PURE__ */ new Map());
+        return Oe(/* @__PURE__ */ new Map());
       const a = `SELECT id, "updatedAt" FROM "public"."${this.rxdb.schemaManager.getEntityMetadata(t, "public")?.tableName ?? t}" WHERE id = ANY($1)`;
-      return Ie(this.internalQuery(a, [n])).pipe(
-        Yn((i) => {
-          const o = /* @__PURE__ */ new Map();
-          for (const c of i.rows)
-            o.set(c.id, c.updatedAt);
-          return o;
+      return De(this.internalQuery(a, [n])).pipe(
+        Yn((o) => {
+          const i = /* @__PURE__ */ new Map();
+          for (const c of o.rows)
+            i.set(c.id, c.updatedAt);
+          return i;
         })
       );
     });
@@ -2406,12 +2424,12 @@ class Ca extends kn {
    * @returns Observable<void>
    */
   upsertMany(t, n) {
-    return be(() => n.length === 0 ? Se(void 0) : Ie(
+    return Ie(() => n.length === 0 ? Oe(void 0) : De(
       (async () => {
-        const s = this.rxdb.schemaManager.getEntityMetadata(t, "public")?.tableName ?? t, a = Object.keys(n[0]), i = a.map((o) => `"${o}"`).join(", ");
-        for (const o of n) {
-          const c = a.map((f) => o[f]), u = a.map((f, p) => `$${p + 1}`).join(", "), l = a.filter((f) => f !== "id").map((f) => `"${f}" = EXCLUDED."${f}"`).join(", "), d = `INSERT INTO "public"."${s}" (${i}) VALUES (${u}) ON CONFLICT (id) DO UPDATE SET ${l}`;
-          await this.internalQuery(d, c);
+        const s = this.rxdb.schemaManager.getEntityMetadata(t, "public")?.tableName ?? t, a = Object.keys(n[0]), o = a.map((i) => `"${i}"`).join(", ");
+        for (const i of n) {
+          const c = a.map((p) => i[p]), l = a.map((p, f) => `$${f + 1}`).join(", "), u = a.filter((p) => p !== "id").map((p) => `"${p}" = EXCLUDED."${p}"`).join(", "), h = `INSERT INTO "public"."${s}" (${o}) VALUES (${l}) ON CONFLICT (id) DO UPDATE SET ${u}`;
+          await this.internalQuery(h, c);
         }
       })()
     ));
@@ -2424,11 +2442,11 @@ class Ca extends kn {
    * @returns Observable<void>
    */
   deleteByIds(t, n) {
-    return be(() => {
+    return Ie(() => {
       if (n.length === 0)
-        return Se(void 0);
+        return Oe(void 0);
       const a = `DELETE FROM "public"."${this.rxdb.schemaManager.getEntityMetadata(t, "public")?.tableName ?? t}" WHERE id = ANY($1)`;
-      return Ie(this.internalQuery(a, [n]).then(() => {
+      return De(this.internalQuery(a, [n]).then(() => {
       }));
     });
   }
@@ -2482,8 +2500,16 @@ class Ca extends kn {
    */
   async removeMany(t) {
     if (!t || t.length === 0) return Promise.resolve([]);
-    const n = D(t[0].constructor), r = Sn(n, t);
-    return await this.query(r), t;
+    const n = /* @__PURE__ */ new Map();
+    for (const r of t) {
+      const s = r.constructor;
+      n.has(s) || n.set(s, []), n.get(s).push(r);
+    }
+    for (const [r, s] of n) {
+      const a = C(r), o = Sn(a, s);
+      await this.query(o);
+    }
+    return t;
   }
   /**
    * 批量保存实体
@@ -2506,11 +2532,11 @@ class Ca extends kn {
     }
     const r = async () => {
       for (const [s, a] of n.entries()) {
-        const i = D(s), o = ue(i, a, this.rxdb.context);
-        await this.query(o);
+        const o = C(s), i = de(o, a, this.rxdb.context);
+        await this.query(i);
         for (const c of a) {
-          const u = J(c);
-          u.local = !0, u.modified = !1;
+          const l = J(c);
+          l.local = !0, l.modified = !1;
         }
       }
     };
@@ -2523,7 +2549,7 @@ class Ca extends kn {
    */
   async connect() {
     const t = await this.#n(), n = pa();
-    return await t.exec(n), t instanceof Rt && (t.addEventListener(K.INSERT, (r) => Ce(this, r)), t.addEventListener(K.UPDATE, (r) => Ce(this, r)), t.addEventListener(K.DELETE, (r) => Ce(this, r))), this;
+    return await t.exec(n), t instanceof Rt && (t.addEventListener(K.INSERT, (r) => Me(this, r)), t.addEventListener(K.UPDATE, (r) => Me(this, r)), t.addEventListener(K.DELETE, (r) => Me(this, r))), this;
   }
   /**
    * 断开数据库连接
@@ -2531,7 +2557,7 @@ class Ca extends kn {
    * 清理资源并发送销毁信号
    */
   async disconnect() {
-    this.#i && (await this.#i.disconnect(), this.#e.next(), this.#e.complete());
+    this.#o && (await this.#o.disconnect(), this.#e.next(), this.#e.complete());
   }
   /**
    * 创建分支
@@ -2595,7 +2621,7 @@ class Ca extends kn {
    */
   getRepository(t) {
     if (!this.#s.has(t)) {
-      const n = D(t);
+      const n = C(t);
       let r;
       switch (n.repository) {
         case "Repository":
@@ -2626,48 +2652,57 @@ class Ca extends kn {
    * @returns 是否成功创建
    */
   async createTables(t, n) {
-    const r = [], s = [];
+    const r = [], s = [], a = /* @__PURE__ */ new Set();
+    for (const i of t) {
+      const c = C(i);
+      c.namespace && c.namespace !== "public" && a.add(c.namespace);
+    }
+    if (a.size > 0) {
+      const i = Array.from(a).map((c) => `CREATE SCHEMA IF NOT EXISTS "${c}"`).join(`;
+`) + ";";
+      await this.#i(i);
+    }
     for (const i of t) {
-      const o = D(i), u = qn(this, o).split(/;\s*\n/).map((l) => l.trim()).filter((l) => l.length > 0 && !l.startsWith("--"));
-      for (const l of u)
-        l && (l.includes("ADD CONSTRAINT") && l.includes("FOREIGN KEY") ? r.push(l) : s.push(l));
+      const c = C(i), u = qn(this, c).split(/;\s*\n/).map((h) => h.trim()).filter((h) => h.length > 0 && !h.startsWith("--"));
+      for (const h of u)
+        h && (h.includes("ADD CONSTRAINT") && h.includes("FOREIGN KEY") ? r.push(h) : s.push(h));
     }
     if (s.length > 0) {
       const i = s.join(`;
 `) + ";";
-      await this.#c(i);
+      await this.#i(i);
     }
     if (r.length > 0) {
       const i = r.join(`;
 `) + ";";
       try {
-        await this.#c(i);
-      } catch (o) {
-        console.warn("Failed to add foreign key constraints:", o);
+        await this.#i(i);
+      } catch (c) {
+        console.warn("Failed to add foreign key constraints:", c);
       }
     }
     for (const i of t) {
-      const o = D(i);
-      if (o.log !== !1) {
-        const c = $e(o);
-        await this.#c(c.replace(/---STATEMENT_SEPARATOR---/g, ";"));
+      const c = C(i);
+      if (c.log !== !1) {
+        const l = be(c);
+        await this.#i(l.replace(/---STATEMENT_SEPARATOR---/g, ";"));
       }
     }
     if (n && n.length > 0) {
       const i = /* @__PURE__ */ new Map();
-      for (const o of n) {
-        const c = o.constructor;
-        i.has(c) || i.set(c, []), i.get(c).push(o);
+      for (const c of n) {
+        const l = c.constructor;
+        i.has(l) || i.set(l, []), i.get(l).push(c);
       }
-      for (const [o, c] of i) {
-        const u = D(o), l = ue(u, c, this.rxdb.context);
-        await this.#c(l);
+      for (const [c, l] of i) {
+        const u = C(c), h = de(u, l, this.rxdb.context);
+        await this.#i(h);
       }
     }
-    const a = ["rxdb_change", "rxdb_branch", "rxdb_migration"];
-    for (const i of a) {
-      const o = Pn(i);
-      await this.#c(o);
+    const o = ["rxdb_change", "rxdb_branch", "rxdb_migration"];
+    for (const i of o) {
+      const c = Pn(i);
+      await this.#i(c);
     }
     return !0;
   }
@@ -2678,7 +2713,7 @@ class Ca extends kn {
    * @returns 表是否存在
    */
   async isTableExisted(t) {
-    const n = D(t);
+    const n = C(t);
     return (await this.#l(
       `SELECT EXISTS (
         SELECT 1 FROM information_schema.tables
@@ -2694,7 +2729,7 @@ class Ca extends kn {
    * @returns 列信息数组
    */
   async getTableColumns(t) {
-    const n = D(t);
+    const n = C(t);
     return (await this.#l(
       `SELECT * FROM information_schema.columns
     WHERE table_schema = '${n.namespace}'
@@ -2708,7 +2743,7 @@ class Ca extends kn {
    * @returns 分支仓库实例
    */
   localRxDBBranch() {
-    return this.getRepository(ne);
+    return this.getRepository(re);
   }
   /**
    * 获取本地变更仓库
@@ -2716,7 +2751,7 @@ class Ca extends kn {
    * @returns 变更仓库实例
    */
   localRxDBChange() {
-    return this.getRepository(ie);
+    return this.getRepository(le);
   }
   /**
    * 执行事务
@@ -2736,19 +2771,19 @@ class Ca extends kn {
   async transaction(t, n = !0) {
     await this.rxdb.connect(this.name);
     const r = await this.#n(), s = n ? crypto.randomUUID() : void 0;
-    return await r.transaction(async (i) => {
-      if (this.#t = !0, this.#a = i, await i.query("SET CONSTRAINTS ALL DEFERRED"), n && s) {
-        const c = St(this, "main", s);
-        for (const u of c)
-          await i.query(u);
+    return await r.transaction(async (o) => {
+      if (this.#t = !0, this.#a = o, await o.query("SET CONSTRAINTS ALL DEFERRED"), n && s) {
+        const c = It(this, "main", s);
+        for (const l of c)
+          await o.query(l);
       }
-      const o = await t();
+      const i = await t();
       if (n && s) {
-        const c = St(this, "main");
-        for (const u of c)
-          await i.query(u);
+        const c = It(this, "main");
+        for (const l of c)
+          await o.query(l);
       }
-      return this.#a = void 0, this.#t = !1, o;
+      return this.#a = void 0, this.#t = !1, i;
     });
   }
   /**
@@ -2765,7 +2800,7 @@ class Ca extends kn {
   query(t, n) {
     return this.#t && this.#a ? this.#a.query(t, n) : this.#r.addTask(
       async () => (await this.rxdb.connect(this.name), (await this.#n()).query(t, n)),
-      Ot([t, n])
+      JSON.stringify([t, n])
     );
   }
   /**
@@ -2797,7 +2832,7 @@ class Ca extends kn {
    * @param options - 执行选项
    * @returns 执行结果数组
    */
-  async #c(t, n) {
+  async #i(t, n) {
     return (await this.#n()).exec(t, n);
   }
   /**
@@ -2808,11 +2843,11 @@ class Ca extends kn {
    * @returns PGlite 客户端 Promise
    */
   #n() {
-    if (!this.#o) {
+    if (!this.#c) {
       const t = new Rt();
-      this.#o = t.init(this.rxdb.config.dbName, this.options).then(() => (this.#i = t, t));
+      this.#c = t.init(this.rxdb.config.dbName, this.options).then(() => (this.#o = t, t));
     }
-    return this.#o;
+    return this.#c;
   }
 }
 class Na {
@@ -2839,13 +2874,13 @@ class Na {
    * @returns SQL 语句
    */
   generateBatchInsert(t, n, r) {
-    const s = this.escapeIdentifier(t), a = n.map((c) => this.escapeIdentifier(c)).join(", "), i = [];
-    let o = 1;
+    const s = this.escapeIdentifier(t), a = n.map((c) => this.escapeIdentifier(c)).join(", "), o = [];
+    let i = 1;
     for (let c = 0; c < r; c++) {
-      const u = n.map(() => this.getParameterPlaceholder(o++)).join(", ");
-      i.push(`(${u})`);
+      const l = n.map(() => this.getParameterPlaceholder(i++)).join(", ");
+      o.push(`(${l})`);
     }
-    return `INSERT INTO ${s} (${a}) VALUES ${i.join(", ")} ${this.getReturningClause()}`;
+    return `INSERT INTO ${s} (${a}) VALUES ${o.join(", ")} ${this.getReturningClause()}`;
   }
   /**
    * 生成批量更新 SQL（使用 UPDATE ... FROM 模式）
@@ -2855,18 +2890,18 @@ class Na {
    * @returns SQL 模板
    */
   generateBatchUpdate(t, n, r) {
-    const s = this.escapeIdentifier(t), a = this.escapeIdentifier(n), i = r.map((o) => `${this.escapeIdentifier(o)} = temp.${this.escapeIdentifier(o)}`).join(", ");
-    return `UPDATE ${s} SET ${i} FROM (VALUES ($1)) AS temp(${a}, ${r.join(", ")}) WHERE ${s}.${a} = temp.${a} ${this.getReturningClause()}`;
+    const s = this.escapeIdentifier(t), a = this.escapeIdentifier(n), o = r.map((i) => `${this.escapeIdentifier(i)} = temp.${this.escapeIdentifier(i)}`).join(", ");
+    return `UPDATE ${s} SET ${o} FROM (VALUES ($1)) AS temp(${a}, ${r.join(", ")}) WHERE ${s}.${a} = temp.${a} ${this.getReturningClause()}`;
   }
 }
 const La = new Na();
-function Ma(e, t, n) {
+function va(e, t, n) {
   let r = "";
   for (let s = 0; s < t.length; s++) {
-    const a = t[s], i = D(a), o = qn(e, i);
+    const a = t[s], o = C(a), i = qn(e, o);
     if (r += `
-` + o, i.log !== !1) {
-      const c = $e(i);
+` + i, o.log !== !1) {
+      const c = be(o);
       r += `
 ` + c;
     }
@@ -2874,13 +2909,13 @@ function Ma(e, t, n) {
   if (n && n.length > 0) {
     const s = /* @__PURE__ */ new Map();
     n.forEach((a) => {
-      const i = D(a);
-      s.has(i) || s.set(i, /* @__PURE__ */ new Set()), s.get(i).add(a);
+      const o = C(a);
+      s.has(o) || s.set(o, /* @__PURE__ */ new Set()), s.get(o).add(a);
     });
-    for (const [a, i] of s.entries()) {
-      const o = ue(a, Array.from(i), e.rxdb.context);
+    for (const [a, o] of s.entries()) {
+      const i = de(a, Array.from(o), e.rxdb.context);
       r += `
-` + o;
+` + i;
     }
   }
   return r;
@@ -2892,27 +2927,27 @@ export {
   Na as PostgreSQLDialect,
   Ca as RxDBAdapterPGlite,
   x as RxdbAdapterPGliteError,
-  Ma as create_tables_sql,
+  va as create_tables_sql,
   da as generateNotifyFunctionSQL,
   pa as generateNotifyInfrastructureSQL,
   Pn as generateNotifyTriggerSQL,
-  $e as generate_trigger_sql,
-  Z as getEntityObjectFromResult,
-  Je as getSqlValue,
-  nt as getSqlWithParams,
-  Ct as getTableColumnIndexName,
-  vt as getTableName,
+  be as generate_trigger_sql,
+  ee as getEntityObjectFromResult,
+  Ye as getSqlValue,
+  st as getSqlWithParams,
+  Lt as getTableColumnIndexName,
+  Dt as getTableName,
   P as getTableNameByMetadata,
-  Lt as normalizeCreateEntity,
+  vt as normalizeCreateEntity,
   zn as normalizeEntity,
   La as pgDialect,
   Da as removeNotifyTriggerSQL,
   Un as remove_all_triggers_sql,
   ma as remove_trigger_sql,
-  Dt as rxDBColumnTypeToPGliteType,
+  Ct as rxDBColumnTypeToPGliteType,
   Xn as rxDBColumnTypeToPGliteTypeIndexName,
-  st as transformEntityValuePGliteToJs,
-  Ke as transformEntityValueToSql,
-  tt as transformValueJsToPGlite,
-  Le as transformValuePGliteToJs
+  rt as transformEntityValuePGliteToJs,
+  Je as transformEntityValueToSql,
+  nt as transformValueJsToPGlite,
+  ae as transformValuePGliteToJs
 };