Fixed bug when calling "getContent()" for SODA documents that do not

contain JSON.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -48,6 +48,8 @@ Thin Mode Changes
 Thick Mode Changes
 ++++++++++++++++++
 
+#)  Fixed bug when calling :meth:`SodaDoc.getContent()` for SODA documents
+    that do not contain JSON.
 #)  Errors ``DPY-4011: the database or network closed the connection`` and
     ``DPY-4024: call timeout of {timeout} ms exceeded`` now retain the original
     error message raised by the Oracle Client library.

src/oracledb/soda.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2021, 2024, Oracle and/or its affiliates.
 #
 # This software is dual-licensed to you under the Universal Permissive License
 # (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -369,7 +369,10 @@ def getContent(self) -> Union[dict, list]:
         exception if this is not the case. If there is no content, however,
         None will be returned.
         """
-        return json.loads(self.getContentAsString())
+        content_bytes, encoding = self._impl.get_content()
+        if self.mediaType == "application/json":
+            return json.loads(content_bytes.decode(encoding))
+        return content_bytes
 
     def getContentAsBytes(self) -> bytes:
         """

tests/test_3400_soda_collection.py

@@ -26,6 +26,7 @@
 3400 - Module for testing Simple Oracle Document Access (SODA) Collections
 """
 
+import json
 import unittest
 
 import test_env
@@ -933,6 +934,42 @@ def test_3443(self):
                 "TestSodaMapNonExistent", metadata=metadata, mapMode=True
             )
 
+    def test_3444(self):
+        "3444 - test collections with mixture of media types"
+        soda_db = self.get_soda_database()
+        metadata = dict(mediaTypeColumn=dict(name="media_type"))
+        coll = soda_db.createCollection("TestMixedMedia", metadata=metadata)
+        test_data = [
+            (dict(name="George", age=28), "application/json"),
+            ("Sample Text", "text/plain"),
+            (b"\x57\x25\xfe\x34\x56", "application/octet-stream"),
+        ]
+        for value, media_type in test_data:
+            coll.find().remove()
+            coll.insertOne(soda_db.createDocument(value, mediaType=media_type))
+            fetched_doc = coll.find().getDocuments()[0]
+            self.assertEqual(fetched_doc.mediaType, media_type)
+            if media_type == "application/json":
+                expected_content = value
+                expected_str = json.dumps(value)
+                expected_bytes = expected_str.encode()
+            elif media_type == "text/plain":
+                expected_content = expected_bytes = value.encode()
+                expected_str = value
+            else:
+                expected_content = expected_bytes = value
+                expected_str = None
+            self.assertEqual(fetched_doc.getContent(), expected_content)
+            self.assertEqual(fetched_doc.getContentAsBytes(), expected_bytes)
+            if expected_str is None:
+                self.assertRaises(
+                    UnicodeDecodeError, fetched_doc.getContentAsString
+                )
+            else:
+                self.assertEqual(
+                    fetched_doc.getContentAsString(), expected_str
+                )
+
 
 if __name__ == "__main__":
     test_env.run_test_cases()