pqb 0.42.9 → 0.43.1

package/dist/index.mjs

@@ -810,8 +810,10 @@ const columnExcludesToCode = (items) => {
   }
   return code;
 };
-const columnCheckToCode = (ctx, { sql, name }, columnName) => {
-  return `.check(${sql.toCode(ctx.t)}${name && name !== `${ctx.table}_${columnName}_check` ? `, { name: '${name}' }` : ""})`;
+const columnCheckToCode = (ctx, checks) => {
+  return checks.map(
+    ({ sql, name }) => `.check(${sql.toCode(ctx.t)}${name ? `, '${name}'` : ""})`
+  ).join("");
 };
 const identityToCode = (identity, dataType) => {
   const code = [];
@@ -895,8 +897,8 @@ const columnCode = (type, ctx, key, code) => {
     }
   }
   if (data.comment) addCode(code, `.comment(${singleQuote(data.comment)})`);
-  if (data.check) {
-    addCode(code, columnCheckToCode(ctx, data.check, name));
+  if (data.checks) {
+    addCode(code, columnCheckToCode(ctx, data.checks));
   }
   if (data.errors) {
     for (const part of columnErrorMessagesToCode(data.errors)) {
@@ -5648,11 +5650,18 @@ function queryJson(self, coalesce) {
   return q;
 }
 
-const pushSelectSql = (ctx, table, query, quotedAs) => {
-  const sql = selectToSql(ctx, table, query, quotedAs);
+const pushSelectSql = (ctx, table, query, quotedAs, aliases) => {
+  const sql = selectToSql(
+    ctx,
+    table,
+    query,
+    quotedAs,
+    query.hookSelect,
+    aliases
+  );
   if (sql) ctx.sql.push(sql);
 };
-const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect) => {
+const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect, aliases) => {
   let selected;
   const list = [];
   if (query.select) {
@@ -5694,6 +5703,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
           }
         }
         list.push(sql);
+        aliases?.push("");
       } else if (item) {
         if ("selectAs" in item) {
           const obj = item.selectAs;
@@ -5703,8 +5713,9 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
             if (typeof value === "object") {
               if (isExpression(value)) {
                 list.push(`${value.toSQL(ctx, quotedAs)} "${as}"`);
+                aliases?.push(as);
               } else {
-                pushSubQuerySql(ctx, value, as, list, quotedAs);
+                pushSubQuerySql(ctx, value, as, list, quotedAs, aliases);
               }
             } else if (value) {
               list.push(
@@ -5717,10 +5728,12 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
                   true
                 )
               );
+              aliases?.push(as);
             }
           }
         } else {
           list.push(selectedObjectToSQL(ctx, quotedAs, item));
+          aliases?.push("");
         }
       }
     }
@@ -5771,7 +5784,7 @@ function selectedObjectToSQL(ctx, quotedAs, item) {
 const selectAllSql = (query, quotedAs) => {
   return query.join?.length ? query.selectAllColumns?.map((item) => `${quotedAs}.${item}`).join(", ") || `${quotedAs}.*` : query.selectAllColumns?.join(", ") || "*";
 };
-const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
+const pushSubQuerySql = (ctx, query, as, list, quotedAs, aliases) => {
   const { returnType = "all" } = query.q;
   if (isQueryNone(query)) {
     let sql;
@@ -5797,6 +5810,7 @@ const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
         throw new UnhandledTypeError(query, returnType);
     }
     list.push(`${sql} "${as}"`);
+    aliases?.push(as);
     return;
   }
   if (query.q.joinedForSelect) {
@@ -5821,7 +5835,10 @@ const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
       default:
         throw new UnhandledTypeError(query, returnType);
     }
-    if (sql) list.push(`${coalesce(ctx, query, sql, quotedAs)} "${as}"`);
+    if (sql) {
+      list.push(`${coalesce(ctx, query, sql, quotedAs)} "${as}"`);
+      aliases?.push(as);
+    }
     return;
   }
   switch (returnType) {
@@ -6591,7 +6608,8 @@ const makeSQL = (table, options) => {
     if (query.distinct) {
       pushDistinctSql(ctx, table, query.distinct, quotedAs);
     }
-    pushSelectSql(ctx, table, query, quotedAs);
+    const aliases = query.group ? [] : void 0;
+    pushSelectSql(ctx, table, query, quotedAs, aliases);
     if (table.table || query.from) {
       pushFromAndAs(ctx, table, query, quotedAs);
     }
@@ -6607,9 +6625,14 @@ const makeSQL = (table, options) => {
       pushWhereStatementSql(ctx, table, query, quotedAs);
     }
     if (query.group) {
-      const group = query.group.map(
-        (item) => isExpression(item) ? item.toSQL(ctx, quotedAs) : maybeSelectedColumnToSql(ctx, table.q, item, quotedAs)
-      );
+      const group = query.group.map((item) => {
+        if (isExpression(item)) {
+          return item.toSQL(ctx, quotedAs);
+        } else {
+          const i = aliases.indexOf(item);
+          return i !== -1 ? i + 1 : columnToSql(ctx, table.q, table.shape, item, quotedAs);
+        }
+      });
       sql.push(`GROUP BY ${group.join(", ")}`);
     }
     if (query.having) pushHavingSql(ctx, query, quotedAs);
@@ -11720,6 +11743,10 @@ class QueryMethods {
    *   .group('month');
    * ```
    *
+   * Column aliases in `select` take precedence over table columns,
+   * so if in the query above `db.product` had a column `month`,
+   * the query would work in the exact same way, group by would reference the selected `month` expression.
+   *
    * @param columns - column names or a raw SQL
    */
   group(...columns) {