fix all tests.

kysely-org · Jan 5, 2025 · caf92cc · caf92cc
1 parent a6caf96
commit caf92cc
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 7 deletions.
diff --git a/src/query-builder/function-module.ts b/src/query-builder/function-module.ts
@@ -487,7 +487,7 @@ export interface FunctionModule<DB, TB extends keyof DB> {
    * ```
    */
   max<
-    O extends number | bigint | Date | string | null = never,
+    O extends number | string | Date | bigint | null = never,
     RE extends ReferenceExpression<DB, TB> = ReferenceExpression<DB, TB>,
   >(
     expr: RE,
@@ -499,7 +499,7 @@ export interface FunctionModule<DB, TB extends keyof DB> {
           DB,
           TB,
           RE,
-          number | bigint | Date | string
+          number | string | Date | bigint
         >
       : O
   >
@@ -543,7 +543,7 @@ export interface FunctionModule<DB, TB extends keyof DB> {
    * ```
    */
   min<
-    O extends number | bigint | Date | string | null = never,
+    O extends number | string | Date | bigint | null = never,
     RE extends ReferenceExpression<DB, TB> = ReferenceExpression<DB, TB>,
   >(
     expr: RE,
@@ -555,7 +555,7 @@ export interface FunctionModule<DB, TB extends keyof DB> {
           DB,
           TB,
           RE,
-          number | bigint | Date | string
+          number | string | Date | bigint
         >
       : O
   >

diff --git a/test/node/src/introspect.test.ts b/test/node/src/introspect.test.ts
@@ -151,6 +151,15 @@ for (const dialect of DIALECTS) {
                   hasDefaultValue: true,
                   comment: undefined,
                 },
+                {
+                  name: 'created_at',
+                  dataType: 'timestamptz',
+                  dataTypeSchema: 'pg_catalog',
+                  isNullable: false,
+                  isAutoIncrementing: false,
+                  hasDefaultValue: true,
+                  comment: undefined,
+                },
               ],
             },
             {
@@ -361,6 +370,14 @@ for (const dialect of DIALECTS) {
                   hasDefaultValue: true,
                   comment: undefined,
                 },
+                {
+                  name: 'created_at',
+                  dataType: 'datetime',
+                  isNullable: false,
+                  isAutoIncrementing: false,
+                  hasDefaultValue: true,
+                  comment: undefined,
+                },
               ],
             },
             {
@@ -473,6 +490,15 @@ for (const dialect of DIALECTS) {
                   name: 'children',
                   comment: undefined,
                 },
+                {
+                  dataType: 'datetime',
+                  dataTypeSchema: 'sys',
+                  hasDefaultValue: true,
+                  isAutoIncrementing: false,
+                  isNullable: false,
+                  name: 'created_at',
+                  comment: undefined,
+                },
                 {
                   dataType: 'varchar',
                   dataTypeSchema: 'sys',
@@ -720,6 +746,14 @@ for (const dialect of DIALECTS) {
                   hasDefaultValue: true,
                   comment: undefined,
                 },
+                {
+                  name: 'created_at',
+                  dataType: 'TEXT',
+                  isNullable: false,
+                  isAutoIncrementing: false,
+                  hasDefaultValue: true,
+                  comment: undefined,
+                },
               ],
             },
             {

diff --git a/test/node/src/test-setup.ts b/test/node/src/test-setup.ts
@@ -29,13 +29,14 @@ import {
   InsertResult,
   SqliteDialect,
   InsertQueryBuilder,
-  Logger,
   Generated,
   sql,
   ColumnType,
   InsertObject,
   MssqlDialect,
   SelectQueryBuilder,
+  GeneratedAlways,
+  ColumnDataType,
 } from '../../../'
 import {
   OrderByDirection,
@@ -55,6 +56,7 @@ export interface Person {
   gender: Gender
   marital_status: MaritalStatus | null
   children: Generated<number>
+  created_at: GeneratedAlways<Date | string>
 }
 
 export interface Pet {
@@ -313,6 +315,18 @@ async function createDatabase(
     .addColumn('gender', 'varchar(50)', (col) => col.notNull())
     .addColumn('marital_status', 'varchar(50)')
     .addColumn('children', 'integer', (col) => col.notNull().defaultTo(0))
+    .addColumn(
+      'created_at',
+      (
+        {
+          postgres: 'timestamptz',
+          mysql: 'datetime',
+          mssql: 'datetime',
+          sqlite: 'text',
+        } satisfies Record<BuiltInDialect, ColumnDataType>
+      )[dialect],
+      (col) => col.notNull().defaultTo(sql`current_timestamp`),
+    )
     .execute()
 
   await createTableWithId(db.schema, dialect, 'pet')

diff --git a/test/typings/test-d/aggregate-function.test-d.ts b/test/typings/test-d/aggregate-function.test-d.ts
@@ -339,13 +339,13 @@ async function testSelectWithDynamicReference(db: Kysely<Database>) {
   expectNotAssignable<null>(result.count)
   expectAssignable<bigint>(result.another_count)
   expectNotAssignable<string | number | null>(result.another_count)
-  expectAssignable<string | number | bigint>(result.max)
+  expectAssignable<number | string | Date | bigint>(result.max)
   expectNotAssignable<null>(result.max)
   expectAssignable<number>(result.another_max)
   expectNotAssignable<string | bigint>(result.another_max)
   expectAssignable<number | null>(result.nullable_max)
   expectNotAssignable<string | bigint>(result.nullable_max)
-  expectAssignable<string | number | bigint>(result.min)
+  expectAssignable<number | string | Date | bigint>(result.min)
   expectNotAssignable<null>(result.min)
   expectAssignable<string>(result.another_min)
   expectNotAssignable<number | bigint | null>(result.another_min)