fix: Handle full XML in _search_with_comptypes instead of raising

When search() is called with a full calendar-query XML and the server
does not support search.comp-type.optional, the code raised
NotImplementedError.  Fall back to a single REPORT with the XML as-is
(comp_class auto-detected from response data) for both the sync and
async code paths.

Fixes #637

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: tobixen

CHANGELOG.md

@@ -17,6 +17,7 @@ This project should adhere to [Semantic Versioning](https://semver.org/spec/v2.0
 ### Fixed
 
 * Communication dump (`PYTHON_CALDAV_COMMDUMP` / `debug_dump_communication`) was accidentally dropped during the v3.0 refactor.  Restored, with the dump logic extracted into a shared helper so both the sync and async code paths benefit.  Fixes https://github.com/python-caldav/caldav/issues/638
+* `search()` raised `NotImplementedError` when a full calendar-query XML was passed and the server does not support `search.comp-type.optional` (e.g. DavMail).  Falls back to a single REPORT with the XML as-is.  Fixes https://github.com/python-caldav/caldav/issues/637
 
 ### Documentation
 

caldav/search.py

@@ -688,9 +688,12 @@ def _search_with_comptypes(
         Internal method - does three searches, one for each comp class (event, journal, todo).
         """
         if xml and (isinstance(xml, str) or "calendar-query" in xml.tag):
-            raise NotImplementedError(
-                "full xml given, and it has to be patched to include comp_type"
-            )
+            # Full XML provided – cannot inject a comp-type filter into it.
+            # Fall back to a single REPORT request with the XML as-is; the
+            # server is expected to return whatever comp-types the query
+            # matches, and comp_class detection falls back to auto-detect.
+            _, objects = calendar._request_report_build_resultlist(xml, None, props)
+            return self.sort(objects)
         objects = []
 
         assert self.event is None and self.todo is None and self.journal is None
@@ -769,9 +772,10 @@ async def _async_search_with_comptypes(
         Internal async method - does three searches, one for each comp class.
         """
         if xml and (isinstance(xml, str) or "calendar-query" in xml.tag):
-            raise NotImplementedError(
-                "full xml given, and it has to be patched to include comp_type"
-            )
+            # Full XML provided – cannot inject a comp-type filter into it.
+            # Fall back to a single REPORT request with the XML as-is.
+            _, objects = await calendar._request_report_build_resultlist(xml, None, props)
+            return self.sort(objects)
         objects: list[AsyncCalendarObjectResource] = []
 
         assert self.event is None and self.todo is None and self.journal is None

tests/test_search.py

@@ -829,3 +829,41 @@ def mock_is_supported(feat, type_=bool):
         # Only the recurring event without DTEND should be returned
         assert len(result) == 1
         assert result[0].icalendar_component.get("DTEND") is None
+
+
+class TestSearchWithCompTypesFullXML:
+    """Regression tests for issue #637.
+
+    When search() is called with a full calendar-query XML and the server does
+    not support search.comp-type.optional, the code used to raise
+    NotImplementedError.  It should instead do a single REPORT request with
+    the XML as-is.
+    """
+
+    def test_search_full_xml_string_no_comp_type_optional(
+        self, mock_client: DAVClient, mock_url: str
+    ) -> None:
+        """Passing a full XML string to search() must not raise NotImplementedError
+        when the server does not support search.comp-type.optional."""
+
+        def mock_is_supported(feat, type_=bool):
+            if feat == "search.comp-type.optional":
+                return False
+            if type_ == str:
+                return "full"
+            return True
+
+        mock_client.features.is_supported = mock.Mock(side_effect=mock_is_supported)
+        mock_client.features.backward_compatibility_mode = False
+
+        event = Event(client=mock_client, url=mock_url, data=SIMPLE_EVENT)
+        calendar = mock.Mock()
+        calendar.client = mock_client
+        calendar._request_report_build_resultlist.return_value = (mock.Mock(), [event])
+
+        full_xml = "<C:calendar-query xmlns:C='urn:ietf:params:xml:ns:caldav'/>"
+        searcher = CalDAVSearcher()
+        result = searcher.search(calendar, xml=full_xml)
+
+        assert result == [event]
+        calendar._request_report_build_resultlist.assert_called_once_with(full_xml, None, None)