fix(spanner): implement dict protocol and nested unwrapping for JsonObject

Author: sakthivelmanii

packages/google-cloud-spanner/google/cloud/spanner_v1/data_types.py

@@ -54,7 +54,9 @@ def __init__(self, *args, **kwargs):
             elif self._is_scalar_value:
                 self._simple_value = args[0]._simple_value
 
-        if not self._is_null:
+        if self._is_null:
+            super().__init__({"__json_null__": True})
+        else:
             super().__init__(*args, **kwargs)
 
     def __len__(self):
@@ -72,7 +74,7 @@ def __bool__(self):
         if self._is_array:
             return bool(self._array_value)
         if self._is_scalar_value:
-            return True
+            return bool(self._simple_value)
         return super().__len__() > 0
 
     def __iter__(self):
@@ -106,30 +108,27 @@ def __contains__(self, item):
     def __eq__(self, other):
         if isinstance(other, JsonObject):
             if self._is_array:
-                return (
-                    getattr(other, "_is_array", False)
-                    and self._array_value == other._array_value
-                )
+                return other._is_array and self._array_value == other._array_value
             if self._is_scalar_value:
                 return (
-                    getattr(other, "_is_scalar_value", False)
-                    and self._simple_value == other._simple_value
+                    other._is_scalar_value and self._simple_value == other._simple_value
                 )
             if self._is_null:
-                return getattr(other, "_is_null", False)
+                return other._is_null
             return not (
-                getattr(other, "_is_array", False)
-                or getattr(other, "_is_scalar_value", False)
-                or getattr(other, "_is_null", False)
+                other._is_array or other._is_scalar_value or other._is_null
             ) and super().__eq__(other)
         if self._is_array:
             return self._array_value == other
         if self._is_scalar_value:
             return self._simple_value == other
         if self._is_null:
-            return other is None or (isinstance(other, dict) and len(other) == 0)
+            return other is None
         return super().__eq__(other)
 
+    def __ne__(self, other):
+        return not (self == other)
+
     def __repr__(self):
         if self._is_array:
             return str(self._array_value)

packages/google-cloud-spanner/tests/unit/test__helpers.py

@@ -868,6 +868,7 @@ def test_w_json(self):
         from google.protobuf.struct_pb2 import Value
 
         from google.cloud.spanner_v1 import Type, TypeCode
+        from google.cloud.spanner_v1.data_types import JsonObject
 
         VALUE = {"id": 27863, "Name": "Anamika"}
         str_repr = json.dumps(VALUE, sort_keys=True, separators=(",", ":"))
@@ -884,7 +885,9 @@ def test_w_json(self):
         field_type = Type(code=TypeCode.JSON)
         value_pb = Value(string_value=str_repr)
 
-        self.assertEqual(self._callFUT(value_pb, field_type, field_name), {})
+        self.assertEqual(
+            self._callFUT(value_pb, field_type, field_name), JsonObject(None)
+        )
 
     def test_w_unknown_type(self):
         from google.protobuf.struct_pb2 import Value

packages/google-cloud-spanner/tests/unit/test_datatypes.py

@@ -132,8 +132,18 @@ def test_scalar_len(self):
         self.assertEqual(len(obj), 1)
 
     def test_scalar_bool(self):
-        obj = JsonObject(42)
-        self.assertTrue(obj)
+        self.assertTrue(JsonObject(42))
+        self.assertFalse(JsonObject(False))
+        self.assertFalse(JsonObject(0))
+        self.assertFalse(JsonObject(0.0))
+        self.assertFalse(JsonObject(""))
+
+    def test_null_eq(self):
+        null_obj = JsonObject(None)
+        self.assertEqual(null_obj, JsonObject(None))
+        self.assertEqual(null_obj, None)
+        self.assertNotEqual(null_obj, {})
+        self.assertNotEqual(null_obj, JsonObject({}))
 
     def test_scalar_not_iterable(self):
         obj = JsonObject(42)