pqb 0.39.1 → 0.39.2

package/dist/index.js

@@ -1868,15 +1868,22 @@ const queryTypeWithLimitOne = {
 };
 const isQueryReturnsAll = (q) => !q.q.returnType || q.q.returnType === "all";
 
-function simpleColumnToSQL(ctx, key, column, quotedAs) {
+const applySqlComputed = (ctx, q, computed, as, quotedAs) => {
+  var _a;
+  const parser = computed.result.value.parseFn;
+  if (parser)
+    ((_a = q.parsers) != null ? _a : q.parsers = {})[as] = parser;
+  return computed.toSQL(ctx, quotedAs);
+};
+function simpleColumnToSQL(ctx, q, key, column, quotedAs) {
   if (!column)
     return `"${key}"`;
   const { data } = column;
-  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+  return data.computed ? applySqlComputed(ctx, q, data.computed, key, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
-function simpleExistingColumnToSQL(ctx, key, column, quotedAs) {
+function simpleExistingColumnToSQL(ctx, q, key, column, quotedAs) {
   const { data } = column;
-  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+  return data.computed ? applySqlComputed(ctx, q, data.computed, key, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
 const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
   var _a;
@@ -1895,7 +1902,7 @@ const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
   if (!select && ((_a = data.joinedShapes) == null ? void 0 : _a[column])) {
     return `"${column}".r`;
   }
-  return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
+  return simpleColumnToSQL(ctx, data, column, shape[column], quotedAs);
 };
 const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
   var _a;
@@ -1910,12 +1917,12 @@ const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
       for (const s of data.select) {
         if (typeof s === "object" && "selectAs" in s) {
           if (column in s.selectAs) {
-            return simpleColumnToSQL(ctx, column, data.shape[column]);
+            return simpleColumnToSQL(ctx, data, column, data.shape[column]);
           }
         }
       }
     }
-    return simpleColumnToSQL(ctx, column, data.shape[column], quotedAs);
+    return simpleColumnToSQL(ctx, data, column, data.shape[column], quotedAs);
   }
 };
 const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) => {
@@ -1933,17 +1940,30 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
       return `"${tableName}"."${col.data.name}"`;
     }
     if (col.data.computed) {
-      return `${col.data.computed.toSQL(ctx, quoted)}`;
+      return applySqlComputed(ctx, data, col.data.computed, column, quoted);
     }
     return `"${tableName}"."${key}"`;
   }
   return `"${tableName}"."${key}"`;
 };
-const tableColumnToSqlWithAs = (ctx, data, column, table, key, quotedAs, select) => {
+const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
+  const index = column.indexOf(".");
+  return index !== -1 ? tableColumnToSqlWithAs(
+    ctx,
+    data,
+    column,
+    column.slice(0, index),
+    column.slice(index + 1),
+    as,
+    quotedAs,
+    select
+  ) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select);
+};
+const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, select) => {
   var _a, _b, _c;
   if (key === "*") {
     if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
-      return select ? `row_to_json("${table}".*) "${table}"` : `"${table}".r "${table}"`;
+      return select ? `row_to_json("${table}".*) "${as}"` : `"${table}".r "${as}"`;
     }
     return column;
   }
@@ -1952,29 +1972,41 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, quotedAs, select)
   const col = quoted === quotedAs ? data.shape[key] : (_c = data.joinedShapes) == null ? void 0 : _c[tableName][key];
   if (col) {
     if (col.data.name && col.data.name !== key) {
-      return `"${tableName}"."${col.data.name}" "${key}"`;
+      return `"${tableName}"."${col.data.name}" "${as}"`;
     }
     if (col.data.computed) {
-      return `${col.data.computed.toSQL(ctx, quoted)} "${key}"`;
+      return `${applySqlComputed(
+        ctx,
+        data,
+        col.data.computed,
+        as,
+        quoted
+      )} "${as}"`;
     }
   }
-  return `"${tableName}"."${key}"`;
+  return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
 };
