From e7622449ae9639e345b8b33f623b8c38cbec6e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20Koskim=C3=A4ki?= <koskomi@gmail.com>
Date: Tue, 2 Jan 2024 12:36:14 +0200
Subject: [PATCH] Bring back default for second agg generic. Fixes #829

---
 src/query-builder/function-module.ts          |  2 +-
 .../test-d/aggregate-function.test-d.ts       | 32 +++++++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/query-builder/function-module.ts b/src/query-builder/function-module.ts
index e7c582621..a942241c9 100644
--- a/src/query-builder/function-module.ts
+++ b/src/query-builder/function-module.ts
@@ -160,7 +160,7 @@ export interface FunctionModule<DB, TB extends keyof DB> {
    * from "person"
    * ```
    */
-  agg<O, RE extends ReferenceExpression<DB, TB>>(
+  agg<O, RE extends ReferenceExpression<DB, TB> = ReferenceExpression<DB, TB>>(
     name: string,
     args?: ReadonlyArray<RE>
   ): AggregateFunctionBuilder<DB, TB, O>
diff --git a/test/typings/test-d/aggregate-function.test-d.ts b/test/typings/test-d/aggregate-function.test-d.ts
index 9f0ad3bf4..d145fe9f9 100644
--- a/test/typings/test-d/aggregate-function.test-d.ts
+++ b/test/typings/test-d/aggregate-function.test-d.ts
@@ -109,7 +109,6 @@ async function testSelectExpressionBuilderWithDefaultGenerics(
       eb.fn.min('age').as('min_age'),
       eb.fn.sum('age').as('total_age'),
     ])
-
     .executeTakeFirstOrThrow()
 
   expectAssignable<string | number>(result.avg_age)
@@ -128,6 +127,33 @@ async function testSelectExpressionBuilderWithDefaultGenerics(
   expectNotAssignable<null>(result.total_age)
 }
 
+async function testSelectExpressionBuilderWithCustomGenerics(
+  db: Kysely<Database>
+) {
+  const result = await db
+    .selectFrom('person')
+    .select((eb) => [
+      eb.fn.avg<number>('age').as('avg_age'),
+      eb.fn.count<number>('age').as('total_people'),
+      eb.fn.countAll<number>().as('total_all'),
+      eb.fn.countAll<number>('person').as('total_all_people'),
+      eb.fn.max<number>('age').as('max_age'),
+      eb.fn.min<number>('age').as('min_age'),
+      eb.fn.sum<number>('age').as('total_age'),
+      eb.fn.agg<number>('max', ['age']).as('another_max_age'),
+    ])
+    .executeTakeFirstOrThrow()
+
+  expectType<number>(result.avg_age)
+  expectType<number>(result.total_people)
+  expectType<number>(result.total_all)
+  expectType<number>(result.total_all_people)
+  expectType<number>(result.max_age)
+  expectType<number>(result.min_age)
+  expectType<number>(result.total_age)
+  expectType<number>(result.another_max_age)
+}
+
 async function testSelectExpressionBuilderWithSubExpressions(
   db: Kysely<Database>
 ) {
@@ -155,7 +181,7 @@ async function testSelectExpressionBuilderWithSubExpressions(
 }
 
 async function testSelectWithCustomGenerics(db: Kysely<Database>) {
-  const { avg, count, countAll, max, min, sum } = db.fn
+  const { avg, count, countAll, max, min, sum, agg } = db.fn
 
   const result = await db
     .selectFrom('person')
@@ -168,6 +194,7 @@ async function testSelectWithCustomGenerics(db: Kysely<Database>) {
     .select(min<number | null>('age').as('nullable_min_age'))
     .select(sum<number>('age').as('total_age'))
     .select(sum<number | null>('age').as('nullable_total_age'))
+    .select(agg<number>('max', ['age']).as('max_age'))
     .executeTakeFirstOrThrow()
 
   expectAssignable<number>(result.avg_age)
@@ -188,6 +215,7 @@ async function testSelectWithCustomGenerics(db: Kysely<Database>) {
   expectNotAssignable<string | bigint | null>(result.total_age)
   expectAssignable<number | null>(result.nullable_total_age)
   expectNotAssignable<string | bigint>(result.nullable_total_age)
+  expectType<number>(result.max_age)
 }
 
 async function testSelectUnexpectedColumn(db: Kysely<Database>) {