@budibase/server 2.1.38 → 2.1.39

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.1.38",
+  "version": "2.1.39",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.1.38",
-    "@budibase/client": "^2.1.38",
-    "@budibase/pro": "2.1.37",
-    "@budibase/string-templates": "^2.1.38",
-    "@budibase/types": "^2.1.38",
+    "@budibase/backend-core": "^2.1.39",
+    "@budibase/client": "^2.1.39",
+    "@budibase/pro": "2.1.38",
+    "@budibase/string-templates": "^2.1.39",
+    "@budibase/types": "^2.1.39",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -199,5 +199,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "98eceef539c21b0c72c73aa9ec313e38077dc08f"
+  "gitHead": "cf6c77309cb3778fe7bbe11239203a3ad27ee696"
 }

package/src/integrations/mysql.ts

@@ -106,7 +106,11 @@ function bindingTypeCoerce(bindings: any[]) {
     }
     // if not a number, see if it is a date - important to do in this order as any
     // integer will be considered a valid date
-    else if (/^\d/.test(binding) && dayjs(binding).isValid()) {
+    else if (
+      /^\d/.test(binding) &&
+      dayjs(binding).isValid() &&
+      !binding.includes(",")
+    ) {
       bindings[i] = dayjs(binding).toDate()
     }
   }

package/src/integrations/tests/mysql.spec.ts

@@ -73,4 +73,61 @@ describe("MySQL Integration", () => {
       expect(response).toEqual([{ deleted: true }])
     })
   })
+
+  describe("binding type coerce", () => {
+    it("ignores non-string types ", async () => {
+      const sql = "select * from users;"
+      const date = new Date()
+      await config.integration.read({
+        sql,
+        bindings: [11, date, ["a", "b", "c"], { id: 1 }],
+      })
+      expect(config.integration.client.query).toHaveBeenCalledWith(sql, [
+        11,
+        date,
+        ["a", "b", "c"],
+        { id: 1 },
+      ])
+    })
+
+    it("parses strings matching a number regex", async () => {
+      const sql = "select * from users;"
+      await config.integration.read({
+        sql,
+        bindings: ["101", "3.14"],
+      })
+      expect(config.integration.client.query).toHaveBeenCalledWith(
+        sql,
+        [101, 3.14]
+      )
+    })
+
+    it("parses strings matching a valid date format", async () => {
+      const sql = "select * from users;"
+      await config.integration.read({
+        sql,
+        bindings: [
+          "2001-10-30",
+          "2010-09-01T13:30:59.123Z",
+          "2021-02-05 12:01 PM",
+        ],
+      })
+      expect(config.integration.client.query).toHaveBeenCalledWith(sql, [
+        new Date("2001-10-30T00:00:00.000Z"),
+        new Date("2010-09-01T13:30:59.123Z"),
+        new Date("2021-02-05T12:01:00.000Z"),
+      ])
+    })
+
+    it("does not parse string matching a valid array of numbers as date", async () => {
+      const sql = "select * from users;"
+      await config.integration.read({
+        sql,
+        bindings: ["1,2,2017"],
+      })
+      expect(config.integration.client.query).toHaveBeenCalledWith(sql, [
+        "1,2,2017",
+      ])
+    })
+  })
 })