From c3cf0e5e24087315d8999abd234025c7dc7cb556 Mon Sep 17 00:00:00 2001
From: Tobie Morgan Hitchcock <tobie@abcum.com>
Date: Mon, 31 Jan 2022 21:17:28 +0000
Subject: [PATCH] Ensure object diffing works correctly when values are the
 same

---
 src/sql/value/diff.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/sql/value/diff.rs b/src/sql/value/diff.rs
index ac8991cb..ea82d007 100644
--- a/src/sql/value/diff.rs
+++ b/src/sql/value/diff.rs
@@ -7,7 +7,7 @@ impl Value {
 	pub fn diff(&self, val: &Value, path: Idiom) -> Vec<Operation> {
 		let mut ops: Vec<Operation> = vec![];
 		match (self, val) {
-			(Value::Object(a), Value::Object(b)) => {
+			(Value::Object(a), Value::Object(b)) if a != b => {
 				// Loop over old keys
 				for (key, _) in a.value.iter() {
 					if b.value.contains_key(key) == false {
@@ -33,7 +33,7 @@ impl Value {
 					}
 				}
 			}
-			(Value::Array(a), Value::Array(b)) => {
+			(Value::Array(a), Value::Array(b)) if a != b => {
 				let mut n = 0;
 				while n < min(a.len(), b.len()) {
 					let path = path.add(n.into());
@@ -61,7 +61,7 @@ impl Value {
 					n += 1;
 				}
 			}
-			(Value::Strand(a), Value::Strand(b)) => ops.push(Operation {
+			(Value::Strand(a), Value::Strand(b)) if a != b => ops.push(Operation {
 				op: Op::Change,
 				path,
 				value: {
@@ -89,6 +89,14 @@ mod tests {
 	use crate::sql::array::Array;
 	use crate::sql::test::Parse;
 
+	#[test]
+	fn diff_none() {
+		let old = Value::parse("{ test: true, text: 'text', other: { something: true } }");
+		let now = Value::parse("{ test: true, text: 'text', other: { something: true } }");
+		let res = Array::parse("[]");
+		assert_eq!(res.to_operations().unwrap(), old.diff(&now, Idiom::default()));
+	}
+
 	#[test]
 	fn diff_add() {
 		let old = Value::parse("{ test: true }");