netbox-sqlquery 0.1.5__tar.gz → 0.1.7__tar.gz

{netbox_sqlquery-0.1.5 → netbox_sqlquery-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-sqlquery
-Version: 0.1.5
+Version: 0.1.7
 Summary: SQL query interface for NetBox with syntax highlighting, abstract views, and role-based access control
 Author-email: Ravi Pina <ravi@pina.org>
 License-Expression: Apache-2.0

{netbox_sqlquery-0.1.5 → netbox_sqlquery-0.1.7}/netbox_sqlquery/__init__.py

@@ -1,14 +1,9 @@
 import logging
-import sys
 
 from netbox.plugins import PluginConfig
 
 logger = logging.getLogger("netbox_sqlquery")
 
-# Management commands that modify schema — creating views during these
-# can block migrations when a view depends on a column being altered.
-_SKIP_VIEWS_COMMANDS = {"migrate", "makemigrations"}
-
 
 class NetBoxSQLQueryConfig(PluginConfig):
     name = "netbox_sqlquery"
@@ -17,7 +12,7 @@ class NetBoxSQLQueryConfig(PluginConfig):
         "SQL query interface for NetBox with syntax highlighting,"
         " abstract views, and role-based access control"
     )
-    version = "0.1.5"
+    version = "0.1.7"
     author = "Ravi Pina"
     author_email = "ravi@pina.org"
     base_url = "sqlquery"
@@ -46,25 +41,40 @@ class NetBoxSQLQueryConfig(PluginConfig):
         # Register navigation based on top_level_menu setting
         self._register_navigation()
 
-        # Hook post_migrate so views are (re)created after schema changes.
-        from django.db.models.signals import post_migrate
+        # Drop views before migrations so PostgreSQL can alter columns
+        # that the views depend on. Recreate them after migrations
+        # complete against the new schema. The views are read-only
+        # projections and contain no data, so this is always safe.
+        from django.db.models.signals import post_migrate, pre_migrate
 
-        post_migrate.connect(self._create_views, sender=self)
+        pre_migrate.connect(self._drop_views, sender=self)
+        post_migrate.connect(self._create_views_forced, sender=self)
 
-        # For normal app startup (gunicorn/uvicorn), create views directly.
-        # Skip during management commands that modify schema — views that
-        # reference columns being altered will cause PostgreSQL to reject
-        # the migration with "cannot alter type of a column used by a view".
-        running_command = sys.argv[1] if len(sys.argv) > 1 else None
-        if running_command not in _SKIP_VIEWS_COMMANDS:
-            self._create_views(sender=self)
+        # For normal app startup (gunicorn/uvicorn), skip expensive view
+        # creation if views already exist — just populate the table map.
+        self._create_views(sender=self)
+
+    @staticmethod
+    def _drop_views(sender, **kwargs):
+        try:
+            from .abstract_schema import drop_views
+
+            dropped = drop_views()
+            if dropped:
+                logger.info(
+                    "Dropped %d abstract SQL view(s) before migration.",
+                    len(dropped),
+                )
+        except Exception as exc:
+            logger.warning("Could not drop abstract SQL views: %s", exc)
 
     @staticmethod
     def _create_views(sender, **kwargs):
+        """Normal startup — skips creation if views already exist."""
         try:
             from .abstract_schema import ensure_views
 
-            ensure_views()
+            ensure_views()  # force=False: fast path when views exist
         except Exception as exc:
             logger.warning(
                 "Could not create abstract SQL views: %s. "
@@ -72,6 +82,20 @@ class NetBoxSQLQueryConfig(PluginConfig):
                 exc,
             )
 
+    @staticmethod
+    def _create_views_forced(sender, **kwargs):
+        """Post-migrate — always rebuild views against the new schema."""
+        try:
+            from .abstract_schema import ensure_views
+
+            ensure_views(force=True)
+        except Exception as exc:
+            logger.warning(
+                "Could not create abstract SQL views after migration: %s. "
+                "Run 'manage.py sqlquery_create_views --force' manually.",
+                exc,
+            )
+
     def _register_navigation(self):
         from netbox.plugins.registration import register_menu, register_menu_items
 

