Merge pull request #48 from marklogic/feature/rows-fix

rows.query now returns empty array on no matches

Author: rjrudin

marklogic/internal/eval.py

@@ -2,6 +2,7 @@
 
 from decimal import Decimal
 from marklogic.documents import Document
+from marklogic.internal.util import response_has_no_content
 from requests import Response
 from requests_toolbelt.multipart.decoder import MultipartDecoder
 
@@ -18,9 +19,7 @@ def process_multipart_mixed_response(response: Response) -> list:
     :param response: The original multipart/mixed response from a call to a
     MarkLogic server.
     """
-
-    # The presence of this header indicates that the call returned an empty sequence.
-    if "Content-Length" in response.headers:
+    if response_has_no_content(response):
         return []
 
     parts = MultipartDecoder.from_response(response).parts

marklogic/internal/util.py

@@ -0,0 +1,5 @@
+from requests import Response
+
+
+def response_has_no_content(response: Response) -> bool:
+    return response.headers.get("Content-Length") == "0"

marklogic/rows.py

@@ -1,5 +1,7 @@
 import json
 from requests import Session
+from marklogic.internal.util import response_has_no_content
+
 
 """
 Defines classes to simplify usage of the REST rows service defined at
@@ -82,6 +84,8 @@ def query(
 
         response = self._session.post(path, headers=headers, data=data, **kwargs)
         if response.ok and not return_response:
+            if response_has_no_content(response):
+                return []
             return (
                 response.json()
                 if graphql

tests/test_rows.py

@@ -11,6 +11,12 @@ def test_dsl_default(client):
     verify_four_musicians_are_returned_in_json(data, "test.musician.lastName")
 
 
+def test_no_rows_returned(client):
+    query = 'op.fromView("test", "musician").where(op.eq(op.col("lastName"), "Smith"))'
+    results = client.rows.query(query)
+    assert [] == results
+
+
 def test_dsl_default_return_response(client):
     response = client.rows.query(dsl_query, return_response=True)
     assert 200 == response.status_code