From 7147752b9c5c33e4741e1c3ceaf643888ca36256 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 11 Sep 2023 21:26:05 +0100
Subject: [PATCH 1/3] Fix date validation regex

---
 packages/server/src/integrations/tests/sql.spec.ts | 12 ++++++++++++
 packages/server/src/integrations/utils.ts          |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/integrations/tests/sql.spec.ts b/packages/server/src/integrations/tests/sql.spec.ts
index 0bf1498f5f..5bbdbff006 100644
--- a/packages/server/src/integrations/tests/sql.spec.ts
+++ b/packages/server/src/integrations/tests/sql.spec.ts
@@ -657,4 +657,16 @@ describe("SQL query builder", () => {
       sql: `select * from (select top (@p0) * from [test] order by [test].[id] asc) as [test]`,
     })
   })
+
+  it("should not parse JSON string as Date", () => {
+    let query = new Sql(SqlClient.POSTGRES, limit)._query(
+      generateCreateJson(TABLE_NAME, {
+        name: '{ "created_at":"2023-09-09T03:21:06.024Z" }',
+      })
+    )
+    expect(query).toEqual({
+      bindings: ['{ "created_at":"2023-09-09T03:21:06.024Z" }'],
+      sql: `insert into \"test\" (\"name\") values ($1) returning *`,
+    })
+  })
 })
diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts
index 3f598ce986..02041c9d4b 100644
--- a/packages/server/src/integrations/utils.ts
+++ b/packages/server/src/integrations/utils.ts
@@ -182,7 +182,7 @@ export function getSqlQuery(query: SqlQuery | string): SqlQuery {
 export const isSQL = helpers.isSQL
 
 export function isIsoDateString(str: string) {
-  if (!/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/.test(str)) {
+  if (!/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/.test(str.trim())) {
     return false
   }
   let d = new Date(str)

From 17dc01808c384e5d703b14e8ce90bb0b363f3739 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 11 Sep 2023 21:35:51 +0100
Subject: [PATCH 2/3] Additional unit test

---
 packages/server/src/integrations/base/sql.ts       |  2 +-
 packages/server/src/integrations/tests/sql.spec.ts | 13 +++++++++++++
 packages/server/src/integrations/utils.ts          |  7 ++++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index 2cdae682b0..bf19ec9afe 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -58,7 +58,7 @@ function parse(input: any) {
     return null
   }
   if (isIsoDateString(input)) {
-    return new Date(input)
+    return new Date(input.trim())
   }
   return input
 }
diff --git a/packages/server/src/integrations/tests/sql.spec.ts b/packages/server/src/integrations/tests/sql.spec.ts
index 5bbdbff006..5cc4849d03 100644
--- a/packages/server/src/integrations/tests/sql.spec.ts
+++ b/packages/server/src/integrations/tests/sql.spec.ts
@@ -669,4 +669,17 @@ describe("SQL query builder", () => {
       sql: `insert into \"test\" (\"name\") values ($1) returning *`,
     })
   })
+
+  it("should parse and trim valid string as Date", () => {
+    const dateObj = new Date("2023-09-09T03:21:06.024Z")
+    let query = new Sql(SqlClient.POSTGRES, limit)._query(
+      generateCreateJson(TABLE_NAME, {
+        name: " 2023-09-09T03:21:06.024Z ",
+      })
+    )
+    expect(query).toEqual({
+      bindings: [dateObj],
+      sql: `insert into \"test\" (\"name\") values ($1) returning *`,
+    })
+  })
 })
diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts
index 02041c9d4b..2883e4471c 100644
--- a/packages/server/src/integrations/utils.ts
+++ b/packages/server/src/integrations/utils.ts
@@ -182,11 +182,12 @@ export function getSqlQuery(query: SqlQuery | string): SqlQuery {
 export const isSQL = helpers.isSQL
 
 export function isIsoDateString(str: string) {
-  if (!/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/.test(str.trim())) {
+  const trimmedValue = str.trim()
+  if (!/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/.test(trimmedValue)) {
     return false
   }
-  let d = new Date(str)
-  return d.toISOString() === str
+  let d = new Date(trimmedValue)
+  return d.toISOString() === trimmedValue
 }
 
 /**

From 377fc7fc10e4176b4385f8e1a97dd0ee7321c6fc Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Tue, 12 Sep 2023 09:38:33 +0100
Subject: [PATCH 3/3] Updating pro reference to master

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 4638ae916e..961d683794 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 4638ae916e55ce89166095578cbd01745d0ee9ee
+Subproject commit 961d683794442f615468d44b684e5a94633109eb