@effect-app/infra 4.0.0-beta.82 → 4.0.0-beta.84

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @effect-app/infra
 
+## 4.0.0-beta.84
+
+### Patch Changes
+
+- c80e781: Fix SQLite store namespace parameter ordering in filter queries. The `_namespace` placeholder was prepended to the WHERE clause but its value was appended to the end of the positional params array, causing it to bind to the wrong placeholder. PostgreSQL was unaffected (uses indexed `$N` placeholders).
+  - effect-app@4.0.0-beta.84
+
+## 4.0.0-beta.83
+
+### Patch Changes
+
+- d1fc90a: Strip `_etag` and `id` from the `data` JSON column in SQL store adapters (SQLite + PostgreSQL). These fields are already stored as dedicated columns and were redundantly duplicated inside the JSON blob. On read, `parseRow` now re-injects `id` from the row column. Backward compatible: existing rows with `_etag`/`id` in `data` continue to work as the column values take precedence.
+  - effect-app@4.0.0-beta.83
+
 ## 4.0.0-beta.82
 
 ### Minor Changes

package/dist/Store/SQL/Pg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pg.d.ts","sourceRoot":"","sources":["../../../src/Store/SQL/Pg.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAK/C,OAAO,EAA8C,KAAK,aAAa,EAAgC,UAAU,EAAE,MAAM,eAAe,CAAA;AAyRxI,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,wEAG9C"}
+{"version":3,"file":"Pg.d.ts","sourceRoot":"","sources":["../../../src/Store/SQL/Pg.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAK/C,OAAO,EAA8C,KAAK,aAAa,EAAgC,UAAU,EAAE,MAAM,eAAe,CAAA;AA2RxI,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,wEAG9C"}

package/dist/Store/SQL/Pg.js

@@ -8,9 +8,9 @@ import { storeId } from "../Memory.js";
 import { StoreMaker } from "../service.js";
 import { makeETag } from "../utils.js";
 import { buildWhereSQLQuery, logQuery, pgDialect } from "./query.js";
-const parseRow = (row, defaultValues) => {
+const parseRow = (row, idKey, defaultValues) => {
     const data = (typeof row.data === "string" ? JSON.parse(row.data) : row.data);
-    return { ...defaultValues, ...data, _etag: row._etag ?? undefined };
+    return { ...defaultValues, ...data, [idKey]: row.id, _etag: row._etag ?? undefined };
 };
 const parseSelectRow = (row, idKey, defaultValues) => {
     const result = { ...defaultValues };
@@ -46,13 +46,14 @@ function makePgStore({ prefix }) {
                 const toRow = (e) => {
                     const newE = makeETag(e);
                     const id = newE[idKey];
-                    const data = JSON.stringify(newE);
+                    const { _etag, [idKey]: _id, ...rest } = newE;
+                    const data = JSON.stringify(rest);
                     return { id, _etag: newE._etag, data, item: newE };
                 };
                 const exec = (query, params) => sql.unsafe(query, params).pipe(Effect.orDie);
                 const s = {
                     all: resolveNamespace.pipe(Effect.flatMap((ns) => exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = $1`, [ns])
-                        .pipe(Effect.map((rows) => rows.map((r) => parseRow(r, defaultValues))), Effect.withSpan("PgSQL.all [effect-app/infra/Store]", {
+                        .pipe(Effect.map((rows) => rows.map((r) => parseRow(r, idKey, defaultValues))), Effect.withSpan("PgSQL.all [effect-app/infra/Store]", {
                         attributes: {
                             "repository.table_name": tableName,
                             "repository.model_name": name,
@@ -64,7 +65,7 @@ function makePgStore({ prefix }) {
                         .pipe(Effect.map((rows) => {
                         const row = rows[0];
                         return row
-                            ? Option.some(parseRow(row, defaultValues))
+                            ? Option.some(parseRow(row, idKey, defaultValues))
                             : Option.none();
                     }), Effect.withSpan("PgSQL.find [effect-app/infra/Store]", {
                         attributes: { "repository.table_name": tableName, "repository.model_name": name, id }
@@ -92,7 +93,7 @@ function makePgStore({ prefix }) {
                                     };
                                 });
                             }
-                            return rows.map((r) => parseRow(r, defaultValues));
+                            return rows.map((r) => parseRow(r, idKey, defaultValues));
                         }))), Effect.withSpan("PgSQL.filter [effect-app/infra/Store]", {
                             attributes: { "repository.table_name": tableName, "repository.model_name": name }
                         }, { captureStackTrace: false }))));
@@ -171,4 +172,4 @@ export function PgStoreLayer(cfg) {
     return StoreMaker
         .toLayer(makePgStore(cfg));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Pg.js","sourceRoot":"","sources":["../../../src/Store/SQL/Pg.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAE,MAAM,EAA8B,MAAM,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAA;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAgG,UAAU,EAAE,MAAM,eAAe,CAAA;AACxI,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEpE,MAAM,QAAQ,GAAG,CACf,GAAwD,EACxD,aAA+B,EACA,EAAE;IACjC,MAAM,IAAI,GAAG,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAW,CAAA;IACvF,OAAO,EAAE,GAAG,aAAa,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,SAAS,EAAmC,CAAA;AACtG,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CACrB,GAA4B,EAC5B,KAAkB,EAClB,aAAsC,EACjC,EAAE;IACP,MAAM,MAAM,GAA4B,EAAE,GAAG,aAAa,EAAE,CAAA;IAC5D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACjB,MAAM,CAAC,KAAe,CAAC,GAAG,KAAK,CAAA;YAC/B,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;QACtB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QACrB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,SAAS,WAAW,CAAC,EAAE,MAAM,EAAiB;IAC5C,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAA;QACtC,OAAO;YACL,IAAI,EAAE,CACJ,IAAY,EACZ,KAAY,EACZ,IAA6C,EAC7C,MAA6B,EAC7B,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAElB,MAAM,SAAS,GAAG,GAAG,MAAM,GAAG,IAAI,EAAE,CAAA;gBACpC,MAAM,aAAa,GAAG,MAAM,EAAE,aAAa,IAAI,EAAE,CAAA;gBAEjD,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,cAAc;oBAC9C,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;oBAC3B,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;wBACjD,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,cAAe,CAAC,SAAS,CAAC,EAAE,CAAC;4BAClE,MAAM,IAAI,KAAK,CAAC,aAAa,SAAS,eAAe,CAAC,CAAA;wBACxD,CAAC;wBACD,OAAO,SAAS,CAAA;oBAClB,CAAC,CAAC,CAAC,CAAA;gBAEL,KAAK,CAAC,CAAC,GAAG;qBACP,MAAM,CACL,+BAA+B,SAAS,iIAAiI,CAC1K;qBACA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAErB,MAAM,KAAK,GAAG,CAAC,CAAK,EAAE,EAAE;oBACtB,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;oBACxB,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAW,CAAA;oBAChC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;oBACjC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;gBACrD,CAAC,CAAA;gBAED,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,MAA2B,EAAE,EAAE,CAC1D,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,MAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAErD,MAAM,CAAC,GAA0B;oBAC/B,GAAG,EAAE,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC/C,IAAI,CAAC,gCAAgC,SAAS,yBAAyB,EAAE,CAAC,EAAE,CAAC,CAAC;yBAC3E,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAE,IAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAU,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,EACrF,MAAM,CAAC,QAAQ,CAAC,oCAAoC,EAAE;wBACpD,UAAU,EAAE;4BACV,uBAAuB,EAAE,SAAS;4BAClC,uBAAuB,EAAE,IAAI;4BAC7B,sBAAsB,EAAE,EAAE;yBAC3B;qBACF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC,CACJ,CAAC;oBAEF,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CACX,gBAAgB,CAAC,IAAI,CAAC,MAAM;yBACzB,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CACd,IAAI,CAAC,gCAAgC,SAAS,qCAAqC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;yBAC3F,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;wBAClB,MAAM,GAAG,GAAI,IAAc,CAAC,CAAC,CAAC,CAAA;wBAC9B,OAAO,GAAG;4BACR,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAU,GAAG,EAAE,aAAa,CAAC,CAAC;4BACpD,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;oBACnB,CAAC,CAAC,EACF,MAAM,CAAC,QAAQ,CAAC,qCAAqC,EAAE;wBACrD,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE,EAAE,EAAE;qBACtF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC,CACJ,CAAC;oBAEN,MAAM,EAAE,CAAkC,CAAyB,EAAE,EAAE;wBACrE,MAAM,MAAM,GAAG,CAAC;6BACb,MAAM,CAAA;wBAET,OAAO,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CACjD,MAAM;6BACH,IAAI,CAAC,GAAG,EAAE;4BACT,MAAM,CAAC,GAAG,kBAAkB,CAC1B,SAAS,EACT,KAAK,EACL,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EACtE,SAAS,EACT,aAAa,EACb,CAAC,CAAC,MAEW,EACb,CAAC,CAAC,KAAsF,EACxF,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,KAAK,CACR,CAAA;4BACD,MAAM,aAAa,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;4BAChE,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;4BACxC,MAAM,KAAK,GAAG,QAAQ;gCACpB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,sBAAsB,aAAa,MAAM,CAAC;gCACnE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CACb,SAAS,SAAS,GAAG,EACrB,SAAS,SAAS,wBAAwB,aAAa,EAAE,CAC1D,CAAA;4BACH,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAA;wBAClD,CAAC,CAAC;6BACD,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CACxB,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;4BAClB,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;gCACb,OAAQ,IAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oCAC/B,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;oCAC7C,OAAO;wCACL,GAAG,MAAM,CAAC,IAAI,CACZ,aAAoB,EACpB,CAAC,CAAC,MAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAY,CAC1D;wCACD,GAAG,QAAQ;qCACP,CAAA;gCACR,CAAC,CAAC,CAAA;4BACJ,CAAC;4BACD,OAAQ,IAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAU,CAAC,EAAE,aAAa,CAAa,CAAC,CAAA;wBACpF,CAAC,CAAC,CACH,CACF,EACD,MAAM,CAAC,QAAQ,CAAC,uCAAuC,EAAE;4BACvD,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE;yBAClF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC,CACJ,CAAC,CAAA;oBACJ,CAAC;oBAED,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CACT,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC1C,MAAM;yBACH,GAAG,CAAC,QAAQ,CAAC;wBACZ,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;wBACpB,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;4BACZ,KAAK,CAAC,CAAC,IAAI,CACT,WAAW,SAAS,8EAA8E,EAClG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAC3C,CAAA;4BACD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,IAAI,CAC1B,sBAAsB,SAAS,qCAAqC,EACpE,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CACb,CAAA;4BACD,MAAM,OAAO,GAAI,QAAkB,CAAC,CAAC,CAAC,CAAA;4BACtC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,KAAK,KAAK,GAAG,CAAC,KAAK,EAAE,CAAC;gCAC5C,IAAI,OAAO,EAAE,CAAC;oCACZ,OAAO,KAAK,CAAC,CAAC,IAAI,8BAA8B,CAAC;wCAC/C,IAAI,EAAE,IAAI;wCACV,EAAE,EAAE,GAAG,CAAC,EAAE;wCACV,OAAO,EAAE,OAAO,CAAC,KAAK;wCACtB,KAAK,EAAE,CAAC,CAAC,KAAK;wCACd,IAAI,EAAE,GAAG;qCACV,CAAC,CAAA;gCACJ,CAAC;gCACD,OAAO,KAAK,CAAC,CAAC,IAAI,8BAA8B,CAAC;oCAC/C,IAAI,EAAE,IAAI;oCACV,EAAE,EAAE,GAAG,CAAC,EAAE;oCACV,OAAO,EAAE,EAAE;oCACX,KAAK,EAAE,CAAC,CAAC,KAAK;oCACd,IAAI,EAAE,GAAG;iCACV,CAAC,CAAA;4BACJ,CAAC;wBACH,CAAC;6BAAM,CAAC;4BACN,KAAK,CAAC,CAAC,IAAI,CACT,gBAAgB,SAAS,yDAAyD,EAClF,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CAClC,CAAA;wBACH,CAAC;wBACD,OAAO,GAAG,CAAC,IAAI,CAAA;oBACjB,CAAC,CAAC;yBACD,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,oCAAoC,EAAE;wBACpD,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;qBAChG,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC,CACJ,CAAC;oBAEJ,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAClB,GAAG;yBACA,eAAe,CACd,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CACvC;yBACA,IAAI,CACH,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAyC,CAAC,EAC5D,MAAM,CAAC,QAAQ,CAAC,yCAAyC,EAAE;wBACzD,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBAClF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC;oBAEL,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,GAAG;yBACA,eAAe,CACd,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CACvC;yBACA,IAAI,CACH,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAyC,CAAC,EAC5D,MAAM,CAAC,QAAQ,CAAC,wCAAwC,EAAE;wBACxD,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBAClF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC;oBAEL,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE;wBACnB,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;wBAC9D,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAA;wBAC1C,OAAO,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CACjD,IAAI,CACF,gBAAgB,SAAS,kBAAkB,YAAY,sBAAsB,aAAa,EAAE,EAC5F,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,CACb;6BACE,IAAI,CACH,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,QAAQ,CAAC,4CAA4C,EAAE;4BAC5D,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE;yBAClF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC,CACJ,CAAC,CAAA;oBACJ,CAAC;oBAED,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAClB,CAAC,CAAC,GAAG,CAAC,IAAI,CACR,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EACxB,MAAM,CAAC,QAAQ,CAAC,yCAAyC,EAAE;wBACzD,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBAClF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC;iBACJ,CAAA;gBAED,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,IAAI,CAC1B,gCAAgC,SAAS,yBAAyB,EAClE,CAAC,SAAS,CAAC,CACZ,CAAA;oBACD,MAAM,KAAK,GAAG,MAAM,CAAE,QAAkB,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;oBACtD,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;wBAChB,KAAK,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAA;wBACtD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,IAAI,CAAA;wBACzB,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CACzB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CACvC,CAAA;oBACH,CAAC;gBACH,CAAC;gBAED,OAAO,CAAC,CAAA;YACV,CAAC,CAAC;SACL,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAkB;IAC7C,OAAO,UAAU;SACd,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAA;AAC9B,CAAC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Pg.js","sourceRoot":"","sources":["../../../src/Store/SQL/Pg.ts"],"names":[],"mappings":"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"}

package/dist/Store/SQL.d.ts

@@ -1,4 +1,11 @@
 import { SqlClient } from "effect/unstable/sql";
-import { type StorageConfig, StoreMaker } from "./service.js";
+import type { FieldValues } from "../Model/filter/types.js";
+import { type PersistenceModelType, type StorageConfig, StoreMaker } from "./service.js";
+/** @internal */
+export declare const parseRow: <Encoded extends FieldValues>(row: {
+    id: string;
+    _etag: string | null;
+    data: string;
+}, idKey: PropertyKey, defaultValues: Partial<Encoded>) => PersistenceModelType<Encoded>;
 export declare function SQLiteStoreLayer(cfg: StorageConfig): import("effect/Layer").Layer<StoreMaker, never, SqlClient.SqlClient>;
 //# sourceMappingURL=SQL.d.ts.map

package/dist/Store/SQL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SQL.d.ts","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAK/C,OAAO,EAA8C,KAAK,aAAa,EAAgC,UAAU,EAAE,MAAM,cAAc,CAAA;AA0TvI,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,wEAGlD"}
+{"version":3,"file":"SQL.d.ts","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAG/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D,OAAO,EAAmB,KAAK,oBAAoB,EAAE,KAAK,aAAa,EAAgC,UAAU,EAAE,MAAM,cAAc,CAAA;AAIvI,gBAAgB;AAChB,eAAO,MAAM,QAAQ,GAAI,OAAO,SAAS,WAAW,EAClD,KAAK;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACvD,OAAO,WAAW,EAClB,eAAe,OAAO,CAAC,OAAO,CAAC,KAC9B,oBAAoB,CAAC,OAAO,CAG9B,CAAA;AA6SD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,wEAGlD"}

package/dist/Store/SQL.js

@@ -8,9 +8,10 @@ import { storeId } from "./Memory.js";
 import { StoreMaker } from "./service.js";
 import { buildWhereSQLQuery, logQuery, sqliteDialect } from "./SQL/query.js";
 import { makeETag } from "./utils.js";
-const parseRow = (row, defaultValues) => {
+/** @internal */
+export const parseRow = (row, idKey, defaultValues) => {
     const data = (typeof row.data === "string" ? JSON.parse(row.data) : row.data);
-    return { ...defaultValues, ...data, _etag: row._etag ?? undefined };
+    return { ...defaultValues, ...data, [idKey]: row.id, _etag: row._etag ?? undefined };
 };
 const parseSelectRow = (row, idKey, defaultValues) => {
     const result = { ...defaultValues };
@@ -54,13 +55,14 @@ function makeSQLStoreInt(dialect, jsonColumnType) {
                 const toRow = (e) => {
                     const newE = makeETag(e);
                     const id = newE[idKey];
-                    const data = JSON.stringify(newE);
+                    const { _etag, [idKey]: _id, ...rest } = newE;
+                    const data = JSON.stringify(rest);
                     return { id, _etag: newE._etag, data, item: newE };
                 };
                 const exec = (query, params) => sql.unsafe(query, params).pipe(Effect.orDie);
                 const s = {
                     all: resolveNamespace.pipe(Effect.flatMap((ns) => exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = ?`, [ns])
-                        .pipe(Effect.map((rows) => rows.map((r) => parseRow(r, defaultValues))), Effect.withSpan("SQL.all [effect-app/infra/Store]", {
+                        .pipe(Effect.map((rows) => rows.map((r) => parseRow(r, idKey, defaultValues))), Effect.withSpan("SQL.all [effect-app/infra/Store]", {
                         attributes: {
                             "repository.table_name": tableName,
                             "repository.model_name": name,
@@ -71,7 +73,7 @@ function makeSQLStoreInt(dialect, jsonColumnType) {
                         .pipe(Effect.map((rows) => {
                         const row = rows[0];
                         return row
-                            ? Option.some(parseRow(row, defaultValues))
+                            ? Option.some(parseRow(row, idKey, defaultValues))
                             : Option.none();
                     }), Effect.withSpan("SQL.find [effect-app/infra/Store]", {
                         attributes: { "repository.table_name": tableName, "repository.model_name": name, id }
@@ -88,26 +90,22 @@ function makeSQLStoreInt(dialect, jsonColumnType) {
                                 .order, f
                                 .skip, f
                                 .limit);
-                            const nsPlaceholder = dialect
-                                .placeholder(q
-                                .params
-                                .length + 1);
                             const hasWhere = q
                                 .sql
                                 .includes("WHERE");
                             const nsSql = hasWhere
                                 ? q
                                     .sql
-                                    .replace("WHERE", `WHERE _namespace = ${nsPlaceholder} AND`)
+                                    .replace("WHERE", `WHERE _namespace = ? AND`)
                                 : q
                                     .sql
-                                    .replace(`FROM "${tableName}"`, `FROM "${tableName}" WHERE _namespace = ${nsPlaceholder}`);
+                                    .replace(`FROM "${tableName}"`, `FROM "${tableName}" WHERE _namespace = ?`);
                             return {
                                 sql: nsSql,
                                 params: [
+                                    ns,
                                     ...q
-                                        .params,
-                                    ns
+                                        .params
                                 ]
                             };
                         })
@@ -122,7 +120,7 @@ function makeSQLStoreInt(dialect, jsonColumnType) {
                                     };
                                 });
                             }
-                            return rows.map((r) => parseRow(r, defaultValues));
+                            return rows.map((r) => parseRow(r, idKey, defaultValues));
                         }))), Effect.withSpan("SQL.filter [effect-app/infra/Store]", {
                             attributes: { "repository.table_name": tableName, "repository.model_name": name }
                         }, { captureStackTrace: false }))));
@@ -200,4 +198,4 @@ export function SQLiteStoreLayer(cfg) {
     return StoreMaker
         .toLayer(makeSQLStoreInt(sqliteDialect, "JSON")(cfg));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQL.js","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQL.js","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.82",
+  "version": "4.0.0-beta.84",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -13,7 +13,7 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "7.0.1",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.82"
+    "effect-app": "4.0.0-beta.84"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.2",

package/src/Store/SQL/Pg.ts

@@ -13,10 +13,11 @@ import { buildWhereSQLQuery, logQuery, pgDialect } from "./query.js"
 
 const parseRow = <Encoded extends FieldValues>(
   row: { id: string; _etag: string | null; data: unknown },
+  idKey: PropertyKey,
   defaultValues: Partial<Encoded>
 ): PersistenceModelType<Encoded> => {
   const data = (typeof row.data === "string" ? JSON.parse(row.data) : row.data) as object
-  return { ...defaultValues, ...data, _etag: row._etag ?? undefined } as PersistenceModelType<Encoded>
+  return { ...defaultValues, ...data, [idKey]: row.id, _etag: row._etag ?? undefined } as PersistenceModelType<Encoded>
 }
 
 const parseSelectRow = (
@@ -69,7 +70,8 @@ function makePgStore({ prefix }: StorageConfig) {
           const toRow = (e: PM) => {
             const newE = makeETag(e)
             const id = newE[idKey] as string
-            const data = JSON.stringify(newE)
+            const { _etag, [idKey]: _id, ...rest } = newE as any
+            const data = JSON.stringify(rest)
             return { id, _etag: newE._etag!, data, item: newE }
           }
 
@@ -80,7 +82,7 @@ function makePgStore({ prefix }: StorageConfig) {
             all: resolveNamespace.pipe(Effect.flatMap((ns) =>
               exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = $1`, [ns])
                 .pipe(
-                  Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, defaultValues))),
+                  Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
                   Effect.withSpan("PgSQL.all [effect-app/infra/Store]", {
                     attributes: {
                       "repository.table_name": tableName,
@@ -99,7 +101,7 @@ function makePgStore({ prefix }: StorageConfig) {
                       Effect.map((rows) => {
                         const row = (rows as any[])[0]
                         return row
-                          ? Option.some(parseRow<Encoded>(row, defaultValues))
+                          ? Option.some(parseRow<Encoded>(row, idKey, defaultValues))
                           : Option.none()
                       }),
                       Effect.withSpan("PgSQL.find [effect-app/infra/Store]", {
@@ -155,7 +157,7 @@ function makePgStore({ prefix }: StorageConfig) {
                               } as M
                             })
                           }
-                          return (rows as any[]).map((r) => parseRow<Encoded>(r, defaultValues) as any as M)
+                          return (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues) as any as M)
                         })
                       )
                     ),

package/src/Store/SQL.ts

@@ -11,12 +11,14 @@ import { type FilterArgs, type PersistenceModelType, type StorageConfig, type St
 import { buildWhereSQLQuery, logQuery, type SQLDialect, sqliteDialect } from "./SQL/query.js"
 import { makeETag } from "./utils.js"
 
-const parseRow = <Encoded extends FieldValues>(
+/** @internal */
+export const parseRow = <Encoded extends FieldValues>(
   row: { id: string; _etag: string | null; data: string },
+  idKey: PropertyKey,
   defaultValues: Partial<Encoded>
 ): PersistenceModelType<Encoded> => {
   const data = (typeof row.data === "string" ? JSON.parse(row.data) : row.data) as object
-  return { ...defaultValues, ...data, _etag: row._etag ?? undefined } as PersistenceModelType<Encoded>
+  return { ...defaultValues, ...data, [idKey]: row.id, _etag: row._etag ?? undefined } as PersistenceModelType<Encoded>
 }
 
 const parseSelectRow = <Encoded extends FieldValues>(
@@ -76,7 +78,8 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
             const toRow = (e: PM) => {
               const newE = makeETag(e)
               const id = newE[idKey] as string
-              const data = JSON.stringify(newE)
+              const { _etag, [idKey]: _id, ...rest } = newE as any
+              const data = JSON.stringify(rest)
               return { id, _etag: newE._etag!, data, item: newE }
             }
 
@@ -87,7 +90,7 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
               all: resolveNamespace.pipe(Effect.flatMap((ns) =>
                 exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = ?`, [ns])
                   .pipe(
-                    Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, defaultValues))),
+                    Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
                     Effect.withSpan("SQL.all [effect-app/infra/Store]", {
                       attributes: {
                         "repository.table_name": tableName,
@@ -105,7 +108,7 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
                       Effect.map((rows) => {
                         const row = (rows as any[])[0]
                         return row
-                          ? Option.some(parseRow<Encoded>(row, defaultValues))
+                          ? Option.some(parseRow<Encoded>(row, idKey, defaultValues))
                           : Option.none()
                       }),
                       Effect.withSpan("SQL.find [effect-app/infra/Store]", {
@@ -141,31 +144,25 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
                             f
                               .limit
                           )
-                          const nsPlaceholder = dialect
-                            .placeholder(
-                              q
-                                .params
-                                .length + 1
-                            )
                           const hasWhere = q
                             .sql
                             .includes("WHERE")
                           const nsSql = hasWhere
                             ? q
                               .sql
-                              .replace("WHERE", `WHERE _namespace = ${nsPlaceholder} AND`)
+                              .replace("WHERE", `WHERE _namespace = ? AND`)
                             : q
                               .sql
                               .replace(
                                 `FROM "${tableName}"`,
-                                `FROM "${tableName}" WHERE _namespace = ${nsPlaceholder}`
+                                `FROM "${tableName}" WHERE _namespace = ?`
                               )
                           return {
                             sql: nsSql,
                             params: [
+                              ns,
                               ...q
-                                .params,
-                              ns
+                                .params
                             ]
                           }
                         })
@@ -189,7 +186,9 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
                                     } as M
                                   })
                                 }
-                                return (rows as any[]).map((r) => parseRow<Encoded>(r, defaultValues) as any as M)
+                                return (rows as any[]).map((r) =>
+                                  parseRow<Encoded>(r, idKey, defaultValues) as any as M
+                                )
                               })
                             )
                           ),

package/test/sql-store.test.ts

@@ -2,7 +2,9 @@
 import type Sqlite from "better-sqlite3"
 import BetterSqlite from "better-sqlite3"
 import { describe, expect, it } from "vitest"
+import { parseRow } from "../src/Store/SQL.js"
 import { buildWhereSQLQuery, pgDialect, sqliteDialect } from "../src/Store/SQL/query.js"
+import { makeETag } from "../src/Store/utils.js"
 
 const query = (db: Sqlite.Database, sql: string, params: unknown[] = []) =>
   db.prepare(sql).all(...params as any[]) as any[]
@@ -309,14 +311,141 @@ describe("SQL Store (SQLite integration)", () => {
       db.exec(
         `CREATE TABLE IF NOT EXISTS "test_items" (id TEXT PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`
       )
-      db.prepare(`INSERT INTO "test_items" (id, _etag, data) VALUES (?, ?, ?)`)
-        .run("1", "etag1", JSON.stringify({ id: "1", name: "Alice", age: 30 }))
+      db
+        .prepare(`INSERT INTO "test_items" (id, _etag, data) VALUES (?, ?, ?)`)
+        .run("1", "etag1", JSON.stringify({ name: "Alice", age: 30 }))
 
       const rows = db.prepare(`SELECT * FROM "test_items"`).all()
       expect(rows.length).toBe(1)
       expect((rows[0] as any).id).toBe("1")
     }))
 
+  it("data column should not contain _etag or id", () =>
+    withDb((db) => {
+      db.exec(
+        `CREATE TABLE IF NOT EXISTS "test_clean" (id TEXT PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`
+      )
+      // Simulate what toRow now produces: data without id or _etag
+      const data = { name: "Alice", age: 30, tags: ["admin"] }
+      db
+        .prepare(`INSERT INTO "test_clean" (id, _etag, data) VALUES (?, ?, ?)`)
+        .run("1", "etag1", JSON.stringify(data))
+
+      const row = db.prepare(`SELECT * FROM "test_clean" WHERE id = ?`).get("1") as any
+      const parsed = JSON.parse(row.data) as any
+      expect(parsed).not.toHaveProperty("id")
+      expect(parsed).not.toHaveProperty("_etag")
+      expect(parsed.name).toBe("Alice")
+      expect(parsed.age).toBe(30)
+      expect(parsed.tags).toEqual(["admin"])
+      // id and _etag come from their own columns
+      expect(row.id).toBe("1")
+      expect(row._etag).toBe("etag1")
+    }))
+
+  it("backward compat: rows with id/_etag in data still work with queries", () =>
+    withDb((db) => {
+      db.exec(
+        `CREATE TABLE IF NOT EXISTS "test_compat" (id TEXT PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`
+      )
+      // Old format: id and _etag inside data
+      db
+        .prepare(`INSERT INTO "test_compat" (id, _etag, data) VALUES (?, ?, ?)`)
+        .run("1", "etag1", JSON.stringify({ id: "1", _etag: "old_etag", name: "Alice", age: 30 }))
+      // New format: id and _etag stripped from data
+      db
+        .prepare(`INSERT INTO "test_compat" (id, _etag, data) VALUES (?, ?, ?)`)
+        .run("2", "etag2", JSON.stringify({ name: "Bob", age: 25 }))
+
+      // Both should be queryable by name
+      const q1 = buildWhereSQLQuery(
+        sqliteDialect,
+        "id",
+        [{ t: "where", path: "name", op: "eq", value: "Alice" }],
+        "test_compat",
+        {}
+      )
+      const r1 = query(db, q1.sql, q1.params)
+      expect(r1.length).toBe(1)
+      expect((r1[0] as any).id).toBe("1")
+
+      const q2 = buildWhereSQLQuery(
+        sqliteDialect,
+        "id",
+        [{ t: "where", path: "name", op: "eq", value: "Bob" }],
+        "test_compat",
+        {}
+      )
+      const r2 = query(db, q2.sql, q2.params)
+      expect(r2.length).toBe(1)
+      expect((r2[0] as any).id).toBe("2")
+
+      // Both queryable by id column
+      const q3 = buildWhereSQLQuery(
+        sqliteDialect,
+        "id",
+        [{ t: "where", path: "id", op: "in", value: ["1", "2"] as any }],
+        "test_compat",
+        {}
+      )
+      expect(query(db, q3.sql, q3.params).length).toBe(2)
+    }))
+
+  it("queries work when data does not contain id", () =>
+    withDb((db) => {
+      db.exec(
+        `CREATE TABLE IF NOT EXISTS "test_noid" (id TEXT PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`
+      )
+      const people = [
+        { name: "Alice", age: 30 },
+        { name: "Bob", age: 25 },
+        { name: "Charlie", age: 35 }
+      ]
+      const insert = db.prepare(
+        `INSERT INTO "test_noid" (id, _etag, data) VALUES (?, ?, ?)`
+      )
+      people.forEach((p, i) => insert.run(String(i + 1), `etag_${i + 1}`, JSON.stringify(p)))
+
+      // Filter by field in data
+      const q1 = buildWhereSQLQuery(
+        sqliteDialect,
+        "id",
+        [{ t: "where", path: "age", op: "gt", value: 28 as any }],
+        "test_noid",
+        {}
+      )
+      expect(query(db, q1.sql, q1.params).length).toBe(2) // Alice(30), Charlie(35)
+
+      // Filter by id column
+      const q2 = buildWhereSQLQuery(
+        sqliteDialect,
+        "id",
+        [{ t: "where", path: "id", op: "eq", value: "2" }],
+        "test_noid",
+        {}
+      )
+      const r2 = query(db, q2.sql, q2.params)
+      expect(r2.length).toBe(1)
+      expect((r2[0] as any).id).toBe("2")
+      expect((JSON.parse((r2[0] as any).data) as any).name).toBe("Bob")
+
+      // Order + limit still works
+      const q3 = buildWhereSQLQuery(
+        sqliteDialect,
+        "id",
+        [],
+        "test_noid",
+        {},
+        undefined,
+        [{ key: "age", direction: "ASC" }] as any,
+        undefined,
+        2
+      )
+      const r3 = query(db, q3.sql, q3.params)
+      expect(r3.length).toBe(2)
+      expect((JSON.parse((r3[0] as any).data) as any).name).toBe("Bob") // youngest first
+    }))
+
   it("query builder generates valid SQL for SQLite", () =>
     withDb((db) => {
       db.exec(
@@ -334,45 +463,54 @@ describe("SQL Store (SQLite integration)", () => {
         `INSERT INTO "test_people" (id, _etag, data) VALUES (?, ?, ?)`
       )
       for (const p of people) {
-        insert.run(p.id, `etag_${p.id}`, JSON.stringify(p))
+        const { id, ...data } = p
+        insert.run(id, `etag_${id}`, JSON.stringify(data))
       }
 
       // Test eq
       const q1 = buildWhereSQLQuery(
-        sqliteDialect, "id",
+        sqliteDialect,
+        "id",
         [{ t: "where", path: "name", op: "eq", value: "Alice" }],
-        "test_people", {}
+        "test_people",
+        {}
       )
       expect(query(db, q1.sql, q1.params).length).toBe(1)
       expect((JSON.parse((query(db, q1.sql, q1.params)[0] as any).data) as any).name).toBe("Alice")
 
       // Test gt
       const q2 = buildWhereSQLQuery(
-        sqliteDialect, "id",
+        sqliteDialect,
+        "id",
         [{ t: "where", path: "age", op: "gt", value: 28 as any }],
-        "test_people", {}
+        "test_people",
+        {}
       )
       expect(query(db, q2.sql, q2.params).length).toBe(2)
 
       // Test OR
       const q3 = buildWhereSQLQuery(
-        sqliteDialect, "id",
+        sqliteDialect,
+        "id",
         [
           { t: "where", path: "name", op: "eq", value: "Alice" },
           { t: "or", path: "name", op: "eq", value: "Bob" }
         ],
-        "test_people", {}
+        "test_people",
+        {}
       )
       expect(query(db, q3.sql, q3.params).length).toBe(2)
 
       // Test AND
       const q4 = buildWhereSQLQuery(
-        sqliteDialect, "id",
+        sqliteDialect,
+        "id",
         [
           { t: "where", path: "name", op: "eq", value: "Alice" },
           { t: "and", path: "age", op: "gt", value: 25 as any }
         ],
-        "test_people", {}
+        "test_people",
+        {}
       )
       const r4 = query(db, q4.sql, q4.params)
       expect(r4.length).toBe(1)
@@ -380,25 +518,31 @@ describe("SQL Store (SQLite integration)", () => {
 
       // Test IN
       const q5 = buildWhereSQLQuery(
-        sqliteDialect, "id",
+        sqliteDialect,
+        "id",
         [{ t: "where", path: "id", op: "in", value: ["1", "3"] as any }],
-        "test_people", {}
+        "test_people",
+        {}
       )
       expect(query(db, q5.sql, q5.params).length).toBe(2)
 
       // Test contains (string)
       const q6 = buildWhereSQLQuery(
-        sqliteDialect, "id",
+        sqliteDialect,
+        "id",
         [{ t: "where", path: "name", op: "contains", value: "li" }],
-        "test_people", {}
+        "test_people",
+        {}
       )
       expect(query(db, q6.sql, q6.params).length).toBe(2) // Alice, Charlie
 
       // Test startsWith
       const q7 = buildWhereSQLQuery(
-        sqliteDialect, "id",
+        sqliteDialect,
+        "id",
         [{ t: "where", path: "name", op: "startsWith", value: "Al" }],
-        "test_people", {}
+        "test_people",
+        {}
       )
       const r7 = query(db, q7.sql, q7.params)
       expect(r7.length).toBe(1)
@@ -406,15 +550,18 @@ describe("SQL Store (SQLite integration)", () => {
 
       // Test includes (array)
       const q8 = buildWhereSQLQuery(
-        sqliteDialect, "id",
+        sqliteDialect,
+        "id",
         [{ t: "where", path: "tags", op: "includes", value: "admin" }],
-        "test_people", {}
+        "test_people",
+        {}
       )
       expect(query(db, q8.sql, q8.params).length).toBe(2) // Alice, Charlie
 
       // Test nested scope: where name = Alice OR (age > 30 AND name contains 'ar')
       const q9 = buildWhereSQLQuery(
-        sqliteDialect, "id",
+        sqliteDialect,
+        "id",
         [
           { t: "where", path: "name", op: "eq", value: "Alice" },
           {
@@ -426,19 +573,204 @@ describe("SQL Store (SQLite integration)", () => {
             relation: "some"
           }
         ],
-        "test_people", {}
+        "test_people",
+        {}
       )
       expect(query(db, q9.sql, q9.params).length).toBe(2) // Alice + Charlie
 
       // Test order + limit
       const q10 = buildWhereSQLQuery(
-        sqliteDialect, "id", [], "test_people", {},
+        sqliteDialect,
+        "id",
+        [],
+        "test_people",
+        {},
         undefined,
         [{ key: "age", direction: "DESC" }] as any,
-        undefined, 2
+        undefined,
+        2
       )
       const r10 = query(db, q10.sql, q10.params)
       expect(r10.length).toBe(2)
       expect((JSON.parse((r10[0] as any).data) as any).name).toBe("Charlie") // oldest first
     }))
+
+  it("namespace param is in correct position for SQLite positional placeholders", () =>
+    withDb((db) => {
+      db.exec(
+        `CREATE TABLE IF NOT EXISTS "test_ns" (id TEXT NOT NULL, _namespace TEXT NOT NULL DEFAULT 'primary', _etag TEXT, data JSON NOT NULL, PRIMARY KEY (id, _namespace))`
+      )
+      const insert = db.prepare(
+        `INSERT INTO "test_ns" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`
+      )
+      insert.run("1", "primary", "e1", JSON.stringify({ name: "Alice", role: "admin" }))
+      insert.run("2", "primary", "e2", JSON.stringify({ name: "Bob", role: "user" }))
+      insert.run("3", "other", "e3", JSON.stringify({ name: "Charlie", role: "admin" }))
+
+      // Build a filter query: role != 'deleted'
+      const q = buildWhereSQLQuery(
+        sqliteDialect,
+        "id",
+        [{ t: "where", path: "role", op: "neq", value: "deleted" }],
+        "test_ns",
+        {}
+      )
+
+      // Simulate what SQL.ts does: prepend _namespace = ? and put ns FIRST in params
+      const hasWhere = q.sql.includes("WHERE")
+      const nsSql = hasWhere
+        ? q.sql.replace("WHERE", `WHERE _namespace = ? AND`)
+        : q.sql.replace(`FROM "test_ns"`, `FROM "test_ns" WHERE _namespace = ?`)
+      const params = ["primary", ...q.params]
+
+      const results = query(db, nsSql, params)
+      // Should only get Alice and Bob (primary namespace), not Charlie (other namespace)
+      expect(results.length).toBe(2)
+      const names = results.map((r) => (JSON.parse((r as any).data) as any).name).sort()
+      expect(names).toEqual(["Alice", "Bob"])
+    }))
+})
+
+// --- toRow stripping and parseRow reconstruction tests ---
+
+describe("toRow strips _etag and id from data", () => {
+  // Replicate the toRow logic from SQL.ts to test in isolation
+  const toRow = <IdKey extends PropertyKey>(e: any, idKey: IdKey) => {
+    const newE = makeETag(e)
+    const id = newE[idKey] as string
+    const { _etag, [idKey]: _id, ...rest } = newE as any
+    const data = JSON.stringify(rest)
+    return { id, _etag: newE._etag!, data, item: newE }
+  }
+
+  it("data JSON does not contain _etag", () => {
+    const row = toRow({ id: "1", _etag: undefined, name: "Alice", age: 30 }, "id")
+    const parsed = JSON.parse(row.data) as any
+    expect(parsed).not.toHaveProperty("_etag")
+    expect(parsed.name).toBe("Alice")
+    expect(parsed.age).toBe(30)
+  })
+
+  it("data JSON does not contain id field", () => {
+    const row = toRow({ id: "1", _etag: undefined, name: "Alice" }, "id")
+    const parsed = JSON.parse(row.data) as any
+    expect(parsed).not.toHaveProperty("id")
+    expect(parsed.name).toBe("Alice")
+  })
+
+  it("data JSON does not contain custom idKey field", () => {
+    const row = toRow({ myId: "abc", _etag: undefined, name: "Bob" }, "myId")
+    const parsed = JSON.parse(row.data) as any
+    expect(parsed).not.toHaveProperty("myId")
+    expect(parsed.name).toBe("Bob")
+    expect(row.id).toBe("abc")
+  })
+
+  it("id and _etag are returned as separate fields", () => {
+    const row = toRow({ id: "1", _etag: undefined, name: "Alice" }, "id")
+    expect(row.id).toBe("1")
+    expect(typeof row._etag).toBe("string")
+    expect(row._etag.length).toBeGreaterThan(0)
+  })
+
+  it("item still contains all fields including _etag and id", () => {
+    const row = toRow({ id: "1", _etag: undefined, name: "Alice" }, "id")
+    expect(row.item.id).toBe("1")
+    expect(row.item._etag).toBe(row._etag)
+    expect(row.item.name).toBe("Alice")
+  })
+
+  it("preserves nested objects in data", () => {
+    const row = toRow({ id: "1", _etag: undefined, address: { city: "NYC", zip: "10001" } }, "id")
+    const parsed = JSON.parse(row.data) as any
+    expect(parsed.address).toEqual({ city: "NYC", zip: "10001" })
+    expect(parsed).not.toHaveProperty("id")
+    expect(parsed).not.toHaveProperty("_etag")
+  })
+})
+
+describe("parseRow reconstructs full object from row", () => {
+  it("re-injects id from row column using idKey", () => {
+    const result: any = parseRow(
+      { id: "42", _etag: "etag1", data: JSON.stringify({ name: "Alice", age: 30 }) },
+      "id",
+      {}
+    )
+    expect(result.id).toBe("42")
+    expect(result.name).toBe("Alice")
+    expect(result.age).toBe(30)
+    expect(result._etag).toBe("etag1")
+  })
+
+  it("re-injects custom idKey from row column", () => {
+    const result: any = parseRow(
+      { id: "abc", _etag: "etag2", data: JSON.stringify({ name: "Bob" }) },
+      "myId",
+      {}
+    )
+    expect(result.myId).toBe("abc")
+    expect(result.name).toBe("Bob")
+    expect(result._etag).toBe("etag2")
+  })
+
+  it("uses _etag from row column, not from data", () => {
+    const result: any = parseRow(
+      { id: "1", _etag: "column_etag", data: JSON.stringify({ _etag: "stale_data_etag", name: "Alice" }) },
+      "id",
+      {}
+    )
+    expect(result._etag).toBe("column_etag")
+  })
+
+  it("uses id from row column, not from data", () => {
+    const result: any = parseRow(
+      { id: "correct_id", _etag: "e1", data: JSON.stringify({ id: "wrong_id", name: "Alice" }) },
+      "id",
+      {}
+    )
+    expect(result.id).toBe("correct_id")
+  })
+
+  it("applies defaultValues for missing fields", () => {
+    const result: any = parseRow(
+      { id: "1", _etag: "e1", data: JSON.stringify({ name: "Alice" }) },
+      "id",
+      { status: "active", role: "user" }
+    )
+    expect(result.name).toBe("Alice")
+    expect(result.status).toBe("active")
+    expect(result.role).toBe("user")
+  })
+
+  it("data fields override defaultValues", () => {
+    const result: any = parseRow(
+      { id: "1", _etag: "e1", data: JSON.stringify({ name: "Alice", status: "inactive" }) },
+      "id",
+      { status: "active" }
+    )
+    expect(result.status).toBe("inactive")
+  })
+
+  it("handles null _etag from row", () => {
+    const result: any = parseRow(
+      { id: "1", _etag: null, data: JSON.stringify({ name: "Alice" }) },
+      "id",
+      {}
+    )
+    expect(result._etag).toBeUndefined()
+  })
+
+  it("round-trip: toRow then parseRow reconstructs the original", () => {
+    const original = { id: "1", _etag: undefined as string | undefined, name: "Alice", age: 30, tags: ["admin"] }
+    const newE = makeETag(original)
+    const { _etag, id: _id, ...rest } = newE as any
+    const row = { id: newE.id, _etag: newE._etag!, data: JSON.stringify(rest) }
+
+    const reconstructed: any = parseRow(row, "id", {})
+    expect(reconstructed.id).toBe("1")
+    expect(reconstructed.name).toBe("Alice")
+    expect(reconstructed.age).toBe(30)
+    expect(reconstructed.tags).toEqual(["admin"])
+    expect(reconstructed._etag).toBe(newE._etag)
+  })
 })