dblift 2.4.0__tar.gz → 2.4.2__tar.gz

{dblift-2.4.0 → dblift-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dblift
-Version: 2.4.0
+Version: 2.4.2
 Summary: A database migration tool that supports multiple databases with native Python drivers
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

{dblift-2.4.0 → dblift-2.4.2}/cli/_command_handlers.py

@@ -22,6 +22,7 @@ from cli.handlers.migrate import _handle_migrate
 from cli.handlers.repair import _handle_repair
 from cli.handlers.undo import _handle_undo
 from cli.handlers.validate import _handle_validate
+from core.seams.tier_resolver import resolve_tier
 
 _COMMAND_HANDLERS: Dict[str, Callable[[CliCommandContext], Tuple[bool, Any]]] = {
     "migrate": _handle_migrate,
@@ -72,6 +73,10 @@ def execute_single_command(
         recursive=recursive,
         placeholders=placeholders,
         dir_recursive_map=dir_recursive_map,
+        # Resolve the license tier through the seam so paid-feature gates
+        # (``require_tier(FEATURE, ctx.license_tier)``) see the real tier. In a
+        # pure-OSS install no resolver is registered and this is ``None``.
+        license_tier=resolve_tier(args),
     )
     return handler(ctx)
 

{dblift-2.4.0 → dblift-2.4.2}/cli/_config_helpers.py

@@ -3,7 +3,7 @@
 import argparse
 import sys
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, Iterable, List, Optional, Tuple
 
 from api._cli_support import ConnectionProvider
 from cli._parser_setup import create_parser, parse_with_selective_errors
@@ -70,12 +70,22 @@ def _extract_commands_from_argv(
     argv_list: List[str],
     available_commands: List[str],
     global_only_args: List[str],
+    global_boolean_flags: Optional[Iterable[str]] = None,
 ) -> Tuple[List[str], List[str], List[str]]:
     """Extract commands, global arguments, and subcommand arguments from argv.
 
+    ``global_boolean_flags`` names the global flags that take no value (so the
+    lookahead must not swallow the next token — usually a command name). It
+    defaults to the static :data:`_GLOBAL_BOOLEAN_FLAGS`; callers pass a
+    superset when dynamically-derived global flags (e.g. paid-extension
+    root-only flags) include boolean ones the static set can't see.
+
     Returns:
         Tuple of (commands, global_arguments, subcommand_args)
     """
+    boolean_flags = (
+        _GLOBAL_BOOLEAN_FLAGS if global_boolean_flags is None else frozenset(global_boolean_flags)
+    )
     commands = []
     global_arguments = []
     subcommand_args = []
@@ -103,7 +113,7 @@ def _extract_commands_from_argv(
 
         arg_name = safe_split_first(arg, "=", default=arg)
         is_global_only = arg_name in global_only_args
-        is_boolean_flag = arg_name in _GLOBAL_BOOLEAN_FLAGS
+        is_boolean_flag = arg_name in boolean_flags
 
         if is_global_only:
             global_arguments.append(arg)

{dblift-2.4.0 → dblift-2.4.2}/cli/main.py

@@ -1,9 +1,10 @@
 """Main CLI module for dblift."""
 
+import argparse
 import sys
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, List, Optional
+from typing import Any, List, Optional, Set
 
 # Add project root to Python path when running as a script
 # This allows imports to work when running: python3 cli/main.py
@@ -38,6 +39,7 @@ from cli._command_handlers import (  # noqa: F401
     execute_single_command,
 )
 from cli._config_helpers import (  # noqa: F401
+    _GLOBAL_BOOLEAN_FLAGS,
     _build_args_namespace,
     _close_logs,
     _collect_placeholders,
@@ -108,6 +110,49 @@ _GLOBAL_ONLY_ARGS: List[str] = [
     "--max-snapshots",
 ]
 
+
+def _root_only_long_flags(parser: argparse.ArgumentParser) -> Set[str]:
+    """Long flags defined only on the root parser, not on any subparser.
+
+    Paid extensions register their own root-only value flags on the parser
+    (``load_feature_extensions`` runs before the parser is built). Those flags
+    live only on the root parser, so — exactly like the static root-only flags
+    in ``_GLOBAL_ONLY_ARGS`` — the argv preprocessor must classify them as
+    global, or it relocates them past the subcommand token and the subparser
+    rejects them as "unrecognized arguments". Deriving them from the built
+    parser keeps the classification correct without the OSS core having to name
+    each extension flag. Mirrors the invariant asserted by
+    tests/unit/cli/test_global_only_args_completeness.py.
+    """
+    root = {o for a in parser._actions for o in a.option_strings if o.startswith("--")}
+    sub: Set[str] = set()
+    for action in parser._actions:
+        choices = getattr(action, "choices", None)
+        if isinstance(choices, dict):
+            for sub_parser in choices.values():
+                if isinstance(sub_parser, argparse.ArgumentParser):
+                    sub.update(
+                        o
+                        for a in sub_parser._actions
+                        for o in a.option_strings
+                        if o.startswith("--")
+                    )
+    return root - sub - {"--help"}
+
+
+def _root_only_boolean_flags(parser: argparse.ArgumentParser) -> Set[str]:
+    """Root-only long flags that take no value (``store_true``/``store_const``).
+
+    The argv preprocessor must know these so it does NOT run its value-lookahead
+    on them — otherwise the token after a boolean flag (typically a command
+    name) gets swallowed into the global bucket and the command is lost. The
+    static ``_GLOBAL_BOOLEAN_FLAGS`` covers OSS flags; this derives the same for
+    dynamically-discovered paid-extension boolean root flags.
+    """
+    root_only = _root_only_long_flags(parser)
+    return {o for a in parser._actions if a.nargs == 0 for o in a.option_strings if o in root_only}
+
+
 # Tool-level flag aliases for subcommands that take their own version-like
 # argument. Used by the B10-BUG-04 footgun guard in phase 1 to redirect
 # `dblift baseline --version 1.0.0` to the correct flag instead of
@@ -225,8 +270,19 @@ def _parse_argv_and_load_config(argv: List[str]) -> _CliContext:
     """
     terminal_commands = load_terminal_commands()
     available_commands = list(dict.fromkeys(_AVAILABLE_COMMANDS + list(terminal_commands)))
+    # Union the static root-only classification with root-only flags derived
+    # from the built parser, so paid-extension root flags (e.g. an
+    # override-the-license-file flag) are classified as global without the OSS
+    # core naming them. Boolean extension flags must also feed the splitter's
+    # boolean set, or its value-lookahead swallows the following command token.
+    # See _root_only_long_flags / _root_only_boolean_flags.
+    _parser = create_parser()
+    global_only_args = list(_GLOBAL_ONLY_ARGS) + sorted(
+        _root_only_long_flags(_parser) - set(_GLOBAL_ONLY_ARGS)
+    )
+    global_boolean_flags = set(_GLOBAL_BOOLEAN_FLAGS) | _root_only_boolean_flags(_parser)
     commands, global_arguments, subcommand_args = _extract_commands_from_argv(
-        argv, available_commands, _GLOBAL_ONLY_ARGS
+        argv, available_commands, global_only_args, global_boolean_flags
     )
 
     # B10-BUG-04: Flyway users type ``dblift baseline --version 1.0.0``

{dblift-2.4.0 → dblift-2.4.2}/core/sql_model/view.py

@@ -172,6 +172,8 @@ class View(SqlObject):
             and self.unlogged == other.unlogged
             and self.security_definer == other.security_definer
             and self.security_invoker == other.security_invoker
+            # Plugin-owned dialect options participate in equality (mirrors Table)
+            and self.dialect_options == other.dialect_options
             # Note: last_refresh is not compared as it changes with each refresh
             # Note: dependencies is SQL-generation-only, not diff-relevant
         )
@@ -261,7 +263,7 @@ class View(SqlObject):
         Returns:
             View object
         """
-        return cls(
+        view = cls(
             name=data["name"],
             schema=data.get("schema"),
             query=data.get("query"),
@@ -284,6 +286,11 @@ class View(SqlObject):
             security_invoker=data.get("security_invoker"),
             dependencies=data.get("dependencies", []),
         )
+        # Restore plugin-owned dialect options (mirrors Table.from_dict).
+        for plugin, opts in (data.get("dialect_options") or {}).items():
+            for key, value in opts.items():
+                view.set_dialect_option(plugin, key, value)
+        return view
 
     def to_dict(self) -> Dict[str, Any]:
         """Convert view to dictionary representation.
@@ -336,6 +343,13 @@ class View(SqlObject):
         if self.unlogged is not None:
             result["unlogged"] = self.unlogged
 
+        # Plugin-owned dialect options (mirrors Table.to_dict). Without this a
+        # round-trip through a schema snapshot silently drops everything a plugin
+        # stashed under ``dialect_options``, so a diff of the reloaded snapshot
+        # against a live introspection would falsely report a change.
+        if self.dialect_options:
+            result["dialect_options"] = self.dialect_options
+
         return result
 
     @staticmethod

{dblift-2.4.0 → dblift-2.4.2}/dblift.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dblift
-Version: 2.4.0
+Version: 2.4.2
 Summary: A database migration tool that supports multiple databases with native Python drivers
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

{dblift-2.4.0 → dblift-2.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dblift"
-version = "2.4.0"
+version = "2.4.2"
 description = "A database migration tool that supports multiple databases with native Python drivers"
 readme = "README.md"
 requires-python = ">=3.11"