@saltcorn/db-common 0.6.1-beta.2 → 0.6.2-beta.1

package/index.js

@@ -14,4 +14,3 @@
  * 
  * @category db-common
  */
-

package/internal.js

@@ -13,7 +13,9 @@ const { contract, is } = require("contractis");
  * @param {string} nm
  * @returns {string}
  */
-const sqlsanitize = contract(is.fun(is.str, is.str), (nm) => {
+const sqlsanitize = contract(is.fun(is.or(is.str, is.any), is.str), (nm) => {
+  if (typeof nm === "symbol") return sqlsanitize(nm.description);
+
   const s = nm.replace(/[^A-Za-z_0-9]*/g, "");
   if (s[0] >= "0" && s[0] <= "9") return `_${s}`;
   else return s;
@@ -27,11 +29,15 @@ const sqlsanitize = contract(is.fun(is.str, is.str), (nm) => {
  * @param {string} nm
  * @returns {string}
  */
-const sqlsanitizeAllowDots = contract(is.fun(is.str, is.str), (nm) => {
-  const s = nm.replace(/[^A-Za-z_0-9."]*/g, "");
-  if (s[0] >= "0" && s[0] <= "9") return `_${s}`;
-  else return s;
-});
+const sqlsanitizeAllowDots = contract(
+  is.fun(is.or(is.str, is.any), is.str),
+  (nm) => {
+    if (typeof nm === "symbol") return sqlsanitizeAllowDots(s.description);
+    const s = nm.replace(/[^A-Za-z_0-9."]*/g, "");
+    if (s[0] >= "0" && s[0] <= "9") return `_${s}`;
+    else return s;
+  }
+);
 /**
  *
  * @param {object} v
@@ -130,7 +136,26 @@ const whereOr = (is_sqlite, i) => (ors) =>
       )
       .join(" or ")
   );
+const equals = ([v1, v2], is_sqlite, i) => {
+  const pVal = (v) =>
+    typeof v === "symbol"
+      ? quote(sqlsanitizeAllowDots(v.description))
+      : placeHolder(is_sqlite, i()) + (typeof v === "string" ? "::text" : "");
+  const isNull = (v) => `${pVal(v)} is null`;
+  if (v1 === null && v2 === null) return "null is null";
+  if (v1 === null) return isNull(v2);
+  if (v2 === null) return isNull(v1);
+  return `${pVal(v1)}=${pVal(v2)}`;
+};
+const equalsVals = (vs) => {
+  let vals = [];
 
+  vs.forEach((v) => {
+    if (v !== null && typeof v !== "symbol") vals.push(v);
+  });
+  //console.log({ vals });
+  return vals;
+};
 /**
  * @param {boolean} is_sqlite
  * @param {string} i
@@ -149,6 +174,8 @@ const whereClause = (is_sqlite, i) => ([k, v]) =>
     ? `not (${Object.entries(v)
         .map((kv) => whereClause(is_sqlite, i)(kv))
         .join(" and ")})`
+    : k === "eq" && Array.isArray(v)
+    ? equals(v, is_sqlite, i)
     : v && v.or && Array.isArray(v.or)
     ? wrapParens(
         v.or.map((vi) => whereClause(is_sqlite, i)([k, vi])).join(" or ")
@@ -184,7 +211,13 @@ const whereClause = (is_sqlite, i) => ([k, v]) =>
         )}'=${placeHolder(is_sqlite, i())}`
     : v === null
     ? `${quote(sqlsanitizeAllowDots(k))} is null`
-    : `${quote(sqlsanitizeAllowDots(k))}=${placeHolder(is_sqlite, i())}`;
+    : k === "not"
+    ? `not (${
+        typeof v === "symbol" ? v.description : placeHolder(is_sqlite, i())
+      })`
+    : `${quote(sqlsanitizeAllowDots(k))}=${
+        typeof v === "symbol" ? v.description : placeHolder(is_sqlite, i())
+      }`;
 
 /**
  * @param {object[]} opts
@@ -199,8 +232,13 @@ const getVal = ([k, v]) =>
     ? [v.in]
     : k === "not" && typeof v === "object"
     ? Object.entries(v).map(getVal).flat(1)
+    : k === "eq" && Array.isArray(v)
+    ? equalsVals(v).flat(1)
     : k === "or" && Array.isArray(v)
-    ? v.map((vi) => Object.entries(vi).map(getVal)).flat(1)
+    ? v
+        .map((vi) => Object.entries(vi).map(getVal))
+        .flat(1)
+        .flat(1)
     : v && v.or && Array.isArray(v.or)
     ? v.or.map((vi) => getVal([k, vi])).flat(1)
     : Array.isArray(v)
@@ -217,6 +255,8 @@ const getVal = ([k, v]) =>
     ? null
     : typeof (v || {}).json !== "undefined"
     ? v.json[1]
+    : typeof v === "symbol"
+    ? null
     : v;
 
 /**

package/internal.test.js

@@ -4,12 +4,18 @@ describe("sqlsanitize", () => {
   it("should not alter valid name", () => {
     expect(sqlsanitize("ffoo_oo")).toBe("ffoo_oo");
   });
+  it("should not alter valid symbol", () => {
+    expect(sqlsanitize(Symbol("ffoo_oo"))).toBe("ffoo_oo");
+  });
   it("should remove spaces", () => {
     expect(sqlsanitize(" ")).toBe("");
   });
   it("should remove chars from invalid name", () => {
     expect(sqlsanitize("ffoo--oo--uu")).toBe("ffoooouu");
   });
+  it("should remove chars from invalid symbol", () => {
+    expect(sqlsanitize(Symbol("ffoo--oo--uu"))).toBe("ffoooouu");
+  });
   it("should not allow dots", () => {
     expect(sqlsanitize("ffoo.oo")).toBe("ffoooo");
   });
@@ -51,6 +57,32 @@ describe("mkWhere", () => {
       where: 'where "id"=$1 and "hello"=$2',
     });
   });
+  it("should read eq", () => {
+    expect(mkWhere({ eq: [Symbol("id"), 5] })).toStrictEqual({
+      values: [5],
+      where: 'where "id"=$1',
+    });
+    expect(mkWhere({ eq: [Symbol("id"), null] })).toStrictEqual({
+      values: [],
+      where: 'where "id" is null',
+    });
+    expect(mkWhere({ eq: ["id", null] })).toStrictEqual({
+      values: ["id"],
+      where: "where $1::text is null",
+    });
+    expect(mkWhere({ eq: [4, 5] })).toStrictEqual({
+      values: [4, 5],
+      where: "where $1=$2",
+    });
+    expect(mkWhere({ eq: [null, 5] })).toStrictEqual({
+      values: [5],
+      where: "where $1 is null",
+    });
+    expect(mkWhere({ not: { eq: [Symbol("id"), 5] } })).toStrictEqual({
+      values: [5],
+      where: 'where not ("id"=$1)',
+    });
+  });
   it("should query null", () => {
     expect(mkWhere({ id: null })).toStrictEqual({
       values: [],
@@ -140,8 +172,20 @@ describe("mkWhere", () => {
       values: [[1, 2, 3]],
       where: 'where "y" = ANY ($1)',
     });
+    expect(
+      mkWhere({
+        or: [
+          { not: { eq: ["1", null] } },
+          { not: { eq: [null, null] }, married_to: null },
+        ],
+      })
+    ).toStrictEqual({
+      values: ["1"],
+      where:
+        'where (not ($1::text is null) or not (null is null) and "married_to" is null)',
+    });
     /*
-    TODO
+
     expect(mkWhere([{ id: 5 }, { x: 7 }])).toStrictEqual({
       values: [5, 7],
       where: 'where "id"=$1 and "x"=$2',

package/package.json

@@ -1,16 +1,18 @@
 {
   "name": "@saltcorn/db-common",
-  "version": "0.6.1-beta.2",
+  "version": "0.6.2-beta.1",
   "description": "Db common structures for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "scripts": {
-    "test": "jest --runInBand"
+    "test": "jest --runInBand",
+    "tsc": "echo \"Error: no TypeScript support yet\"",
+    "clean": "echo \"Error: no TypeScript support yet\""
   },
   "author": "Tom Nielsen",
   "license": "MIT",
   "main": "index.js",
   "dependencies": {
-    "@saltcorn/markup": "0.6.1-beta.2",
+    "@saltcorn/markup": "0.6.2-beta.1",
     "contractis": "^0.1.0"
   },
   "devDependencies": {