@saltcorn/db-common 1.6.3-beta.1 → 1.7.0-alpha.1

package/dist/internal.js

@@ -1,25 +1,8 @@
-"use strict";
 /**
  * @category db-common
  * @module internal
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dbCommonModulePath = exports.sqlBinOp = exports.sqlFun = exports.prefixFieldsInWhere = exports.mkSelectOptions = exports.orderByIsOperator = exports.orderByIsObject = exports.mkWhere = exports.subSelectWhere = exports.ftsFieldsSqlExpr = exports.sqlsanitizeAllowDots = exports.sqlsanitize = void 0;
-__exportStar(require("./dbtypes"), exports);
+export * from "./dbtypes.js";
 //https://stackoverflow.com/questions/15300704/regex-with-my-jquery-function-for-sql-variable-name-validation
 /**
  * Transform value to correct sql name.
@@ -28,9 +11,9 @@ __exportStar(require("./dbtypes"), exports);
  * @param {string} nm
  * @returns {string}
  */
-const sqlsanitize = (nm) => {
+export const sqlsanitize = (nm) => {
     if (typeof nm === "symbol") {
-        return nm.description ? (0, exports.sqlsanitize)(nm.description) : "";
+        return nm.description ? sqlsanitize(nm.description) : "";
     }
     // https://stackoverflow.com/a/70273329/19839414
     // \p{Letter}/u
@@ -40,7 +23,6 @@ const sqlsanitize = (nm) => {
     else
         return s;
 };
-exports.sqlsanitize = sqlsanitize;
 /**
  * Transform value to correct sql name.
  * Instead of sqlsanitize also allows .
@@ -50,9 +32,9 @@ exports.sqlsanitize = sqlsanitize;
  * @param {string} nm
  * @returns {string}
  */
-const sqlsanitizeAllowDots = (nm) => {
+export const sqlsanitizeAllowDots = (nm) => {
     if (typeof nm === "symbol") {
-        return nm.description ? (0, exports.sqlsanitizeAllowDots)(nm.description) : "";
+        return nm.description ? sqlsanitizeAllowDots(nm.description) : "";
     }
     const s = nm.replace(/[^A-Za-z_0-9."]*/g, "");
     if (s[0] >= "0" && s[0] <= "9")
@@ -60,48 +42,140 @@ const sqlsanitizeAllowDots = (nm) => {
     else
         return s;
 };
-exports.sqlsanitizeAllowDots = sqlsanitizeAllowDots;
+// push each array element and return that many placeholders
+const prepInList = (v, phs) => v.map((current) => phs.push(current)).join(", ");
+/*
+ * Dialect used by the boolean-signature mkWhere/mkSelectOptions when
+ * is_sqlite is false. Defaults to postgres; a pluggable driver registers its
+ * own (see db/index.ts in saltcorn-data) so the many call sites passing
+ * db.isSQLite positionally emit SQL for the active driver.
+ */
+let defaultDialectFactory = (initCount = 0) => postgresPlaceHolderStack(initCount);
+export const setDefaultDialectFactory = (f) => {
+    defaultDialectFactory = f;
+};
 const postgresPlaceHolderStack = (init = 0) => {
     let values = [];
     let i = init;
+    const push = (x) => {
+        values.push(x);
+        i += 1;
+        return `$${i}`;
+    };
     return {
-        push(x) {
-            values.push(x);
-            i += 1;
-            return `$${i}`;
-        },
+        name: "postgres",
         is_sqlite: false,
+        push,
         getValues() {
             return values;
         },
+        placeholderAt(n) {
+            return `$${n}`;
+        },
+        like() {
+            return "ILIKE";
+        },
+        regexOperator() {
+            return "~";
+        },
+        castDateExpr(doCast, s) {
+            return !doCast ? s : `${s}::date`;
+        },
+        jsonExtractExpr(fieldExpr, jsonPath, asText) {
+            return `${asText ? "jsonb_build_array(" : ""}jsonb_path_query_first(${fieldExpr}, '${jsonPath}')${asText ? ")->>0" : ""}`;
+        },
+        ftsWhereClause(v) {
+            const { fields, table, schema } = v;
+            const prefixMatch = !v.searchTerm?.includes(" ");
+            const actually_use_websearch = v.use_websearch && !prefixMatch;
+            const searchTerm = prefixMatch && !v.disable_fts ? `${v.searchTerm}:*` : v.searchTerm;
+            let flds = ftsFieldsSqlExpr(fields, table, schema);
+            if (v.disable_fts)
+                return `${flds} ILIKE '%' || ${push(v.searchTerm)} || '%'`;
+            else if (actually_use_websearch)
+                return `to_tsvector('${v.language || "english"}', ${flds}) @@ websearch_to_tsquery('${v.language || "english"}', ${push(searchTerm)})`;
+            else if (prefixMatch) {
+                // Guard against stop words: to_tsquery('english','on:*') raises a syntax error
+                // because stop words are stripped to an empty query. Use websearch_to_tsquery as
+                // a probe — it returns ''::tsquery for stop words without erroring. When that
+                // happens, fall back to ILIKE so common words like "on", "by", "a" still match.
+                const lang = v.language || "english";
+                const rawTermPh = push(v.searchTerm);
+                const prefixTermPh = push(searchTerm);
+                return `CASE WHEN websearch_to_tsquery('${lang}', ${rawTermPh}) = ''::tsquery THEN ${flds} ILIKE '%' || ${rawTermPh} || '%' ELSE to_tsvector('${lang}', ${flds}) @@ to_tsquery('${lang}', ${prefixTermPh}) END`;
+            }
+            else
+                return `to_tsvector('${v.language || "english"}', ${flds}) @@ plainto_tsquery('${v.language || "english"}', ${push(searchTerm)})`;
+        },
+        arrayInClause(vals) {
+            return `= ANY (${push(vals)})`;
+        },
+        slugifyWhereClause(k, s) {
+            return `REGEXP_REPLACE(REPLACE(LOWER(${quote(sqlsanitizeAllowDots(k))}),' ','-'),'[^\\w-]','','g')=${push(s)}`;
+        },
+        textCastSuffix() {
+            return "::text";
+        },
     };
 };
 const sqlitePlaceHolderStack = () => {
     let values = [];
-    return {
-        push(x) {
-            values.push(x);
-            return `?`;
-        },
+    const push = (x) => {
+        values.push(x);
+        return `?`;
+    };
+    const self = {
+        name: "sqlite",
         is_sqlite: true,
+        push,
         getValues() {
             return values.map((v) => v?.constructor?.name === "PlainDate" ? v.valueOf() : v);
         },
+        placeholderAt() {
+            return "?";
+        },
+        like() {
+            return "LIKE";
+        },
+        regexOperator() {
+            return "REGEXP";
+        },
+        castDateExpr(doCast, s) {
+            return !doCast ? s : `date(${s})`;
+        },
+        jsonExtractExpr(fieldExpr, jsonPath) {
+            return `json_extract(${fieldExpr}, '${jsonPath}')`;
+        },
+        ftsWhereClause(v) {
+            const { fields, table, schema } = v;
+            let flds = ftsFieldsSqlExpr(fields, table, schema);
+            return `${flds} LIKE '%' || ${push(v.searchTerm)} || '%'`;
+        },
+        arrayInClause(vals) {
+            return `IN (${prepInList(vals, self)})`;
+        },
+        slugifyWhereClause(k, s) {
+            return `REPLACE(LOWER(${quote(sqlsanitizeAllowDots(k))}),' ','-')=${push(s)}`;
+        },
+        textCastSuffix() {
+            return "::text";
+        },
     };
+    return self;
 };
-const ftsFieldsSqlExpr = (fields, table, schema) => {
+export const ftsFieldsSqlExpr = (fields, table, schema) => {
     let fldsArray = fields
         .filter((f) => f.type && f.type.sql_name === "text" && (!f.calculated || f.stored))
         .map((f) => {
         const fname = table
-            ? `"${(0, exports.sqlsanitize)(table)}"."${(0, exports.sqlsanitize)(f.name)}"`
-            : `"${(0, exports.sqlsanitize)(f.name)}"`;
+            ? `"${sqlsanitize(table)}"."${sqlsanitize(f.name)}"`
+            : `"${sqlsanitize(f.name)}"`;
         return `coalesce(${f.type?.searchModifier ? f.type.searchModifier(fname) : fname},'')`;
     });
     fields
         .filter((f) => f.is_fkey && f?.attributes?.include_fts)
         .forEach((f) => {
-        fldsArray.push(`coalesce((select "${f.attributes.summary_field}" from ${schema ? `"${schema}".` : ""}"${(0, exports.sqlsanitize)(f.reftable_name)}" rt where rt."${f.refname}"=${table ? `"${(0, exports.sqlsanitize)(table)}".` : ""}"${f.name}"),'')`);
+        fldsArray.push(`coalesce((select "${f.attributes.summary_field}" from ${schema ? `"${schema}".` : ""}"${sqlsanitize(f.reftable_name)}" rt where rt."${f.refname}"=${table ? `"${sqlsanitize(table)}".` : ""}"${f.name}"),'')`);
     });
     fldsArray.sort();
     let flds = fldsArray.join(" || ' ' || ");
@@ -109,37 +183,20 @@ const ftsFieldsSqlExpr = (fields, table, schema) => {
         flds = "''";
     return flds;
 };
-exports.ftsFieldsSqlExpr = ftsFieldsSqlExpr;
-/**
- * Where FTS (Search)
- * @param {object} v
- * @param {string} i
+export /**
+ *
  * @param {boolean} is_sqlite
- * @returns {string}
- */
-const whereFTS = (v, phs) => {
-    const { fields, table, schema } = v;
-    const prefixMatch = !v.searchTerm?.includes(" ");
-    const actually_use_websearch = v.use_websearch && !prefixMatch;
-    const no_fts = phs.is_sqlite || v.disable_fts;
-    const searchTerm = prefixMatch && !no_fts ? `${v.searchTerm}:*` : v.searchTerm;
-    let flds = (0, exports.ftsFieldsSqlExpr)(fields, table, schema);
-    if (phs.is_sqlite)
-        return `${flds} LIKE '%' || ${phs.push(v.searchTerm)} || '%'`;
-    else if (v.disable_fts)
-        return `${flds} ILIKE '%' || ${phs.push(v.searchTerm)} || '%'`;
-    else
-        return `to_tsvector('${v.language || "english"}', ${flds}) @@ ${actually_use_websearch ? "websearch_" : prefixMatch ? "" : `plain`}to_tsquery('${v.language || "english"}', ${phs.push(searchTerm)})`;
-};
-const subSelectWhere = (phs) => (k, v) => {
+ * @param {string} i
+ * @returns {function}
+ */ const subSelectWhere = (phs) => (k, v) => {
     const tenantPrefix = !phs.is_sqlite && v.inSelect.tenant ? `"${v.inSelect.tenant}".` : "";
     if (v.inSelect.through && v.inSelect.valField) {
-        const whereObj = (0, exports.prefixFieldsInWhere)(v.inSelect.where, "ss2");
+        const whereObj = prefixFieldsInWhere(v.inSelect.where, "ss2");
         const wheres = whereObj ? Object.entries(whereObj) : [];
         const where = whereObj && wheres.length > 0
             ? "where " + wheres.map(whereClause(phs)).join(" and ")
             : "";
-        return `${quote((0, exports.sqlsanitizeAllowDots)(k))} in (select ss1."${v.inSelect.valField}" from ${tenantPrefix}"${(0, exports.sqlsanitize)(v.inSelect.table)}" ss1 join ${tenantPrefix}"${(0, exports.sqlsanitize)(v.inSelect.through)}" ss2 on ss2."${v.inSelect.through_pk || "id"}" = ss1."${v.inSelect.field}" ${where})`;
+        return `${quote(sqlsanitizeAllowDots(k))} in (select ss1."${v.inSelect.valField}" from ${tenantPrefix}"${sqlsanitize(v.inSelect.table)}" ss1 join ${tenantPrefix}"${sqlsanitize(v.inSelect.through)}" ss2 on ss2."${v.inSelect.through_pk || "id"}" = ss1."${v.inSelect.field}" ${where})`;
     }
     else {
         const whereObj = v.inSelect.where;
@@ -147,10 +204,9 @@ const subSelectWhere = (phs) => (k, v) => {
         const where = whereObj && wheres.length > 0
             ? "where " + wheres.map(whereClause(phs)).join(" and ")
             : "";
-        return `${quote((0, exports.sqlsanitizeAllowDots)(k))} in (select "${v.inSelect.field}" from ${tenantPrefix}"${(0, exports.sqlsanitize)(v.inSelect.table)}" ${where})`;
+        return `${quote(sqlsanitizeAllowDots(k))} in (select "${v.inSelect.field}" from ${tenantPrefix}"${sqlsanitize(v.inSelect.table)}" ${where})`;
     }
 };
-exports.subSelectWhere = subSelectWhere;
 /**
  * creates an in select sql string with joins for joinLevels
  * and the where gets an alias prefix to the first table of the joinLevels
@@ -164,33 +220,33 @@ const inSelectWithLevels = (phs) => (k, v) => {
     const selectParts = [];
     const joinLevels = v.inSelectWithLevels.joinLevels;
     const schema = v.inSelectWithLevels.schema && !phs.is_sqlite
-        ? `${quote((0, exports.sqlsanitize)(v.inSelectWithLevels.schema))}.`
+        ? `${quote(sqlsanitize(v.inSelectWithLevels.schema))}.`
         : "";
     for (let i = 0; i < joinLevels.length; i++) {
         const { table, fkey, inboundKey, pk_name, ref_name } = joinLevels[i];
         const pk = pk_name || "id";
         const refname = ref_name || "id";
-        const alias = quote((0, exports.sqlsanitize)(`${table}SubJ${i}`));
+        const alias = quote(sqlsanitize(`${table}SubJ${i}`));
         if (i === 0) {
-            selectParts.push(`from ${schema}${quote((0, exports.sqlsanitize)(`${table}`))} ${quote((0, exports.sqlsanitize)(`${alias}`))}`);
-            whereObj = (0, exports.prefixFieldsInWhere)(v.inSelectWithLevels.where, alias);
+            selectParts.push(`from ${schema}${quote(sqlsanitize(`${table}`))} ${quote(sqlsanitize(`${alias}`))}`);
+            whereObj = prefixFieldsInWhere(v.inSelectWithLevels.where, alias);
             if (joinLevels.length === 1)
                 inColumn = quote(`${alias}."${pk}"`);
         }
         else if (i < joinLevels.length - 1) {
             if (fkey) {
-                selectParts.push(`join ${schema}${quote((0, exports.sqlsanitize)(`${table}`))} ${alias} on ${quote(`${lastAlias}.${(0, exports.sqlsanitize)(fkey)}`)} = ${alias}."${pk}"`);
+                selectParts.push(`join ${schema}${quote(sqlsanitize(`${table}`))} ${alias} on ${quote(`${lastAlias}.${sqlsanitize(fkey)}`)} = ${alias}."${pk}"`);
             }
             else {
-                selectParts.push(`join ${schema}${quote((0, exports.sqlsanitize)(`${table}`))} ${alias} on ${quote(`${lastAlias}."${refname}"`)} = ${quote(`${alias}.${(0, exports.sqlsanitize)(inboundKey)}`)}`);
+                selectParts.push(`join ${schema}${quote(sqlsanitize(`${table}`))} ${alias} on ${quote(`${lastAlias}."${refname}"`)} = ${quote(`${alias}.${sqlsanitize(inboundKey)}`)}`);
             }
         }
         else {
             if (fkey) {
-                inColumn = quote(`${lastAlias}.${(0, exports.sqlsanitize)(fkey)}`);
+                inColumn = quote(`${lastAlias}.${sqlsanitize(fkey)}`);
             }
             else {
-                selectParts.push(`join ${schema}${quote((0, exports.sqlsanitize)(`${table}`))} ${alias} on ${quote(`${lastAlias}."${refname}"`)} = ${quote(`${alias}.${(0, exports.sqlsanitize)(`${inboundKey}`)}`)}`);
+                selectParts.push(`join ${schema}${quote(sqlsanitize(`${table}`))} ${alias} on ${quote(`${lastAlias}."${refname}"`)} = ${quote(`${alias}.${sqlsanitize(`${inboundKey}`)}`)}`);
                 inColumn = quote(`${alias}."${pk}"`);
             }
         }
@@ -200,7 +256,7 @@ const inSelectWithLevels = (phs) => (k, v) => {
     const where = whereObj && wheres.length > 0
         ? "where " + wheres.map(whereClause(phs)).join(" and ")
         : "";
-    const sqlPart = `${quote((0, exports.sqlsanitizeAllowDots)(k))} in (select ${quote((0, exports.sqlsanitizeAllowDots)(inColumn))} ${selectParts.join(" ")} ${where})`;
+    const sqlPart = `${quote(sqlsanitizeAllowDots(k))} in (select ${quote(sqlsanitizeAllowDots(inColumn))} ${selectParts.join(" ")} ${where})`;
     return sqlPart;
 };
 /**
@@ -234,8 +290,8 @@ const whereAnd = (phs) => (ors) => wrapParens(ors
     .join(" and "));
 const equals = ([v1, v2], phs) => {
     const pVal = (v) => typeof v === "symbol"
-        ? quote((0, exports.sqlsanitizeAllowDots)(v))
-        : phs.push(v) + (typeof v === "string" ? "::text" : "");
+        ? quote(sqlsanitizeAllowDots(v))
+        : phs.push(v) + (typeof v === "string" ? phs.textCastSuffix() : "");
     const isNull = (v) => `${pVal(v)} is null`;
     if (v1 === null && v2 === null)
         return "null is null";
@@ -245,43 +301,33 @@ const equals = ([v1, v2], phs) => {
         return isNull(v1);
     return `${pVal(v1)}=${pVal(v2)}`;
 };
-const slugifyQuery = (k, s, phs) => phs.is_sqlite
-    ? `REPLACE(LOWER(${quote((0, exports.sqlsanitizeAllowDots)(k))}),' ','-')=${phs.push(s)}`
-    : `REGEXP_REPLACE(REPLACE(LOWER(${quote((0, exports.sqlsanitizeAllowDots)(k))}),' ','-'),'[^\\w-]','','g')=${phs.push(s)}`;
 /**
  * @param {boolean} is_sqlite
  * @param {string} i
  * @returns {function}
  */
-const castDate = (doCast, is_sqlite, s) => !doCast ? s : is_sqlite ? `date(${s})` : `${s}::date`;
 /*
  * add elements of the array as single items to the placeholder stack
  * and return the same amount of placeholders
  */
-const prepSqliteIn = (v, phs) => {
-    const placeholders = [];
-    for (const current of v) {
-        phs.push(current);
-        placeholders.push("?");
-    }
-    return placeholders.join(", ");
-};
 const whereClause = (phs) => ([k, v]) => k === "_fts"
-    ? whereFTS(v, phs)
+    ? phs.ftsWhereClause(v)
     : typeof (v || {}).not !== "undefined" && v.not.in
-        ? `not (${quote((0, exports.sqlsanitizeAllowDots)(k))} ${phs.is_sqlite
-            ? `IN (${prepSqliteIn(v.not.in, phs)})`
-            : `= ANY (${phs.push(v.not.in)})`})`
+        ? // empty list: "not in ()" is always true (and "IN ()" is invalid
+            // outside Postgres)
+            v.not.in.length === 0
+                ? "TRUE"
+                : `not (${quote(sqlsanitizeAllowDots(k))} ${phs.arrayInClause(v.not.in)})`
         : typeof (v || {}).in !== "undefined"
-            ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} ${phs.is_sqlite
-                ? `IN (${prepSqliteIn(v.in, phs)})`
-                : `= ANY (${phs.push(v.in)})`}`
+            ? v.in.length === 0
+                ? "FALSE"
+                : `${quote(sqlsanitizeAllowDots(k))} ${phs.arrayInClause(v.in)}`
             : k === "or" && Array.isArray(v)
                 ? whereOr(phs)(v)
                 : k === "and" && Array.isArray(v)
                     ? whereAnd(phs)(v)
                     : typeof (v || {}).slugify !== "undefined"
-                        ? slugifyQuery(k, v.slugify, phs)
+                        ? phs.slugifyWhereClause(k, v.slugify)
                         : k === "not" && typeof v === "object"
                             ? `not (${Object.entries(v)
                                 .map((kv) => whereClause(phs)(kv))
@@ -301,22 +347,22 @@ const whereClause = (phs) => ([k, v]) => k === "_fts"
                                                 .join(" and ")
                                             : typeof (v || {}).ilike !== "undefined" &&
                                                 v.fullMatch
-                                                ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} ${phs.is_sqlite ? "LIKE" : "ILIKE"} ${phs.push(v.ilike)}`
+                                                ? `${quote(sqlsanitizeAllowDots(k))} ${phs.like()} ${phs.push(v.ilike)}`
                                                 : typeof (v || {}).ilike !== "undefined"
-                                                    ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} ${phs.is_sqlite ? "LIKE" : "ILIKE"} '%' || ${phs.push(v.ilike)} || '%'`
+                                                    ? `${quote(sqlsanitizeAllowDots(k))} ${phs.like()} '%' || ${phs.push(v.ilike)} || '%'`
                                                     : v instanceof RegExp ||
                                                         v?.constructor?.name === "RegExp"
-                                                        ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} ${phs.is_sqlite ? "REGEXP" : "~"} ${phs.push(v.source)}`
+                                                        ? `${quote(sqlsanitizeAllowDots(k))} ${phs.regexOperator()} ${phs.push(v.source)}`
                                                         : typeof (v || {}).gt !== "undefined" &&
                                                             typeof (v || {}).lt !== "undefined"
-                                                            ? `${castDate(v.day_only, phs.is_sqlite, quote((0, exports.sqlsanitizeAllowDots)(k)))}>${v.equal ? "=" : ""}${castDate(v.day_only, phs.is_sqlite, phs.push(v.gt))} and ${castDate(v.day_only, phs.is_sqlite, quote((0, exports.sqlsanitizeAllowDots)(k)))}<${v.equal ? "=" : ""}${castDate(v.day_only, phs.is_sqlite, phs.push(v.lt))}`
+                                                            ? `${phs.castDateExpr(v.day_only, quote(sqlsanitizeAllowDots(k)))}>${v.equal ? "=" : ""}${phs.castDateExpr(v.day_only, phs.push(v.gt))} and ${phs.castDateExpr(v.day_only, quote(sqlsanitizeAllowDots(k)))}<${v.equal ? "=" : ""}${phs.castDateExpr(v.day_only, phs.push(v.lt))}`
                                                             : typeof (v || {}).gt !== "undefined"
-                                                                ? `${castDate(v.day_only, phs.is_sqlite, quote((0, exports.sqlsanitizeAllowDots)(k)))}>${v.equal ? "=" : ""}${castDate(v.day_only, phs.is_sqlite, phs.push(v.gt))}`
+                                                                ? `${phs.castDateExpr(v.day_only, quote(sqlsanitizeAllowDots(k)))}>${v.equal ? "=" : ""}${phs.castDateExpr(v.day_only, phs.push(v.gt))}`
                                                                 : typeof (v || {}).lt !== "undefined"
-                                                                    ? `${castDate(v.day_only, phs.is_sqlite, quote((0, exports.sqlsanitizeAllowDots)(k)))}<${v.equal ? "=" : ""}${castDate(v.day_only, phs.is_sqlite, phs.push(v.lt))}`
+                                                                    ? `${phs.castDateExpr(v.day_only, quote(sqlsanitizeAllowDots(k)))}<${v.equal ? "=" : ""}${phs.castDateExpr(v.day_only, phs.push(v.lt))}`
                                                                     : typeof (v || {}).inSelect !==
                                                                         "undefined"
-                                                                        ? (0, exports.subSelectWhere)(phs)(k, v)
+                                                                        ? subSelectWhere(phs)(k, v)
                                                                         : typeof (v || {})
                                                                             .inSelectWithLevels !==
                                                                             "undefined"
@@ -325,10 +371,10 @@ const whereClause = (phs) => ([k, v]) => k === "_fts"
                                                                                 "undefined"
                                                                                 ? jsonWhere(k, v.json, phs)
                                                                                 : v === null
-                                                                                    ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} is null`
+                                                                                    ? `${quote(sqlsanitizeAllowDots(k))} is null`
                                                                                     : k === "not"
                                                                                         ? `not (${typeof v === "symbol" ? v.description : phs.push(v)})`
-                                                                                        : `${quote((0, exports.sqlsanitizeAllowDots)(k))}=${typeof v === "symbol"
+                                                                                        : `${quote(sqlsanitizeAllowDots(k))}=${typeof v === "symbol"
                                                                                             ? v.description
                                                                                             : phs.push(v)}`;
 function isdef(x) {
@@ -345,14 +391,12 @@ function jsonWhere(k, v, phs) {
         : `\$${Array.isArray(sf)
             ? sf.map(jsonpathElemEscape).join("")
             : jsonpathElemEscape(sf)}`).replace(/'/g, "''");
-    const lhs = (f, sf, convText) => phs.is_sqlite
-        ? `json_extract(${quote((0, exports.sqlsanitizeAllowDots)(f))}, '${jsonpathPrepare(sf)}')`
-        : `${convText ? "jsonb_build_array(" : ""}jsonb_path_query_first(${quote((0, exports.sqlsanitizeAllowDots)(f))}, '${jsonpathPrepare(sf)}')${convText ? ")->>0" : ""}`;
+    const lhs = (f, sf, convText) => phs.jsonExtractExpr(quote(sqlsanitizeAllowDots(f)), jsonpathPrepare(sf), convText);
     if (Array.isArray(v))
         return `${lhs(k, v[0], true)}=${phs.push(v[1])}`;
     else {
         return andArray(Object.entries(v).map(([kj, vj]) => vj.ilike
-            ? `${lhs(k, kj, true)} ${phs.is_sqlite ? "LIKE" : "ILIKE"} '%' || ${phs.push(vj.ilike)} || '%'`
+            ? `${lhs(k, kj, true)} ${phs.like()} '%' || ${phs.push(vj.ilike)} || '%'`
             : isdef(vj.gte) || isdef(vj.lte)
                 ? andArray([
                     isdef(vj.gte)
@@ -372,25 +416,27 @@ function andArray(ss) {
         return ss.join(" and ");
 }
 /**
- * @param {object} whereObj
- * @param {boolean} is_sqlite
- * @param {number} initCount
+ * Build a where-clause and its bound values for an arbitrary SqlDialect.
+ * @param whereObj
+ * @param dialect
  * @returns {object}
  */
-const mkWhere = (whereObj, is_sqlite = false, initCount = 0) => {
+export const mkWhereForDialect = (whereObj, dialect) => {
     const wheres = whereObj ? Object.entries(whereObj) : [];
-    //console.log({ wheres });
-    const placeHolderStack = is_sqlite
-        ? sqlitePlaceHolderStack()
-        : postgresPlaceHolderStack(initCount);
-    const whereClauses = wheres.map(whereClause(placeHolderStack)).join(" and ");
+    const whereClauses = wheres.map(whereClause(dialect)).join(" and ");
     const where = whereObj && wheres.length > 0 && whereClauses.length
         ? "where " + whereClauses
         : "";
-    const values = placeHolderStack.getValues();
+    const values = dialect.getValues();
     return { where, values };
 };
-exports.mkWhere = mkWhere;
+/**
+ * @param {object} whereObj
+ * @param {boolean} is_sqlite
+ * @param {number} initCount
+ * @returns {object}
+ */
+export const mkWhere = (whereObj, is_sqlite = false, initCount = 0) => mkWhereForDialect(whereObj, is_sqlite ? sqlitePlaceHolderStack() : defaultDialectFactory(initCount));
 /**
  * @param {number|string} x
  * @returns {number|null}
@@ -410,9 +456,11 @@ const toInt = (x) => typeof x === "number"
  */
 const getDistanceOrder = ({ latField, longField, lat, long }) => {
     const cos_lat_2 = Math.pow(Math.cos((+lat * Math.PI) / 180), 2);
-    return `((${(0, exports.sqlsanitizeAllowDots)(`${latField}`)} - ${+lat})*(${(0, exports.sqlsanitizeAllowDots)(`${latField}`)} - ${+lat})) + ((${(0, exports.sqlsanitizeAllowDots)(`${longField}`)} - ${+long})*(${(0, exports.sqlsanitizeAllowDots)(`${longField}`)} - ${+long})*${cos_lat_2})`;
+    const latf = `"${sqlsanitizeAllowDots(`${latField}`)}"`;
+    const longf = `"${sqlsanitizeAllowDots(`${longField}`)}"`;
+    return `((${latf} - ${+lat})*(${latf} - ${+lat})) + ((${longf} - ${+long})*(${longf} - ${+long})*${cos_lat_2})`;
 };
-const getOperatorOrder = ({ operator, target, field, }, values, isSQLite) => {
+const getOperatorOrder = ({ operator, target, field, }, values, fmt) => {
     const validOp = (s) => {
         if (s.includes("--"))
             return "";
@@ -437,14 +485,14 @@ const getOperatorOrder = ({ operator, target, field, }, values, isSQLite) => {
     const ppOp = (ast) => {
         if (ast === "target") {
             values.push(target);
-            return isSQLite ? "?" : `$${values.length}`;
+            return fmt.placeholderAt(values.length);
         }
         if (ast === "field")
-            return (0, exports.sqlsanitize)(field);
+            return sqlsanitize(field);
         const { type, name, args } = ast;
         switch (type) {
             case "SqlFun":
-                return `${(0, exports.sqlsanitize)(name)}(${args.map(ppOp).join(",")})`;
+                return `${sqlsanitize(name)}(${args.map(ppOp).join(",")})`;
             case "SqlBinOp":
                 const [arg1, arg2] = args;
                 return `${ppOp(arg1)}${validOp(name)}${ppOp(arg2)}`;
@@ -453,21 +501,20 @@ const getOperatorOrder = ({ operator, target, field, }, values, isSQLite) => {
     };
     return ppOp(operator);
 };
-const orderByIsObject = (object) => {
+export const orderByIsObject = (object) => {
     return object && object.distance;
 };
-exports.orderByIsObject = orderByIsObject;
-const orderByIsOperator = (object) => {
+export const orderByIsOperator = (object) => {
     return object && object.operator && typeof object.operator !== "string";
 };
-exports.orderByIsOperator = orderByIsOperator;
 /**
- * @param {object} selopts
+ * Build the "order by / limit / offset / for update" tail of a select for a
+ * given dialect. Only fmt.placeholderAt is used (rare operator-orderBy case).
  * @returns {string}
  */
-const mkSelectOptions = (selopts, values, isSQLite) => {
+export const mkSelectOptionsForDialect = (selopts, values, fmt) => {
     const orderby = selopts.orderBy === "RANDOM()"
-        ? "order by RANDOM()"
+        ? `order by ${fmt.randomOrderExpr?.() ?? "RANDOM()"}`
         : selopts.orderBy &&
             typeof selopts.orderBy === "object" &&
             "distance" in selopts.orderBy
@@ -475,22 +522,26 @@ const mkSelectOptions = (selopts, values, isSQLite) => {
             : selopts.orderBy &&
                 typeof selopts.orderBy === "string" &&
                 selopts.nocase
-                ? `order by lower(${quote((0, exports.sqlsanitizeAllowDots)(selopts.orderBy))})${selopts.orderDesc ? " DESC" : ""}`
+                ? `order by lower(${quote(sqlsanitizeAllowDots(selopts.orderBy))})${selopts.orderDesc ? " DESC" : ""}`
                 : selopts.orderBy && typeof selopts.orderBy === "string"
-                    ? `order by ${quote((0, exports.sqlsanitizeAllowDots)(selopts.orderBy))}${selopts.orderDesc ? " DESC" : ""}`
+                    ? `order by ${quote(sqlsanitizeAllowDots(selopts.orderBy))}${selopts.orderDesc ? " DESC" : ""}`
                     : selopts.orderBy &&
                         typeof selopts.orderBy === "object" &&
                         "operator" in selopts.orderBy &&
                         typeof selopts.orderBy.operator === "object"
-                        ? `order by ${getOperatorOrder(selopts.orderBy, values, isSQLite)}`
+                        ? `order by ${getOperatorOrder(selopts.orderBy, values, fmt)}`
                         : "";
     const limit = selopts.limit ? `limit ${toInt(selopts.limit)}` : "";
     const offset = selopts.offset ? `offset ${toInt(selopts.offset)}` : "";
     const forupdate = selopts.forupdate ? "FOR UPDATE" : "";
     return [orderby, limit, offset, forupdate].filter((s) => s).join(" ");
 };
-exports.mkSelectOptions = mkSelectOptions;
-const prefixFieldsInWhere = (inputWhere, tablePrefix) => {
+/**
+ * @param {object} selopts
+ * @returns {string}
+ */
+export const mkSelectOptions = (selopts, values, isSQLite) => mkSelectOptionsForDialect(selopts, values, isSQLite ? sqlitePlaceHolderStack() : defaultDialectFactory());
+export const prefixFieldsInWhere = (inputWhere, tablePrefix) => {
     if (!inputWhere)
         return {};
     const whereObj = {};
@@ -498,17 +549,17 @@ const prefixFieldsInWhere = (inputWhere, tablePrefix) => {
         if (k === "_fts")
             whereObj[k] = { table: tablePrefix, ...inputWhere[k] };
         else if (k === "not") {
-            whereObj.not = (0, exports.prefixFieldsInWhere)(inputWhere[k], tablePrefix);
+            whereObj.not = prefixFieldsInWhere(inputWhere[k], tablePrefix);
         }
         else if (k === "or") {
             whereObj.or = Array.isArray(inputWhere[k])
-                ? inputWhere[k].map((w) => (0, exports.prefixFieldsInWhere)(w, tablePrefix))
-                : [(0, exports.prefixFieldsInWhere)(inputWhere[k], tablePrefix)];
+                ? inputWhere[k].map((w) => prefixFieldsInWhere(w, tablePrefix))
+                : [prefixFieldsInWhere(inputWhere[k], tablePrefix)];
         }
         else if (k === "and") {
             whereObj.and = Array.isArray(inputWhere[k])
-                ? inputWhere[k].map((w) => (0, exports.prefixFieldsInWhere)(w, tablePrefix))
-                : (0, exports.prefixFieldsInWhere)(inputWhere[k], tablePrefix);
+                ? inputWhere[k].map((w) => prefixFieldsInWhere(w, tablePrefix))
+                : prefixFieldsInWhere(inputWhere[k], tablePrefix);
         }
         else if (k === "eq") {
             whereObj[k] = inputWhere[k]; // TODO check for fieldnames
@@ -518,18 +569,15 @@ const prefixFieldsInWhere = (inputWhere, tablePrefix) => {
     });
     return whereObj;
 };
-exports.prefixFieldsInWhere = prefixFieldsInWhere;
-const sqlFun = (name, ...args) => ({
+export const sqlFun = (name, ...args) => ({
     type: "SqlFun",
     name,
     args,
 });
-exports.sqlFun = sqlFun;
-const sqlBinOp = (name, ...args) => ({
+export const sqlBinOp = (name, ...args) => ({
     type: "SqlBinOp",
     name,
     args,
 });
-exports.sqlBinOp = sqlBinOp;
-exports.dbCommonModulePath = __dirname;
+export const dbCommonModulePath = import.meta.dirname;
 //# sourceMappingURL=internal.js.map