refactor(native): raise the shared native stage mismatch error from the macro bridge

Author: kvlonge

src/sqlbuild/compiler/compile/_helpers/macro_bridge/expansion.py

@@ -14,12 +14,13 @@
 )
 from sqlbuild.compiler.compile.classes.macro_expansion_facts import MacroExpansionFacts
 from sqlbuild.compiler.compile.constants import MACRO_TOKEN
-from sqlbuild.compiler.compile.exceptions import CompileInputError, NativeRenderMismatchError
+from sqlbuild.compiler.compile.exceptions import CompileInputError
 from sqlbuild.compiler.compile.models import (
     DeclarationResolutionContext,
     ExpansionSpan,
     MacroExpansionState,
 )
+from sqlbuild.compiler.frontier.exceptions import NativeStageMismatchError
 from sqlbuild.compiler.macro_bridge.classes.macro_bridge import MacroBridge
 from sqlbuild.compiler.macro_bridge.constants import (
     ARGUMENT_REFERENCE_EVENT,
@@ -139,7 +140,7 @@ def _bridged_call_output(  # noqa: PLR0913
             "directly in SQL"
         )
     if next_index != site.end:
-        raise NativeRenderMismatchError(
+        raise NativeStageMismatchError(
             f"Native macro call scan of '{consumer_path}' ended at {site.end}, Python at "
             f"{next_index}"
         )
@@ -177,7 +178,7 @@ def _replay_macro_call_event(
         )
     elif tag == DECLARATION_READ_EVENT:
         if declarations is None:
-            raise NativeRenderMismatchError("Replayed a declaration read without declarations")
+            raise NativeStageMismatchError("Replayed a declaration read without declarations")
         _record_macro_declaration_usage(
             name=second, kind=DeclarationKind(first), declarations=declarations, state=state
         )
@@ -198,4 +199,4 @@ def _replay_macro_call_event(
             (SqlResourceRef(kind=SqlResourceRefKind(first), name=second),)
         )
     else:
-        raise NativeRenderMismatchError(f"Unknown macro call event {tag}")
+        raise NativeStageMismatchError(f"Unknown macro call event {tag}")

src/sqlbuild/compiler/compile/exceptions.py

@@ -19,10 +19,6 @@ class MacroDeclarationLookupError(CompileInputError, KeyError):
     """Retain authored diagnostics while honoring the Mapping lookup contract."""
 
 
-class NativeRenderMismatchError(RuntimeError):
-    """Raised when native rendering disagrees with Python, so the Python stage must re-run."""
-
-
 class NativeSqlTestResponseError(CompileInputError):
     """Raised when native SQL-test extraction returns malformed data."""
 

src/sqlbuild/compiler/macro_bridge/main/run_with_macro_bridge.py

@@ -9,7 +9,7 @@
 from contextvars import Token
 
 import sqlbuild._native as _native
-from sqlbuild.compiler.compile.exceptions import NativeRenderMismatchError
+from sqlbuild.compiler.frontier.exceptions import NativeStageMismatchError
 from sqlbuild.compiler.macro_bridge.classes.macro_bridge import MacroBridge
 from sqlbuild.compiler.macro_bridge.constants import ACTIVE_MACRO_BRIDGE
 
@@ -46,7 +46,7 @@ def run_with_macro_bridge[T](*, stage: Callable[[], T]) -> T:
     finally:
         ACTIVE_MACRO_BRIDGE.reset(token)
     _ = stage()
-    raise NativeRenderMismatchError(
+    raise NativeStageMismatchError(
         "The native macro bridge failed where the Python render succeeded; "
         "run with SQLBUILD_COMPILER_ENGINE=python"
     ) from native_error

tests/unit/src/sqlbuild/compiler/macro_bridge/main/test_run_with_macro_bridge.py

@@ -4,7 +4,8 @@
 
 import pytest
 
-from sqlbuild.compiler.compile.exceptions import CompileInputError, NativeRenderMismatchError
+from sqlbuild.compiler.compile.exceptions import CompileInputError
+from sqlbuild.compiler.frontier.exceptions import NativeStageMismatchError
 from sqlbuild.compiler.macro_bridge.main.active_macro_bridge import active_macro_bridge
 from sqlbuild.compiler.macro_bridge.main.run_with_macro_bridge import run_with_macro_bridge
 from tests.unit.src.sqlbuild.compiler.macro_bridge.main._test_types import (
@@ -58,7 +59,7 @@ def test_given_succeeding_stage_when_running_with_macro_bridge_then_runs_once_br
             description="native-only failure is reported as a divergence",
             stage_with_bridge=failed,
             stage_without_bridge=rendered,
-            expected_error=NativeRenderMismatchError,
+            expected_error=NativeStageMismatchError,
             expected_bridged_runs=[True, False],
         ),
     ],