Fixed bun-sql:postgresql date, timestamp mappers not accounting for Date instances in driver response, updated changelogs

Author: Sukairo-02

changelogs/drizzle-orm/0.45.0.md

@@ -1,3 +1,5 @@
 - Fixed pg-native Pool detection in node-postgres transactions  
 - Allowed subqueries in select fields  
-- Updated typo algorythm => algorithm  
+- Updated typo algorythm => algorithm  
+- Fixed `$onUpdate` not handling `SQL` values (fixes [#2388](https://github.com/drizzle-team/drizzle-orm/issues/2388))  
+- Fixed `pg` mappers not handling `Date` instances in `bun-sql:postgresql` driver responses for `date`, `timestamp` types (fixes [#4493](https://github.com/drizzle-team/drizzle-orm/issues/4493))  

drizzle-orm/src/pg-core/columns/date.ts

@@ -37,8 +37,10 @@ export class PgDate<T extends ColumnBaseConfig<'date', 'PgDate'>> extends PgColu
 		return 'date';
 	}
 
-	override mapFromDriverValue(value: string): Date {
-		return new Date(value);
+	override mapFromDriverValue(value: string | Date): Date {
+		if (typeof value === 'string') return new Date(value);
+
+		return value;
 	}
 
 	override mapToDriverValue(value: Date): string {
@@ -81,6 +83,12 @@ export class PgDateString<T extends ColumnBaseConfig<'string', 'PgDateString'>>
 	getSQLType(): string {
 		return 'date';
 	}
+
+	override mapFromDriverValue(value: Date | string): string {
+		if (typeof value === 'string') return value;
+
+		return value.toISOString().slice(0, -14);
+	}
 }
 
 export interface PgDateConfig<T extends 'date' | 'string' = 'date' | 'string'> {

drizzle-orm/src/pg-core/columns/timestamp.ts

@@ -58,9 +58,11 @@ export class PgTimestamp<T extends ColumnBaseConfig<'date', 'PgTimestamp'>> exte
 		return `timestamp${precision}${this.withTimezone ? ' with time zone' : ''}`;
 	}
 
-	override mapFromDriverValue = (value: string): Date | null => {
-		return new Date(this.withTimezone ? value : value + '+0000');
-	};
+	override mapFromDriverValue(value: Date | string): Date {
+		if (typeof value === 'string') return new Date(this.withTimezone ? value : value + '+0000');
+
+		return value;
+	}
 
 	override mapToDriverValue = (value: Date): string => {
 		return value.toISOString();
@@ -121,6 +123,19 @@ export class PgTimestampString<T extends ColumnBaseConfig<'string', 'PgTimestamp
 		const precision = this.precision === undefined ? '' : `(${this.precision})`;
 		return `timestamp${precision}${this.withTimezone ? ' with time zone' : ''}`;
 	}
+
+	override mapFromDriverValue(value: Date | string): string {
+		if (typeof value === 'string') return value;
+
+		const shortened = value.toISOString().slice(0, -1).replace('T', ' ');
+		if (this.withTimezone) {
+			const offset = value.getTimezoneOffset();
+			const sign = offset <= 0 ? '+' : '-';
+			return `${shortened}${sign}${Math.floor(Math.abs(offset) / 60).toString().padStart(2, '0')}`;
+		}
+
+		return shortened;
+	}
 }
 
 export type Precision = 0 | 1 | 2 | 3 | 4 | 5 | 6;