Skip to content
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

Convert saved non-UTC dates to UTC #10967

Merged
merged 3 commits into from
May 8, 2024
Merged

Convert saved non-UTC dates to UTC #10967

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13b4f79
Convert saved non-UTC dates to UTC
matthewp May 7, 2024
d40bd3c
Simplify the check
matthewp May 7, 2024
ae2e831
Simplify check and add link
matthewp May 8, 2024
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
5 changes: 5 additions & 0 deletions .changeset/tiny-gifts-fry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/db": patch
---

Convert non-ISO date to UTC time
11 changes: 11 additions & 0 deletions packages/db/src/runtime/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ export function hasPrimaryKey(column: DBColumn) {
return 'primaryKey' in column.schema && !!column.schema.primaryKey;
}

function isISODateString(str: string) {
if (!/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/.test(str)) return false;
const d = new Date(str);
return d instanceof Date && !isNaN(d.getTime()) && d.toISOString() === str; // valid date
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we even need to be this cautious? What are the chances something that matches the ISO pattern is invalid if we’re adding it to the DB?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure, is there a downside to doing this though (I just grabbed from stackoverflow)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's copied code we now own, I'd just leave a comment to the source

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a downside to doing this though

I guess only extra work for each Date parsed? If you fetched a lot of data, you’re now constructing the Date twice for each one. I don’t really mind leaving it in though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed extra bits, it's just the regex now.

}

const dateType = customType<{ data: Date; driverData: string }>({
dataType() {
return 'text';
Expand All @@ -27,6 +33,11 @@ const dateType = customType<{ data: Date; driverData: string }>({
return value.toISOString();
},
fromDriver(value) {
if(!isISODateString(value)) {
// values saved using CURRENT_TIMESTAMP are not valid ISO strings
// but *are* in UTC, so append the UTC zone.
value += '.000Z';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did a quick tests and += 'Z' is actually all it takes — the milliseconds are irrelevant fwiw.

}
return new Date(value);
},
});
Expand Down
Loading