google-cloud-spanner 3.50.0__tar.gz → 3.50.1__tar.gz

{google_cloud_spanner-3.50.0/google_cloud_spanner.egg-info → google_cloud_spanner-3.50.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-cloud-spanner
-Version: 3.50.0
+Version: 3.50.1
 Summary: Google Cloud Spanner API client library
 Home-page: https://github.com/googleapis/python-spanner
 Author: Google LLC

{google_cloud_spanner-3.50.0 → google_cloud_spanner-3.50.1}/google/cloud/spanner_admin_database_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.50.0"  # {x-release-please-version}
+__version__ = "3.50.1"  # {x-release-please-version}

{google_cloud_spanner-3.50.0 → google_cloud_spanner-3.50.1}/google/cloud/spanner_admin_instance_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.50.0"  # {x-release-please-version}
+__version__ = "3.50.1"  # {x-release-please-version}

{google_cloud_spanner-3.50.0 → google_cloud_spanner-3.50.1}/google/cloud/spanner_v1/data_types.py

@@ -31,6 +31,7 @@ class JsonObject(dict):
     def __init__(self, *args, **kwargs):
         self._is_null = (args, kwargs) == ((), {}) or args == (None,)
         self._is_array = len(args) and isinstance(args[0], (list, tuple))
+        self._is_scalar_value = len(args) == 1 and not isinstance(args[0], (list, dict))
 
         # if the JSON object is represented with an array,
         # the value is contained separately
@@ -38,10 +39,18 @@ class JsonObject(dict):
             self._array_value = args[0]
             return
 
+        # If it's a scalar value, set _simple_value and return early
+        if self._is_scalar_value:
+            self._simple_value = args[0]
+            return
+
         if len(args) and isinstance(args[0], JsonObject):
             self._is_array = args[0]._is_array
+            self._is_scalar_value = args[0]._is_scalar_value
             if self._is_array:
                 self._array_value = args[0]._array_value
+            elif self._is_scalar_value:
+                self._simple_value = args[0]._simple_value
 
         if not self._is_null:
             super(JsonObject, self).__init__(*args, **kwargs)
@@ -50,6 +59,9 @@ class JsonObject(dict):
         if self._is_array:
             return str(self._array_value)
 
+        if self._is_scalar_value:
+            return str(self._simple_value)
+
         return super(JsonObject, self).__repr__()
 
     @classmethod
@@ -76,6 +88,9 @@ class JsonObject(dict):
         if self._is_null:
             return None
 
+        if self._is_scalar_value:
+            return json.dumps(self._simple_value)
+
         if self._is_array:
             return json.dumps(self._array_value, sort_keys=True, separators=(",", ":"))
 

{google_cloud_spanner-3.50.0 → google_cloud_spanner-3.50.1}/google/cloud/spanner_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.50.0"  # {x-release-please-version}
+__version__ = "3.50.1"  # {x-release-please-version}

{google_cloud_spanner-3.50.0 → google_cloud_spanner-3.50.1/google_cloud_spanner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-cloud-spanner
-Version: 3.50.0
+Version: 3.50.1
 Summary: Google Cloud Spanner API client library
 Home-page: https://github.com/googleapis/python-spanner
 Author: Google LLC

google_cloud_spanner-3.50.1/tests/unit/test_datatypes.py

@@ -0,0 +1,98 @@
+# Copyright 2024 Google LLC All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import unittest
+
+import json
+from google.cloud.spanner_v1.data_types import JsonObject
+
+
+class Test_JsonObject_serde(unittest.TestCase):
+    def test_w_dict(self):
+        data = {"foo": "bar"}
+        expected = json.dumps(data, sort_keys=True, separators=(",", ":"))
+        data_jsonobject = JsonObject(data)
+        self.assertEqual(data_jsonobject.serialize(), expected)
+
+    def test_w_list_of_dict(self):
+        data = [{"foo1": "bar1"}, {"foo2": "bar2"}]
+        expected = json.dumps(data, sort_keys=True, separators=(",", ":"))
+        data_jsonobject = JsonObject(data)
+        self.assertEqual(data_jsonobject.serialize(), expected)
+
+    def test_w_JsonObject_of_dict(self):
+        data = {"foo": "bar"}
+        expected = json.dumps(data, sort_keys=True, separators=(",", ":"))
+        data_jsonobject = JsonObject(JsonObject(data))
+        self.assertEqual(data_jsonobject.serialize(), expected)
+
+    def test_w_JsonObject_of_list_of_dict(self):
+        data = [{"foo1": "bar1"}, {"foo2": "bar2"}]
+        expected = json.dumps(data, sort_keys=True, separators=(",", ":"))
+        data_jsonobject = JsonObject(JsonObject(data))
+        self.assertEqual(data_jsonobject.serialize(), expected)
+
+    def test_w_simple_float_JsonData(self):
+        data = 1.1
+        expected = json.dumps(data)
+        data_jsonobject = JsonObject(data)
+        self.assertEqual(data_jsonobject.serialize(), expected)
+
+    def test_w_simple_str_JsonData(self):
+        data = "foo"
+        expected = json.dumps(data)
+        data_jsonobject = JsonObject(data)
+        self.assertEqual(data_jsonobject.serialize(), expected)
+
+    def test_w_empty_str_JsonData(self):
+        data = ""
+        expected = json.dumps(data)
+        data_jsonobject = JsonObject(data)
+        self.assertEqual(data_jsonobject.serialize(), expected)
+
+    def test_w_None_JsonData(self):
+        data = None
+        data_jsonobject = JsonObject(data)
+        self.assertEqual(data_jsonobject.serialize(), None)
+
+    def test_w_list_of_simple_JsonData(self):
+        data = [1.1, "foo"]
+        expected = json.dumps(data, sort_keys=True, separators=(",", ":"))
+        data_jsonobject = JsonObject(data)
+        self.assertEqual(data_jsonobject.serialize(), expected)
+
+    def test_w_empty_list(self):
+        data = []
+        expected = json.dumps(data)
+        data_jsonobject = JsonObject(data)
+        self.assertEqual(data_jsonobject.serialize(), expected)
+
+    def test_w_empty_dict(self):
+        data = [{}]
+        expected = json.dumps(data)
+        data_jsonobject = JsonObject(data)
+        self.assertEqual(data_jsonobject.serialize(), expected)
+
+    def test_w_JsonObject_of_simple_JsonData(self):
+        data = 1.1
+        expected = json.dumps(data)
+        data_jsonobject = JsonObject(JsonObject(data))
+        self.assertEqual(data_jsonobject.serialize(), expected)
+
+    def test_w_JsonObject_of_list_of_simple_JsonData(self):
+        data = [1.1, "foo"]
+        expected = json.dumps(data, sort_keys=True, separators=(",", ":"))
+        data_jsonobject = JsonObject(JsonObject(data))
+        self.assertEqual(data_jsonobject.serialize(), expected)

google_cloud_spanner-3.50.0/tests/unit/test_datatypes.py

@@ -1,45 +0,0 @@
-# Copyright 2024 Google LLC All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-import unittest
-
-import json
-from google.cloud.spanner_v1.data_types import JsonObject
-
-
-class Test_JsonObject_serde(unittest.TestCase):
-    def test_w_dict(self):
-        data = {"foo": "bar"}
-        expected = json.dumps(data, sort_keys=True, separators=(",", ":"))
-        data_jsonobject = JsonObject(data)
-        self.assertEqual(data_jsonobject.serialize(), expected)
-
-    def test_w_list_of_dict(self):
-        data = [{"foo1": "bar1"}, {"foo2": "bar2"}]
-        expected = json.dumps(data, sort_keys=True, separators=(",", ":"))
-        data_jsonobject = JsonObject(data)
-        self.assertEqual(data_jsonobject.serialize(), expected)
-
-    def test_w_JsonObject_of_dict(self):
-        data = {"foo": "bar"}
-        expected = json.dumps(data, sort_keys=True, separators=(",", ":"))
-        data_jsonobject = JsonObject(JsonObject(data))
-        self.assertEqual(data_jsonobject.serialize(), expected)
-
-    def test_w_JsonObject_of_list_of_dict(self):
-        data = [{"foo1": "bar1"}, {"foo2": "bar2"}]
-        expected = json.dumps(data, sort_keys=True, separators=(",", ":"))
-        data_jsonobject = JsonObject(JsonObject(data))
-        self.assertEqual(data_jsonobject.serialize(), expected)