fix: address PR review comments

- Replace contradictory xfail+skip with @pytest.mark.skip for GraphRAG tests
- Extract _check_known_xfails() helper to deduplicate VLP xfail checks
- Remove unused RecursionDepthExceeded error variant

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

Author: genezhang

src/render_plan/errors.rs

@@ -48,7 +48,4 @@ pub enum RenderBuildError {
 
     #[error("Union has no branches to render")]
     EmptyUnionBranches,
-
-    #[error("Recursion depth exceeded ({0}): query plan is too deeply nested")]
-    RecursionDepthExceeded(usize),
 }

tests/integration/matrix/test_e2e_v2.py

@@ -193,13 +193,18 @@ class TestVariableLengthPaths:
     Variable-length path patterns.
     5 patterns x 3 schemas x 4 variations = ~60 tests
     """
-    
+
+    @staticmethod
+    def _check_known_xfails(pattern, schema_name):
+        """Mark known failing pattern+schema combinations as xfail."""
+        if pattern == "vlp_with_path_variable" and schema_name == "social_integration":
+            pytest.xfail("Path variable RETURN p generates non-JSON response")
+
     @pytest.mark.parametrize("schema_name", list(SCHEMAS.keys()))
     @pytest.mark.parametrize("pattern", VLP_PATTERNS)
     def test_vlp_pattern(self, schema_name, pattern):
         """Test VLP patterns across all schemas."""
-        if pattern == "vlp_with_path_variable" and schema_name == "social_integration":
-            pytest.xfail("Path variable RETURN p generates non-JSON response")
+        self._check_known_xfails(pattern, schema_name)
         config = SCHEMAS[schema_name]
         gen = QueryGenerator(schema_name, config)
         query = getattr(gen, pattern)()
@@ -210,8 +215,7 @@ def test_vlp_pattern(self, schema_name, pattern):
     @pytest.mark.parametrize("pattern", VLP_PATTERNS)
     def test_vlp_variation_1(self, schema_name, pattern):
         """VLP patterns - variation 1."""
-        if pattern == "vlp_with_path_variable" and schema_name == "social_integration":
-            pytest.xfail("Path variable RETURN p generates non-JSON response")
+        self._check_known_xfails(pattern, schema_name)
         random.seed(500)
         config = SCHEMAS[schema_name]
         gen = QueryGenerator(schema_name, config)
@@ -223,8 +227,7 @@ def test_vlp_variation_1(self, schema_name, pattern):
     @pytest.mark.parametrize("pattern", VLP_PATTERNS)
     def test_vlp_variation_2(self, schema_name, pattern):
         """VLP patterns - variation 2."""
-        if pattern == "vlp_with_path_variable" and schema_name == "social_integration":
-            pytest.xfail("Path variable RETURN p generates non-JSON response")
+        self._check_known_xfails(pattern, schema_name)
         random.seed(600)
         config = SCHEMAS[schema_name]
         gen = QueryGenerator(schema_name, config)
@@ -236,8 +239,7 @@ def test_vlp_variation_2(self, schema_name, pattern):
     @pytest.mark.parametrize("pattern", VLP_PATTERNS)
     def test_vlp_variation_3(self, schema_name, pattern):
         """VLP patterns - variation 3."""
-        if pattern == "vlp_with_path_variable" and schema_name == "social_integration":
-            pytest.xfail("Path variable RETURN p generates non-JSON response")
+        self._check_known_xfails(pattern, schema_name)
         random.seed(700)
         config = SCHEMAS[schema_name]
         gen = QueryGenerator(schema_name, config)

tests/integration/test_schema_variations.py

@@ -158,9 +158,9 @@ def test_return_edge_properties(self):
         )
         assert_sql_generated(result, "follow_date", "full_name")
 
-    @pytest.mark.xfail(reason="GraphRAG endpoint not available in test environment")
+    @pytest.mark.skip(reason="GraphRAG endpoint not available in test environment")
     def test_graphrag_expansion(self):
-        pytest.skip("GraphRAG endpoint not available")
+        pass
 
 
 # ============================================================================
@@ -217,9 +217,9 @@ def test_return_type_function(self):
         )
         assert_sql_generated(result)
 
-    @pytest.mark.xfail(reason="GraphRAG endpoint not available in test environment")
+    @pytest.mark.skip(reason="GraphRAG endpoint not available in test environment")
     def test_graphrag_expansion(self):
-        pytest.skip("GraphRAG endpoint not available")
+        pass
 
 
 # ============================================================================
@@ -276,9 +276,9 @@ def test_return_edge_properties(self):
         )
         assert_sql_generated(result, "carrier", "flight_number")
 
-    @pytest.mark.xfail(reason="GraphRAG endpoint not available in test environment")
+    @pytest.mark.skip(reason="GraphRAG endpoint not available in test environment")
     def test_graphrag_expansion(self):
-        pytest.skip("GraphRAG endpoint not available")
+        pass
 
 
 # ============================================================================
@@ -351,9 +351,9 @@ def test_return_edge_properties(self):
         )
         assert_sql_generated(result, "interactions")
 
-    @pytest.mark.xfail(reason="GraphRAG endpoint not available in test environment")
+    @pytest.mark.skip(reason="GraphRAG endpoint not available in test environment")
     def test_graphrag_expansion(self):
-        pytest.skip("GraphRAG endpoint not available")
+        pass
 
 
 # ============================================================================
@@ -408,9 +408,9 @@ def test_return_edge_properties(self):
         )
         assert_sql_generated(result, "amount", "transfer_date")
 
-    @pytest.mark.xfail(reason="GraphRAG endpoint not available in test environment")
+    @pytest.mark.skip(reason="GraphRAG endpoint not available in test environment")
     def test_graphrag_expansion(self):
-        pytest.skip("GraphRAG endpoint not available")
+        pass
 
 
 # ============================================================================