RDBC-1059 Fix spatial order_by_distance dynamic-field quoting

Author: poissoncorp

ravendb/documents/session/query.py

@@ -1533,7 +1533,7 @@ def _order_by_distance(
                 raise ValueError("Field cannot be None")
             self.__assert_is_dynamic_query(field_or_field_name, "orderByDistance")
             round_factor = field_or_field_name.round_factor
-            field_name = f"'{field_or_field_name.to_field(self._ensure_valid_field_name)}'"
+            field_name = field_or_field_name.to_field(self._ensure_valid_field_name)
         else:
             field_name = field_or_field_name
 
@@ -1560,7 +1560,7 @@ def _order_by_distance_wkt(
                 raise ValueError("Field cannot be None")
             self.__assert_is_dynamic_query(field_or_field_name, "orderByDistance")
             round_factor = field_or_field_name.round_factor
-            field_name = f"'{field_or_field_name.to_field(self._ensure_valid_field_name)}'"
+            field_name = field_or_field_name.to_field(self._ensure_valid_field_name)
         else:
             round_factor = self.__add_query_parameter(round_factor) if round_factor != 0 else None
             field_name = field_or_field_name
@@ -1584,7 +1584,7 @@ def _order_by_distance_descending(
                 raise ValueError("Field cannot be None")
             self.__assert_is_dynamic_query(field_or_field_name, "orderByDistanceDescending")
             round_factor = field_or_field_name.round_factor
-            field_name = f"'{field_or_field_name.to_field(self._ensure_valid_field_name)}'"
+            field_name = field_or_field_name.to_field(self._ensure_valid_field_name)
         else:
             round_factor = self.__add_query_parameter(round_factor) if round_factor != 0 else None
             field_name = field_or_field_name
@@ -1613,7 +1613,7 @@ def _order_by_distance_descending_wkt(
                 raise ValueError("Field cannot be None")
             self.__assert_is_dynamic_query(field_or_field_name, "orderByDistanceDescending")
             round_factor = field_or_field_name.round_factor
-            field_name = f"'{field_or_field_name.to_field(self._ensure_valid_field_name)}'"
+            field_name = field_or_field_name.to_field(self._ensure_valid_field_name)
         else:
             round_factor = self.__add_query_parameter(round_factor) if round_factor != 0 else None
             field_name = field_or_field_name

ravendb/tests/jvm_migrated_tests/spatial_tests/test_order_by_distance_quoting.py

@@ -0,0 +1,53 @@
+"""
+Regression test for the 7.2.3 spatial-quoting fix.
+
+Before the fix, dynamic spatial fields were wrapped in single quotes in the
+order_by_distance* methods (e.g. 'point(...)') which produced invalid RQL
+for projection / aliased queries. The fix drops the quotes; the field name
+is used verbatim.
+"""
+
+import unittest
+from typing import Optional
+
+from ravendb.documents.queries.spatial import PointField, WktField
+from ravendb.tests.test_base import TestBase
+
+
+class _Geo:
+    def __init__(
+        self,
+        Id: Optional[str] = None,
+        lat: Optional[float] = None,
+        lng: Optional[float] = None,
+    ):
+        self.Id = Id
+        self.lat = lat
+        self.lng = lng
+
+
+class TestOrderByDistanceQuoting(TestBase):
+    def setUp(self):
+        super().setUp()
+        with self.store.open_session() as s:
+            s.store(_Geo(lat=51.4779, lng=0.0015), "geo/1")  # near Greenwich
+            s.store(_Geo(lat=40.7128, lng=-74.0060), "geo/2")  # New York
+            s.save_changes()
+
+    def test_order_by_distance_with_dynamic_point_field(self):
+        with self.store.open_session() as s:
+            results = list(s.query(object_type=_Geo).order_by_distance(PointField("lat", "lng"), 51.4779, 0.0015))
+            self.assertGreaterEqual(len(results), 2)
+            self.assertEqual("geo/1", results[0].Id)
+
+    def test_order_by_distance_descending_with_dynamic_point_field(self):
+        with self.store.open_session() as s:
+            results = list(
+                s.query(object_type=_Geo).order_by_distance_descending(PointField("lat", "lng"), 51.4779, 0.0015)
+            )
+            self.assertGreaterEqual(len(results), 2)
+            self.assertEqual("geo/2", results[0].Id)
+
+
+if __name__ == "__main__":
+    unittest.main()