@budibase/server 1.2.44-alpha.4 → 1.2.44-alpha.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.7",
   "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": "1.2.44-alpha.4",
-    "@budibase/client": "1.2.44-alpha.4",
-    "@budibase/pro": "1.2.44-alpha.3",
-    "@budibase/string-templates": "1.2.44-alpha.4",
-    "@budibase/types": "1.2.44-alpha.4",
+    "@budibase/backend-core": "1.2.44-alpha.7",
+    "@budibase/client": "1.2.44-alpha.7",
+    "@budibase/pro": "1.2.44-alpha.6",
+    "@budibase/string-templates": "1.2.44-alpha.7",
+    "@budibase/types": "1.2.44-alpha.7",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "4e24fac83d9d362b85954cbe23d90aae88ef6fb5"
+  "gitHead": "eb9e2d11c6c8f9f01ecf88f419ea24c25b63535c"
 }

package/src/integrations/mongodb.ts

@@ -93,8 +93,8 @@ module MongoDBModule {
             json[field] = self.createObjectIds(json[field])
           }
           if (
-            (field === "_id" || field?.startsWith("$")) &&
-            typeof json[field] === "string"
+            typeof json[field] === "string" &&
+            json[field].toLowerCase().startsWith("objectid")
           ) {
             const id = json[field].match(
               /(?<=objectid\(['"]).*(?=['"]\))/gi

package/src/integrations/tests/mongo.spec.js

@@ -103,16 +103,16 @@ describe("MongoDB Integration", () => {
     restore()
   })
 
-  it("creates ObjectIds if the _id fields contains a match on ObjectId", async () => {
+  it("creates ObjectIds if the field contains a match on ObjectId", async () => {
     const query = {
       json: {
         filter: {
           _id: "ObjectId('ACBD12345678ABCD12345678')",
-          name: "ObjectId('name')"
+          name: "ObjectId('BBBB12345678ABCD12345678')"
         },
         update: {
           _id: "ObjectId('FFFF12345678ABCD12345678')",
-          name: "ObjectId('updatedName')",
+          name: "ObjectId('CCCC12345678ABCD12345678')",
         },
         options: {
           upsert: false,
@@ -126,11 +126,11 @@ describe("MongoDB Integration", () => {
     const args = config.integration.client.updateOne.mock.calls[0]
     expect(args[0]).toEqual({
       _id: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
-      name: "ObjectId('name')",
+      name: mongo.ObjectID.createFromHexString("BBBB12345678ABCD12345678"),
     })
     expect(args[1]).toEqual({
       _id: mongo.ObjectID.createFromHexString("FFFF12345678ABCD12345678"),
-      name: "ObjectId('updatedName')",
+      name: mongo.ObjectID.createFromHexString("CCCC12345678ABCD12345678"),
     })
     expect(args[2]).toEqual({
       upsert: false