Merge pull request #432 from cyjake/fix-jsonMerge-null

fix: should still be able to jsonMerge() even if currently null
cyjake · Feb 7, 2025 · fb347cd · fb347cd
2 parents 8f97cc5 + 2111e61
commit fb347cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/bone.js b/src/bone.js
@@ -1599,7 +1599,7 @@ class Bone {
     const data = { ...values };
     for (const [name, value] of Object.entries(values)) {
       if (value != null && typeof value === 'object') {
-        data[name] = new Raw(`${method}(${name}, ${SqlString.escape(JSON.stringify(value))})`);
+        data[name] = new Raw(`${method}(COALESCE(${name}, '{}'), ${SqlString.escape(JSON.stringify(value))})`);
       } else {
         data[name] = value;
       }

diff --git a/test/integration/suite/json.test.js b/test/integration/suite/json.test.js
@@ -30,6 +30,13 @@ describe('=> Basic', () => {
       await Gen.remove({}, true);
     });
 
+    it('bone.jsonMerge(name, value, options) should still update if currently NULL', async () => {
+      const gen = await Gen.create({ name: '章3️⃣疯' });
+      assert.equal(gen.name, '章3️⃣疯');
+      await gen.jsonMerge('extra', { a: 1 });
+      assert.equal(gen.extra.a, 1);
+    });
+
     it('bone.jsonMerge(name, value, options) should work', async () => {
       const gen = await Gen.create({ name: '章3️⃣疯' });
       assert.equal(gen.name, '章3️⃣疯');