@effect-app/infra 4.0.0-beta.87 → 4.0.0-beta.89

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @effect-app/infra
 
+## 4.0.0-beta.89
+
+### Patch Changes
+
+- 9a9e46c: Fix SQL select queries to read `_etag` from column instead of JSON data, preventing INSERT on update.
+  - effect-app@4.0.0-beta.89
+
+## 4.0.0-beta.88
+
+### Patch Changes
+
+- dfd5562: Fix SQL `IN`/`NOT IN` with null values to use `IS NULL`/`IS NOT NULL` instead of `IN (NULL, ...)`.
+  - effect-app@4.0.0-beta.88
+
 ## 4.0.0-beta.87
 
 ### Patch Changes

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

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/Store/SQL/query.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAG/D,OAAO,KAAK,EAAW,YAAY,EAAO,MAAM,iCAAiC,CAAA;AAGjF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9C,QAAQ,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IAClD,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;IAC/C,QAAQ,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAC/E,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAClF,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IAC9F,QAAQ,CAAC,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IACjG,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IAC9F,QAAQ,CAAC,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IACjG,QAAQ,CAAC,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9E,QAAQ,CAAC,sBAAsB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IACjF,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;CAC/C;AAED,eAAO,MAAM,aAAa,EAAE,UAqB3B,CAAA;AAED,eAAO,MAAM,SAAS,EAAE,UA2DvB,CAAA;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,qCAO7D;AAQD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,UAAU,EACnB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,MAAM,CAAC,EAAE,qBAAqB,CAAC,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC,EACpF,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC,EACzE,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;EAqPf"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/Store/SQL/query.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAG/D,OAAO,KAAK,EAAW,YAAY,EAAO,MAAM,iCAAiC,CAAA;AAGjF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9C,QAAQ,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IAClD,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;IAC/C,QAAQ,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAC/E,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAClF,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IAC9F,QAAQ,CAAC,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IACjG,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IAC9F,QAAQ,CAAC,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IACjG,QAAQ,CAAC,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9E,QAAQ,CAAC,sBAAsB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IACjF,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;CAC/C;AAED,eAAO,MAAM,aAAa,EAAE,UAqB3B,CAAA;AAED,eAAO,MAAM,SAAS,EAAE,UA2DvB,CAAA;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,qCAO7D;AAQD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,UAAU,EACnB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,MAAM,CAAC,EAAE,qBAAqB,CAAC,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC,EACpF,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC,EACzE,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;EAoQf"}

package/dist/Store/SQL/query.js

@@ -120,13 +120,29 @@ export function buildWhereSQLQuery(dialect, idKey, filter, tableName, defaultVal
         switch (x.op) {
             case "in": {
                 const vals = x.value;
-                const placeholders = vals.map((v) => addParam(v));
-                return `${k} IN (${placeholders.join(", ")})`;
+                const hasNull = vals.some((v) => v == null);
+                const nonNullVals = vals.filter((v) => v != null);
+                const parts = [];
+                if (nonNullVals.length > 0) {
+                    const placeholders = nonNullVals.map((v) => addParam(v));
+                    parts.push(`${k} IN (${placeholders.join(", ")})`);
+                }
+                if (hasNull)
+                    parts.push(`${k} IS NULL`);
+                return parts.length > 1 ? `(${parts.join(" OR ")})` : parts[0] ?? "1=0";
             }
             case "notIn": {
                 const vals = x.value;
-                const placeholders = vals.map((v) => addParam(v));
-                return `${k} NOT IN (${placeholders.join(", ")})`;
+                const hasNull = vals.some((v) => v == null);
+                const nonNullVals = vals.filter((v) => v != null);
+                const parts = [];
+                if (nonNullVals.length > 0) {
+                    const placeholders = nonNullVals.map((v) => addParam(v));
+                    parts.push(`${k} NOT IN (${placeholders.join(", ")})`);
+                }
+                if (hasNull)
+                    parts.push(`${k} IS NOT NULL`);
+                return parts.length > 1 ? `(${parts.join(" AND ")})` : parts[0] ?? "1=1";
             }
             case "includes": {
                 const arrPath = dottedToJsonPath(resolvedPath);
@@ -310,6 +326,8 @@ export function buildWhereSQLQuery(dialect, idKey, filter, tableName, defaultVal
             if (typeof s === "string") {
                 if (s === idKey || s === "id")
                     return `id`;
+                if (s === "_etag")
+                    return `_etag`;
                 return `${dialect.jsonExtractJson(s)} AS "${s}"`;
             }
             return `${dialect.jsonExtractJson(s.key)} AS "${s.key}"`;
@@ -328,4 +346,4 @@ export function buildWhereSQLQuery(dialect, idKey, filter, tableName, defaultVal
     const sql = `SELECT ${getSelectExpr()} FROM "${tableName}" ${whereClause} ${orderClause} ${limitClause}`.trim();
     return { sql, params };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/Store/SQL/query.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/Store/SQL/query.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.87",
+  "version": "4.0.0-beta.89",
   "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.87"
+    "effect-app": "4.0.0-beta.89"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.2",

package/src/Store/SQL/query.ts

@@ -161,13 +161,27 @@ export function buildWhereSQLQuery(
     switch (x.op) {
       case "in": {
         const vals = x.value as unknown as readonly unknown[]
-        const placeholders = vals.map((v) => addParam(v))
-        return `${k} IN (${placeholders.join(", ")})`
+        const hasNull = vals.some((v) => v == null)
+        const nonNullVals = vals.filter((v) => v != null)
+        const parts: string[] = []
+        if (nonNullVals.length > 0) {
+          const placeholders = nonNullVals.map((v) => addParam(v))
+          parts.push(`${k} IN (${placeholders.join(", ")})`)
+        }
+        if (hasNull) parts.push(`${k} IS NULL`)
+        return parts.length > 1 ? `(${parts.join(" OR ")})` : parts[0] ?? "1=0"
       }
       case "notIn": {
         const vals = x.value as unknown as readonly unknown[]
-        const placeholders = vals.map((v) => addParam(v))
-        return `${k} NOT IN (${placeholders.join(", ")})`
+        const hasNull = vals.some((v) => v == null)
+        const nonNullVals = vals.filter((v) => v != null)
+        const parts: string[] = []
+        if (nonNullVals.length > 0) {
+          const placeholders = nonNullVals.map((v) => addParam(v))
+          parts.push(`${k} NOT IN (${placeholders.join(", ")})`)
+        }
+        if (hasNull) parts.push(`${k} IS NOT NULL`)
+        return parts.length > 1 ? `(${parts.join(" AND ")})` : parts[0] ?? "1=1"
       }
 
       case "includes": {
@@ -352,6 +366,7 @@ export function buildWhereSQLQuery(
     const fields = select.map((s) => {
       if (typeof s === "string") {
         if (s === idKey || s === "id") return `id`
+        if (s === "_etag") return `_etag`
         return `${dialect.jsonExtractJson(s)} AS "${s}"`
       }
       return `${dialect.jsonExtractJson(s.key)} AS "${s.key}"`