test: align compiler regression instrumentation with native APIs

Author: kvlonge

tests/e2e/scripts/compiler_differential/helpers.py

@@ -99,10 +99,12 @@ def _perturbed(self, **changes):
         _record.write(json.dumps({"kind": "legacy_fallback", "site": "orders.sql"}) + "\\n")
 """
 
-MODEL_ANALYSIS_SABOTAGE: str = """
-import sqlbuild._native as native
+FALLBACK_RECORD_PERTURBATION: str = """
+from sqlbuild.compiler.frontier._helpers.process_recorder import process_recorder
 
-native.start_model_analysis_session = lambda *_args: None
+recorder = process_recorder()
+if recorder is not None:
+    recorder.record(site="analysis_session", kind="session")
 """
 
 _BROKEN_REF_FILES: dict[str, str] = {

tests/e2e/scripts/compiler_differential/test_compiler_differential.py

@@ -382,8 +382,8 @@ def test_given_failure_expectation_when_code_is_not_the_first_error_then_harness
             ),
             expected_sites=frozenset(
                 {
-                    "compiler/compile/_helpers/analysis/validation.py:"
-                    "_validate_sql_syntax_with_message parse_one",
+                    "compiler/compile/_helpers/analysis/required_columns.py:"
+                    "resolve_required_external_columns parse_one",
                 }
             ),
             expected_deferrals=frozenset(),

tests/e2e/scripts/compiler_differential/test_native_fallback_gate.py

@@ -9,7 +9,7 @@
 from scripts.compiler_differential.main.differential import run_compiler_differential
 from tests.e2e.scripts.compiler_differential._test_types import NativeFallbackGateTestCase
 from tests.e2e.scripts.compiler_differential.helpers import (
-    MODEL_ANALYSIS_SABOTAGE,
+    FALLBACK_RECORD_PERTURBATION,
     harness_arguments,
     write_native_perturbation,
 )
@@ -42,12 +42,12 @@
             ),
         ),
         NativeFallbackGateTestCase(
-            description="preview_model_analysis_sabotaged_to_python_fails",
-            perturbation=MODEL_ANALYSIS_SABOTAGE,
+            description="unexpected_preview_fallback_record_fails",
+            perturbation=FALLBACK_RECORD_PERTURBATION,
             appended_entries="",
             expected_exit_code=1,
             expected_lines=(
-                "Native fallback allow-list: native-preview model_analysis analysis_session "
+                "Native fallback allow-list: native-preview analysis_session analysis_session "
                 "session (project): ",
                 "Compiler differential FAILED: 0 of 1 projects differ",
             ),

tests/e2e/src/sqlbuild/cli/commands/main/compile/_test_types.py

@@ -797,10 +797,9 @@ class RetiredCompilerCacheTestCase:
 
 @dataclass(frozen=True)
 class SharedCacheKeyTestCase:
-    """A model analysis schedule under which two models share one analysis cache key."""
+    """Expected parity when identical SQL models share native cached analysis."""
 
     description: str
-    schedule: Callable[[pytest.MonkeyPatch], None]
     expected_matches_uncached: bool = True
 
 

tests/e2e/src/sqlbuild/cli/commands/main/compile/helpers.py

@@ -35,7 +35,6 @@
 import sqlbuild.cli.compile_reuse._helpers.attempt as reuse_attempt
 import sqlbuild.cli.compile_reuse._helpers.project_files as reuse_project_files
 import sqlbuild.cli.compile_reuse._helpers.store as reuse_store
-import sqlbuild.compiler.compile._helpers.assembly.project as project_assembly
 import sqlbuild.compiler.compile._helpers.diagnostics.recovery as diagnostic_recovery
 import sqlbuild.compiler.compile._helpers.macro_bridge.call_store as call_store_module
 import sqlbuild.compiler.compile._helpers.native_stages.assembly as native_stages
@@ -3879,12 +3878,6 @@ def twin_header_changed(root: Path) -> None:
     )
 
 
-def analyze_in_one_batch(monkeypatch: pytest.MonkeyPatch) -> None:
-    """Analyze every model in one batch, without dependency-ordered binding."""
-
-    monkeypatch.setattr(project_assembly, "binding_schema_for_model", lambda **_kwargs: None)
-
-
 def star_chain_added(root: Path) -> None:
     """Add two models that each select every column of the one before, below staging orders."""
 
@@ -4952,11 +4945,10 @@ def engine_in_process_compile(
 
 class NativeTypeAnswers(NamedTuple):
     """What the native type system answered in one compile: each Python-side normalization,
-    contract results that compared at least one typed column, and contract handbacks."""
+    and contract results that compared at least one typed column."""
 
     normalized: list[bool]
     typed_comparisons: int
-    handbacks: int
 
 
 def type_system_engine_compile(
@@ -4983,7 +4975,6 @@ def recorded(type_sql: str, dialect: str) -> object:
     def recorded_contracts(request: NativeContractRequest) -> list[NativeContractOutcome]:
         outcomes: list[NativeContractOutcome] = evaluate_contracts(request)
         contract_statuses.update(native_contract_statuses(request=request, outcomes=outcomes))
-        contract_statuses["handbacks"] += sum(deferral is not None for deferral, _ in outcomes)
         return outcomes
 
     type_normalization.normalize_type.cache_clear()
@@ -4997,7 +4988,6 @@ def recorded_contracts(request: NativeContractRequest) -> list[NativeContractOut
     return run, NativeTypeAnswers(
         normalized=normalized,
         typed_comparisons=contract_statuses["typed_comparisons"],
-        handbacks=contract_statuses["handbacks"],
     )
 
 

tests/e2e/src/sqlbuild/cli/commands/main/compile/test_compile_incremental_edits.py

@@ -21,7 +21,6 @@
     RandomEditChain,
     adapter_switched,
     add_external_flavor_macro,
-    analyze_in_one_batch,
     build_between,
     change_adapter_lexical_rules,
     compare_incremental_compile,
@@ -411,9 +410,7 @@ def test_given_broken_cache_invalidation_when_compiling_an_edit_then_the_oracle_
 
 @pytest.mark.parametrize(
     "test_case",
-    [
-        SharedCacheKeyTestCase(description="one_batch", schedule=analyze_in_one_batch),
-    ],
+    [SharedCacheKeyTestCase(description="native_dependency_order")],
     ids=lambda case: case.description,
 )
 def test_given_models_sharing_an_analysis_cache_key_when_upstream_changes_then_it_matches_uncached(
@@ -424,7 +421,6 @@ def test_given_models_sharing_an_analysis_cache_key_when_upstream_changes_then_i
 ) -> None:
     project_dir: Path = compile_reuse_project
     enable_compile_reuse(monkeypatch)
-    test_case.schedule(monkeypatch)
     star_chain_with_twin_added(project_dir)
     assert compile_in_process(project_dir=project_dir) == 0
     staging_extra_flag(project_dir)

tests/e2e/src/sqlbuild/cli/commands/main/compile/test_native_type_system.py

@@ -170,7 +170,7 @@ def test_given_contract_types_when_compiling_with_each_engine_then_reports_are_e
     assert report_without_engine(preview_run) == report_without_engine(native_run)
     assert preview_run.compiled == native_run.compiled
     assert native_answers == preview_answers
-    assert (native_answers.typed_comparisons >= 1, native_answers.handbacks) == (True, 0)
+    assert native_answers.typed_comparisons >= 1
 
 
 if __name__ == "__main__":