fix: pass relaxed: false to EJSON.deserialize() so values won't be pr…

…omoted COMPASS-7431 (#5090) pass relaxed: false to EJSON.deserialize
mongodb-js · Nov 10, 2023 · 60997d1 · 60997d1
1 parent 69070a6
commit 60997d1
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 4 deletions.
diff --git a/packages/compass-import-export/src/export/export-json.spec.ts b/packages/compass-import-export/src/export/export-json.spec.ts
@@ -222,6 +222,7 @@ describe('exportJSON', function () {
           );
         } catch (err) {
           console.log(expectedResultsPath);
+          console.log(resultText);
           throw err;
         }
 

diff --git a/packages/compass-import-export/src/import/import-json.spec.ts b/packages/compass-import-export/src/import/import-json.spec.ts
@@ -132,7 +132,7 @@ describe('importJSON', function () {
           hasUnboundArray: false,
         });
 
-        const docs = await dataService.find(ns, {});
+        const docs = await dataService.find(ns, {}, { promoteValues: false });
 
         expect(docs).to.have.length(totalRows);
 
@@ -158,7 +158,7 @@ describe('importJSON', function () {
           throw err;
         }
 
-        const expectedResult = EJSON.parse(text);
+        const expectedResult = EJSON.parse(text, { relaxed: false });
         expect(
           docs,
           basename.replace(/\.((jsonl?)|(csv))$/, '.imported.ejson')

diff --git a/packages/compass-import-export/src/import/import-json.ts b/packages/compass-import-export/src/import/import-json.ts
@@ -78,7 +78,9 @@ export async function importJSON({
           throw new Error('Value is not an object');
         }
 
-        const doc = EJSON.deserialize(chunk.value);
+        const doc = EJSON.deserialize(chunk.value as Document, {
+          relaxed: false,
+        });
         callback(null, doc);
       } catch (err: unknown) {
         processParseError({

diff --git a/packages/compass-import-export/test/fixtures.ts b/packages/compass-import-export/test/fixtures.ts
@@ -58,6 +58,7 @@ const fixtures = {
   json: {
     good: path.join(__dirname, 'json', 'good.json'),
     complex: path.join(__dirname, 'json', 'complex.json'),
+    promotable: path.join(__dirname, 'json', 'promotable.json'),
   },
 
   // jsonl

diff --git a/packages/compass-import-export/test/json/good.imported.ejson b/packages/compass-import-export/test/json/good.imported.ejson
@@ -26,4 +26,4 @@
     },
     "name": "Kochka"
   }
-]
+]
diff --git a/packages/compass-import-export/test/json/promotable.exported.csv b/packages/compass-import-export/test/json/promotable.exported.csv
@@ -0,0 +1,2 @@
+_id,doubleNum
+1,-45
diff --git a/packages/compass-import-export/test/json/promotable.exported.ejson b/packages/compass-import-export/test/json/promotable.exported.ejson
@@ -0,0 +1,6 @@
+[{
+  "_id": {
+    "$oid": "654d2167b25d1813f7c40749"
+  },
+  "doubleNum": -45
+}]
diff --git a/packages/compass-import-export/test/json/promotable.gathered.json b/packages/compass-import-export/test/json/promotable.gathered.json
@@ -0,0 +1,9 @@
+{
+  "paths": [["_id"], ["doubleNum"]],
+  "docsProcessed": 1,
+  "aborted": false,
+  "projection": {
+    "_id": 1,
+    "doubleNum": 1
+  }
+}
diff --git a/packages/compass-import-export/test/json/promotable.imported.ejson b/packages/compass-import-export/test/json/promotable.imported.ejson
@@ -0,0 +1,7 @@
+[
+  {
+    "doubleNum": {
+      "$numberDouble": "-45.0"
+    }
+  }
+]
diff --git a/packages/compass-import-export/test/json/promotable.json b/packages/compass-import-export/test/json/promotable.json
@@ -0,0 +1,7 @@
+[
+  {
+    "doubleNum": {
+      "$numberDouble": "-45"
+    }
+  }
+]
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,4 +26,4 @@ @@
         },
         "name": "Kochka"
       }
-    ]
+    ]