-const ownColumnToSqlWithAs = (ctx, data, column, quotedAs, select) => {
+const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
   var _a;
   if (!select && ((_a = data.joinedShapes) == null ? void 0 : _a[column])) {
-    return select ? `row_to_json("${column}".*) "${column}"` : `"${column}".r "${column}"`;
+    return select ? `row_to_json("${column}".*) "${as}"` : `"${column}".r "${as}"`;
   }
   const col = data.shape[column];
   if (col) {
     if (col.data.name && col.data.name !== column) {
-      return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}" "${column}"`;
+      return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}"${col.data.name === as ? "" : ` "${as}"`}`;
     }
     if (col.data.computed) {
-      return `${col.data.computed.toSQL(ctx, quotedAs)} "${column}"`;
+      return `${applySqlComputed(
+        ctx,
+        data,
+        col.data.computed,
+        as,
+        quotedAs
+      )} "${as}"`;
     }
   }
-  return `${quotedAs ? `${quotedAs}.` : ""}"${column}"`;
+  return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
 };
 const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select) => {
   return typeof expr === "string" ? columnToSql(ctx, data, shape, expr, quotedAs, select) : expr.toSQL(ctx, quotedAs);
@@ -2306,7 +2338,13 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
         let column = query.shape[key];
         let quotedColumn;
         if (column) {
-          quotedColumn = simpleExistingColumnToSQL(ctx, key, column, quotedAs);
+          quotedColumn = simpleExistingColumnToSQL(
+            ctx,
+            query,
+            key,
+            column,
+            quotedAs
+          );
         } else if (!column) {
           const index = key.indexOf(".");
           if (index !== -1) {
@@ -2314,7 +2352,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
             const quoted = `"${table2}"`;
             const name = key.slice(index + 1);
             column = quotedAs === quoted ? query.shape[name] : (_b = (_a = query.joinedShapes) == null ? void 0 : _a[table2]) == null ? void 0 : _b[name];
-            quotedColumn = simpleColumnToSQL(ctx, name, column, quoted);
+            quotedColumn = simpleColumnToSQL(ctx, query, name, column, quoted);
           } else {
             column = (_d = (_c = query.joinedShapes) == null ? void 0 : _c[key]) == null ? void 0 : _d.value;
             quotedColumn = `"${key}".r`;
@@ -4849,13 +4887,21 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
               item,
               tableName,
               key,
+              key === "*" ? tableName : key,
               quotedAs,
               true
             );
           } else {
             if (hookSelect == null ? void 0 : hookSelect.get(item))
               (selected != null ? selected : selected = {})[item] = quotedAs;
-            sql = ownColumnToSqlWithAs(ctx, table.q, item, quotedAs, true);
+            sql = ownColumnToSqlWithAs(
+              ctx,
+              table.q,
+              item,
+              item,
+              quotedAs,
+              true
+            );
           }
         }
         list.push(sql);
@@ -4874,14 +4920,14 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
               }
             } else if (value) {
               list.push(
-                `${columnToSql(
+                columnToSqlWithAs(
                   ctx,
                   table.q,
-                  table.q.shape,
                   value,
+                  as,
                   quotedAs,
                   true
-                )} "${as}"`
+                )
               );
             }
           }
@@ -4910,7 +4956,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
         quotedTable = quotedAs;
         columnName = select;
         col = query.shape[select];
-        sql = simpleColumnToSQL(ctx, select, col, quotedAs);
+        sql = simpleColumnToSQL(ctx, query, select, col, quotedAs);
       }
       if (selected == null ? void 0 : selected[columnName]) {
         if ((selected == null ? void 0 : selected[columnName]) === quotedTable) {
@@ -11379,6 +11425,8 @@ class ColumnRefExpression extends orchidCore.Expression {
   makeSQL(ctx, quotedAs) {
     return simpleExistingColumnToSQL(
       ctx,
+      // it's for parsers for computed SQL. In the column ref case, parsers should be set when selecting the column ref.
+      {},
       this.name,
       this.result.value,
       quotedAs