{netbox_sqlquery-0.1.5 → netbox_sqlquery-0.1.7}/netbox_sqlquery/abstract_schema.py

@@ -136,6 +136,30 @@ COLUMN_RENAMES = {
 ABSTRACT_TO_TABLES = {}
 
 
+def _views_exist():
+    """Fast check: do any nb_* abstract views exist in the database?"""
+    with connection.cursor() as cursor:
+        cursor.execute("""
+            SELECT 1 FROM information_schema.views
+            WHERE table_schema = 'public' AND table_name LIKE 'nb\\_%'
+            LIMIT 1
+        """)
+        return cursor.fetchone() is not None
+
+
+def _populate_table_map():
+    """Populate ABSTRACT_TO_TABLES from model metadata without FK introspection.
+
+    Used on normal startup when views already exist — avoids the expensive
+    information_schema queries that block gunicorn workers.
+    """
+    ABSTRACT_TO_TABLES.clear()
+    for model in get_included_models():
+        table_name = model._meta.db_table
+        view_name = VIEW_NAME_OVERRIDES.get(table_name, f"nb_{table_name}")
+        ABSTRACT_TO_TABLES[view_name] = {table_name}
+
+
 def _get_view_name(model):
     """Generate the nb_* view name for a model."""
     label = f"{model._meta.app_label}.{model._meta.model_name}"
@@ -165,6 +189,7 @@ def _get_table_columns(table_name):
 def _get_fk_map(table_name):
     """Get FK column -> target table mapping from information_schema."""
     with connection.cursor() as cursor:
+        cursor.execute("SET LOCAL statement_timeout = '30s'")
         cursor.execute(
             """
             SELECT kcu.column_name, ccu.table_name
@@ -366,8 +391,19 @@ def get_included_models():
     return models
 
 
-def ensure_views(dry_run=False):
-    """Create or replace all abstract views. Returns list of (view_name, sql) tuples."""
+def ensure_views(dry_run=False, force=False):
+    """Create or replace all abstract views. Returns list of (view_name, sql) tuples.
+
+    When *force* is False (the default) and views already exist in the database,
+    skips the expensive FK introspection and DDL — only populates the in-process
+    ABSTRACT_TO_TABLES map from model metadata.  Pass *force=True* after
+    migrations or when views need to be rebuilt.
+    """
+    if not force and not dry_run and _views_exist():
+        logger.debug("Abstract views already exist; skipping creation.")
+        _populate_table_map()
+        return []
+
     results = []
     ABSTRACT_TO_TABLES.clear()
 

{netbox_sqlquery-0.1.5 → netbox_sqlquery-0.1.7}/netbox_sqlquery/management/commands/sqlquery_create_views.py

@@ -17,6 +17,11 @@ class Command(BaseCommand):
             action="store_true",
             help="Drop all nb_* views instead of creating them",
         )
+        parser.add_argument(
+            "--force",
+            action="store_true",
+            help="Rebuild views even if they already exist",
+        )
 
     def handle(self, *args, **options):
         if options["drop"]:
@@ -26,7 +31,10 @@ class Command(BaseCommand):
             self.stdout.write(self.style.SUCCESS(f"Dropped {len(dropped)} views"))
             return
 
-        results = ensure_views(dry_run=options["dry_run"])
+        results = ensure_views(
+            dry_run=options["dry_run"],
+            force=options["force"] or options["dry_run"],
+        )
 
         for view_name, sql in results:
             if options["dry_run"]:

{netbox_sqlquery-0.1.5 → netbox_sqlquery-0.1.7}/netbox_sqlquery.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-sqlquery
-Version: 0.1.5
+Version: 0.1.7
 Summary: SQL query interface for NetBox with syntax highlighting, abstract views, and role-based access control
 Author-email: Ravi Pina <ravi@pina.org>
 License-Expression: Apache-2.0

{netbox_sqlquery-0.1.5 → netbox_sqlquery-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-sqlquery"
-version = "0.1.5"
+version = "0.1.7"
 description = "SQL query interface for NetBox with syntax highlighting, abstract views, and role-based access control"
 readme = "README.md"
 license = "Apache-2.0"