@atscript/db-sql-tools 0.1.133 → 0.1.135

package/dist/index.cjs

@@ -348,9 +348,14 @@ const AGG_FN_SQL = {
 	min: "MIN",
 	max: "MAX"
 };
+/** The SQL function for an aggregate name; throws `INVALID_QUERY` on an unsupported one. */
+function aggFnName(fn, path) {
+	(0, _atscript_db_agg.assertAggregateFn)(fn, path);
+	return AGG_FN_SQL[fn];
+}
 /** The bare aggregate call, e.g. `SUM("amount")` / `COUNT(*)`. */
 function aggFnSql(dialect, expr) {
-	return `${AGG_FN_SQL[expr.$fn] ?? expr.$fn.toUpperCase()}(${expr.$field === "*" ? "*" : dialect.quoteIdentifier(expr.$field)})`;
+	return `${aggFnName(expr.$fn)}(${expr.$field === "*" ? "*" : dialect.quoteIdentifier(expr.$field)})`;
 }
 function buildAggExpr(dialect, expr) {
 	return `${aggFnSql(dialect, expr)} AS ${dialect.quoteIdentifier((0, _atscript_db_agg.resolveAlias)(expr))}`;
@@ -703,7 +708,7 @@ function buildProjection(dialect, select) {
 }
 /** Builds the SQL expression for a single aggregate column. */
 function buildAggColExpr(dialect, c) {
-	return `${AGG_FN_SQL[c.aggFn] ?? c.aggFn.toUpperCase()}(${c.aggField === "*" ? "*" : `${dialect.quoteIdentifier(c.sourceTable)}.${dialect.quoteIdentifier(c.sourceColumn)}`})`;
+	return `${aggFnName(c.aggFn, c.viewColumn)}(${c.aggField === "*" ? "*" : `${dialect.quoteIdentifier(c.sourceTable)}.${dialect.quoteIdentifier(c.sourceColumn)}`})`;
 }
 /**
 * Builds a CREATE VIEW statement from a view plan and column mappings.

package/dist/index.d.cts

@@ -1,5 +1,6 @@
 import { AtscriptQueryFieldRef, AtscriptQueryNode, DbControls, TDbDefaultFn, TDbFieldMeta, TDbReferentialAction, TFieldOps, TResolvedBucket, TViewColumnMapping, TViewPlan, UniquSelect } from "@atscript/db";
 import { FilterExpr, FilterVisitor } from "@uniqu/core";
+import { TDbAggregateFn } from "@atscript/db/agg";
 
 //#region src/dialect.d.ts
 interface TSqlFragment {
@@ -263,7 +264,7 @@ declare const queryOpToSql: Record<string, string>;
 declare function queryNodeToSql(node: AtscriptQueryNode, resolveFieldRef: (ref: AtscriptQueryFieldRef) => string): string;
 //#endregion
 //#region src/agg.d.ts
-declare const AGG_FN_SQL: Record<string, string>;
+declare const AGG_FN_SQL: Readonly<Record<TDbAggregateFn, string>>;
 /**
  * The SQL a `$groupBy` key renders as: a calendar-bucket alias renders the
  * bucket EXPRESSION (`dialect.calendarBucket`), anything else the quoted

package/dist/index.d.mts

@@ -1,5 +1,6 @@
 import { FilterExpr, FilterVisitor } from "@uniqu/core";
 import { AtscriptQueryFieldRef, AtscriptQueryNode, DbControls, TDbDefaultFn, TDbFieldMeta, TDbReferentialAction, TFieldOps, TResolvedBucket, TViewColumnMapping, TViewPlan, UniquSelect } from "@atscript/db";
+import { TDbAggregateFn } from "@atscript/db/agg";
 
 //#region src/dialect.d.ts
 interface TSqlFragment {
@@ -263,7 +264,7 @@ declare const queryOpToSql: Record<string, string>;
 declare function queryNodeToSql(node: AtscriptQueryNode, resolveFieldRef: (ref: AtscriptQueryFieldRef) => string): string;
 //#endregion
 //#region src/agg.d.ts
-declare const AGG_FN_SQL: Record<string, string>;
+declare const AGG_FN_SQL: Readonly<Record<TDbAggregateFn, string>>;
 /**
  * The SQL a `$groupBy` key renders as: a calendar-bucket alias renders the
  * bucket EXPRESSION (`dialect.calendarBucket`), anything else the quoted

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { BUCKET_UNITS, TIME_ZONE_NAME_RE, WEEK_STARTS, walkFilter } from "@uniqu/core";
 import { DbError } from "@atscript/db";
-import { resolveAlias } from "@atscript/db/agg";
+import { assertAggregateFn, resolveAlias } from "@atscript/db/agg";
 //#region src/dialect.ts
 /**
 * Replaces positional `?` placeholders with dialect-specific numbered placeholders
@@ -347,9 +347,14 @@ const AGG_FN_SQL = {
 	min: "MIN",
 	max: "MAX"
 };
+/** The SQL function for an aggregate name; throws `INVALID_QUERY` on an unsupported one. */
+function aggFnName(fn, path) {
+	assertAggregateFn(fn, path);
+	return AGG_FN_SQL[fn];
+}
 /** The bare aggregate call, e.g. `SUM("amount")` / `COUNT(*)`. */
 function aggFnSql(dialect, expr) {
-	return `${AGG_FN_SQL[expr.$fn] ?? expr.$fn.toUpperCase()}(${expr.$field === "*" ? "*" : dialect.quoteIdentifier(expr.$field)})`;
+	return `${aggFnName(expr.$fn)}(${expr.$field === "*" ? "*" : dialect.quoteIdentifier(expr.$field)})`;
 }
 function buildAggExpr(dialect, expr) {
 	return `${aggFnSql(dialect, expr)} AS ${dialect.quoteIdentifier(resolveAlias(expr))}`;
@@ -702,7 +707,7 @@ function buildProjection(dialect, select) {
 }
 /** Builds the SQL expression for a single aggregate column. */
 function buildAggColExpr(dialect, c) {
-	return `${AGG_FN_SQL[c.aggFn] ?? c.aggFn.toUpperCase()}(${c.aggField === "*" ? "*" : `${dialect.quoteIdentifier(c.sourceTable)}.${dialect.quoteIdentifier(c.sourceColumn)}`})`;
+	return `${aggFnName(c.aggFn, c.viewColumn)}(${c.aggField === "*" ? "*" : `${dialect.quoteIdentifier(c.sourceTable)}.${dialect.quoteIdentifier(c.sourceColumn)}`})`;
 }
 /**
 * Builds a CREATE VIEW statement from a view plan and column mappings.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-sql-tools",
-  "version": "0.1.133",
+  "version": "0.1.135",
   "description": "Shared SQL builder utilities for @atscript database adapters.",
   "keywords": [
     "atscript",
@@ -37,12 +37,12 @@
     "access": "public"
   },
   "devDependencies": {
-    "@uniqu/core": "^0.1.10",
+    "@uniqu/core": "^0.1.11",
     "unplugin-atscript": "^0.1.92"
   },
   "peerDependencies": {
-    "@uniqu/core": "^0.1.10",
-    "@atscript/db": "^0.1.133"
+    "@uniqu/core": "^0.1.11",
+    "@atscript/db": "^0.1.135"
   },
   "scripts": {
     "build": "vp pack",