Skip to content

Fix/aws data api timezone validation #4918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: beta
Choose a base branch
from
Open

Fix/aws data api timezone validation #4918

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e3b24f
Enhanced timezone validation for AWS Data API compatibility
jasoneggert Sep 12, 2025
e1854ab
Remove backup files from repository
jasoneggert Sep 12, 2025
efe4002
Merge branch 'beta' into fix/aws-data-api-timezone-validation
jasoneggert Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions drizzle-orm/src/pg-core/columns/timestamp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ export class PgTimestamp<T extends ColumnBaseConfig<'object date'>> extends PgCo
}

override mapFromDriverValue = (value: string): Date | null => {
// Enhanced timezone validation with regex to detect timezone indicators
const hasTimezone = /[+-]\d{2}:?\d{2}$|Z$/.test(value);

if (this.withTimezone && !hasTimezone) {
// Assume UTC if no timezone specified (fixes AWS Data API case)
return new Date(value + 'Z');
}

return new Date(this.withTimezone ? value : value + '+0000');
};

Expand Down