@atscript/db-sql-tools 0.1.128 → 0.1.129

package/dist/index.cjs

@@ -339,19 +339,27 @@ function buildAggExpr(dialect, expr) {
 	return `${aggFnSql(dialect, expr)} AS ${dialect.quoteIdentifier((0, _atscript_db_agg.resolveAlias)(expr))}`;
 }
 /**
-* Renders `$having`. A key that names an aggregate alias (`$as`, else
-* `fn_field`) renders the aggregate expression itself — `SUM("amount") > ?`
-* — because PostgreSQL does not allow a SELECT alias in HAVING (MySQL and
-* SQLite tolerate it, so the expression form keeps all three identical).
-* Other keys (grouped columns) render as plain columns.
+* ` HAVING <predicate>` (leading space) + params for `controls.$having`, or
+* `undefined` when there is nothing to render. Shared by the row and the
+* count builders so both filter the same group set.
+*
+* A key that names an aggregate alias (`$as`, else `fn_field`) renders the
+* aggregate expression itself — `SUM("amount") > ?` — because PostgreSQL does
+* not allow a SELECT alias in HAVING (MySQL and SQLite tolerate it, so the
+* expression form keeps all three identical). Other keys (grouped columns)
+* render as plain columns.
 */
-function buildHaving(dialect, controls) {
+function havingClause(dialect, controls) {
 	const having = controls.$having;
-	const aggregates = controls.$select?.aggregates;
-	if (!aggregates?.length) return buildWhere(dialect, having);
+	if (!having) return void 0;
 	const exprByAlias = /* @__PURE__ */ new Map();
-	for (const expr of aggregates) exprByAlias.set((0, _atscript_db_agg.resolveAlias)(expr), aggFnSql(dialect, expr));
-	return (0, _uniqu_core.walkFilter)(having, createFilterVisitor(dialect, { columnRef: (field) => exprByAlias.get(field) ?? dialect.quoteIdentifier(field) })) ?? EMPTY_AND;
+	for (const expr of controls.$select?.aggregates ?? []) exprByAlias.set((0, _atscript_db_agg.resolveAlias)(expr), aggFnSql(dialect, expr));
+	const fragment = (0, _uniqu_core.walkFilter)(having, createFilterVisitor(dialect, { columnRef: (field) => exprByAlias.get(field) ?? dialect.quoteIdentifier(field) }));
+	if (!fragment || fragment.sql === EMPTY_AND.sql) return void 0;
+	return {
+		sql: ` HAVING ${fragment.sql}`,
+		params: fragment.params
+	};
 }
 /**
 * Builds a SELECT ... GROUP BY statement with aggregate functions.
@@ -369,12 +377,10 @@ function buildAggregateSelect(dialect, table, where, controls) {
 		const groupCols = groupBy.map((f) => dialect.quoteIdentifier(f)).join(", ");
 		sql += ` GROUP BY ${groupCols}`;
 	}
-	if (controls.$having) {
-		const havingFragment = buildHaving(dialect, controls);
-		if (havingFragment.sql !== EMPTY_AND.sql) {
-			sql += ` HAVING ${havingFragment.sql}`;
-			params.push(...havingFragment.params);
-		}
+	const having = havingClause(dialect, controls);
+	if (having) {
+		sql += having.sql;
+		params.push(...having.params);
 	}
 	if (controls.$sort) {
 		const orderParts = [];
@@ -396,19 +402,23 @@ function buildAggregateSelect(dialect, table, where, controls) {
 	});
 }
 /**
-* Builds a COUNT query for the number of distinct groups.
-* Returns `{ count: N }` when executed.
+* Builds a COUNT query for the number of distinct groups — the groups that
+* survive `$having` when one is given (the same predicate the row query
+* renders, so `$count` agrees with the row set). Returns `{ count: N }` when
+* executed.
 */
 function buildAggregateCount(dialect, table, where, controls) {
 	const groupFields = controls.$groupBy;
-	if (!groupFields?.length) return finalizeParams(dialect, {
-		sql: `SELECT COUNT(*) AS ${dialect.quoteIdentifier("count")} FROM ${dialect.quoteTable(table)} WHERE ${where.sql}`,
+	const having = havingClause(dialect, controls);
+	const countCol = `COUNT(*) AS ${dialect.quoteIdentifier("count")}`;
+	if (!groupFields?.length && !having) return finalizeParams(dialect, {
+		sql: `SELECT ${countCol} FROM ${dialect.quoteTable(table)} WHERE ${where.sql}`,
 		params: where.params
 	});
-	const groupCols = groupFields.map((f) => dialect.quoteIdentifier(f)).join(", ");
+	const groupBy = groupFields?.length ? ` GROUP BY ${groupFields.map((f) => dialect.quoteIdentifier(f)).join(", ")}` : "";
 	return finalizeParams(dialect, {
-		sql: `SELECT COUNT(*) AS ${dialect.quoteIdentifier("count")} FROM (SELECT 1 FROM ${dialect.quoteTable(table)} WHERE ${where.sql} GROUP BY ${groupCols}) AS ${dialect.quoteIdentifier("_groups")}`,
-		params: where.params
+		sql: `SELECT ${countCol} FROM (SELECT ${groupBy ? "1" : "COUNT(*)"} FROM ${dialect.quoteTable(table)} WHERE ${where.sql}${groupBy}${having?.sql ?? ""}) AS ${dialect.quoteIdentifier("_groups")}`,
+		params: [...where.params, ...having?.params ?? []]
 	});
 }
 //#endregion

package/dist/index.d.cts

@@ -215,8 +215,10 @@ declare const AGG_FN_SQL: Record<string, string>;
  */
 declare function buildAggregateSelect(dialect: SqlDialect, table: string, where: TSqlFragment, controls: DbControls): TSqlFragment;
 /**
- * Builds a COUNT query for the number of distinct groups.
- * Returns `{ count: N }` when executed.
+ * Builds a COUNT query for the number of distinct groups — the groups that
+ * survive `$having` when one is given (the same predicate the row query
+ * renders, so `$count` agrees with the row set). Returns `{ count: N }` when
+ * executed.
  */
 declare function buildAggregateCount(dialect: SqlDialect, table: string, where: TSqlFragment, controls: DbControls): TSqlFragment;
 //#endregion

package/dist/index.d.mts

@@ -215,8 +215,10 @@ declare const AGG_FN_SQL: Record<string, string>;
  */
 declare function buildAggregateSelect(dialect: SqlDialect, table: string, where: TSqlFragment, controls: DbControls): TSqlFragment;
 /**
- * Builds a COUNT query for the number of distinct groups.
- * Returns `{ count: N }` when executed.
+ * Builds a COUNT query for the number of distinct groups — the groups that
+ * survive `$having` when one is given (the same predicate the row query
+ * renders, so `$count` agrees with the row set). Returns `{ count: N }` when
+ * executed.
  */
 declare function buildAggregateCount(dialect: SqlDialect, table: string, where: TSqlFragment, controls: DbControls): TSqlFragment;
 //#endregion

package/dist/index.mjs

@@ -338,19 +338,27 @@ function buildAggExpr(dialect, expr) {
 	return `${aggFnSql(dialect, expr)} AS ${dialect.quoteIdentifier(resolveAlias(expr))}`;
 }
 /**
-* Renders `$having`. A key that names an aggregate alias (`$as`, else
-* `fn_field`) renders the aggregate expression itself — `SUM("amount") > ?`
-* — because PostgreSQL does not allow a SELECT alias in HAVING (MySQL and
-* SQLite tolerate it, so the expression form keeps all three identical).
-* Other keys (grouped columns) render as plain columns.
+* ` HAVING <predicate>` (leading space) + params for `controls.$having`, or
+* `undefined` when there is nothing to render. Shared by the row and the
+* count builders so both filter the same group set.
+*
+* A key that names an aggregate alias (`$as`, else `fn_field`) renders the
+* aggregate expression itself — `SUM("amount") > ?` — because PostgreSQL does
+* not allow a SELECT alias in HAVING (MySQL and SQLite tolerate it, so the
+* expression form keeps all three identical). Other keys (grouped columns)
+* render as plain columns.
 */
-function buildHaving(dialect, controls) {
+function havingClause(dialect, controls) {
 	const having = controls.$having;
-	const aggregates = controls.$select?.aggregates;
-	if (!aggregates?.length) return buildWhere(dialect, having);
+	if (!having) return void 0;
 	const exprByAlias = /* @__PURE__ */ new Map();
-	for (const expr of aggregates) exprByAlias.set(resolveAlias(expr), aggFnSql(dialect, expr));
-	return walkFilter(having, createFilterVisitor(dialect, { columnRef: (field) => exprByAlias.get(field) ?? dialect.quoteIdentifier(field) })) ?? EMPTY_AND;
+	for (const expr of controls.$select?.aggregates ?? []) exprByAlias.set(resolveAlias(expr), aggFnSql(dialect, expr));
+	const fragment = walkFilter(having, createFilterVisitor(dialect, { columnRef: (field) => exprByAlias.get(field) ?? dialect.quoteIdentifier(field) }));
+	if (!fragment || fragment.sql === EMPTY_AND.sql) return void 0;
+	return {
+		sql: ` HAVING ${fragment.sql}`,
+		params: fragment.params
+	};
 }
 /**
 * Builds a SELECT ... GROUP BY statement with aggregate functions.
@@ -368,12 +376,10 @@ function buildAggregateSelect(dialect, table, where, controls) {
 		const groupCols = groupBy.map((f) => dialect.quoteIdentifier(f)).join(", ");
 		sql += ` GROUP BY ${groupCols}`;
 	}
-	if (controls.$having) {
-		const havingFragment = buildHaving(dialect, controls);
-		if (havingFragment.sql !== EMPTY_AND.sql) {
-			sql += ` HAVING ${havingFragment.sql}`;
-			params.push(...havingFragment.params);
-		}
+	const having = havingClause(dialect, controls);
+	if (having) {
+		sql += having.sql;
+		params.push(...having.params);
 	}
 	if (controls.$sort) {
 		const orderParts = [];
@@ -395,19 +401,23 @@ function buildAggregateSelect(dialect, table, where, controls) {
 	});
 }
 /**
-* Builds a COUNT query for the number of distinct groups.
-* Returns `{ count: N }` when executed.
+* Builds a COUNT query for the number of distinct groups — the groups that
+* survive `$having` when one is given (the same predicate the row query
+* renders, so `$count` agrees with the row set). Returns `{ count: N }` when
+* executed.
 */
 function buildAggregateCount(dialect, table, where, controls) {
 	const groupFields = controls.$groupBy;
-	if (!groupFields?.length) return finalizeParams(dialect, {
-		sql: `SELECT COUNT(*) AS ${dialect.quoteIdentifier("count")} FROM ${dialect.quoteTable(table)} WHERE ${where.sql}`,
+	const having = havingClause(dialect, controls);
+	const countCol = `COUNT(*) AS ${dialect.quoteIdentifier("count")}`;
+	if (!groupFields?.length && !having) return finalizeParams(dialect, {
+		sql: `SELECT ${countCol} FROM ${dialect.quoteTable(table)} WHERE ${where.sql}`,
 		params: where.params
 	});
-	const groupCols = groupFields.map((f) => dialect.quoteIdentifier(f)).join(", ");
+	const groupBy = groupFields?.length ? ` GROUP BY ${groupFields.map((f) => dialect.quoteIdentifier(f)).join(", ")}` : "";
 	return finalizeParams(dialect, {
-		sql: `SELECT COUNT(*) AS ${dialect.quoteIdentifier("count")} FROM (SELECT 1 FROM ${dialect.quoteTable(table)} WHERE ${where.sql} GROUP BY ${groupCols}) AS ${dialect.quoteIdentifier("_groups")}`,
-		params: where.params
+		sql: `SELECT ${countCol} FROM (SELECT ${groupBy ? "1" : "COUNT(*)"} FROM ${dialect.quoteTable(table)} WHERE ${where.sql}${groupBy}${having?.sql ?? ""}) AS ${dialect.quoteIdentifier("_groups")}`,
+		params: [...where.params, ...having?.params ?? []]
 	});
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-sql-tools",
-  "version": "0.1.128",
+  "version": "0.1.129",
   "description": "Shared SQL builder utilities for @atscript database adapters.",
   "keywords": [
     "atscript",
@@ -42,7 +42,7 @@
   },
   "peerDependencies": {
     "@uniqu/core": "^0.1.8",
-    "@atscript/db": "^0.1.128"
+    "@atscript/db": "^0.1.129"
   },
   "scripts": {
     "build": "vp pack",