Convert saved non-UTC dates to UTC (#10967)

* Convert saved non-UTC dates to UTC * Simplify the check * Simplify check and add link
withastro · May 8, 2024 · a134318 · a134318
1 parent fa240ff
commit a134318
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.changeset/tiny-gifts-fry.md b/.changeset/tiny-gifts-fry.md
@@ -0,0 +1,5 @@
+---
+"@astrojs/db": patch
+---
+
+Convert non-ISO date to UTC time
diff --git a/packages/db/src/runtime/index.ts b/packages/db/src/runtime/index.ts
@@ -19,6 +19,11 @@ export function hasPrimaryKey(column: DBColumn) {
 	return 'primaryKey' in column.schema && !!column.schema.primaryKey;
 }
 
+// Taken from:
+// https://stackoverflow.com/questions/52869695/check-if-a-date-string-is-in-iso-and-utc-format
+const isISODateString = (str: string) =>
+  /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/.test(str);
+
 const dateType = customType<{ data: Date; driverData: string }>({
 	dataType() {
 		return 'text';
@@ -27,6 +32,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 += 'Z';
+		}
 		return new Date(value);
 	},
 });