dbagent-cli 0.11.0__tar.gz → 0.11.1__tar.gz

{dbagent_cli-0.11.0 → dbagent_cli-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbagent-cli
-Version: 0.11.0
+Version: 0.11.1
 Summary: The Privacy-First AI Database Copilot, Schema Graph Introspector & Post-Commit Recovery Engine (CLI)
 Author: Santhosh Gupta
 License: MIT

{dbagent_cli-0.11.0 → dbagent_cli-0.11.1}/dbagent/__init__.py

@@ -2,5 +2,5 @@
 DB-Agent: Universal Database Introspection and Script Generation AI Agent (CLI).
 """
 
-__version__ = "0.11.0"
+__version__ = "0.11.1"
 __author__ = "Santhosh Gupta"

{dbagent_cli-0.11.0 → dbagent_cli-0.11.1}/dbagent/agent/generator.py

@@ -59,6 +59,10 @@ Generate ONLY the raw executable SQL query for the given database. No markdown f
    - Check the column data type and sample values shown in the schema.
    - If the column is VARCHAR(1) or CHAR(1) or text, check if values use 'Y'/'N', 'YES'/'NO', '1'/'0', 'ACTIVE'/'INACTIVE', 'TRUE'/'FALSE'.
    - If sample values show 'Y'/'N' (or if it's a single-character VARCHAR/CHAR column), use `active = 'Y'` or `active IN ('Y', '1', 'true', 'TRUE')` for active/enabled status.
+10. For Deletions & Cascading Mapping Cleanup (when deleting a record/user without foreign key constraint violations):
+   - For PostgreSQL: Use a single Common Table Expression (CTE) with data-modifying statements deleting from all child, mapping, activity, profile, and preference tables first, and finally deleting from the parent table (e.g. `WITH target AS (SELECT pk_user_id FROM ivis_user WHERE ...), del_act AS (DELETE FROM user_activity WHERE user_id IN (SELECT pk_user_id FROM target)), del_map AS (DELETE FROM ivis_user_access WHERE fk_user_id IN (SELECT pk_user_id FROM target)) DELETE FROM ivis_user WHERE pk_user_id IN (SELECT pk_user_id FROM target);`).
+   - For MySQL / SQLite: Generate clean, ordered DELETE statements deleting referencing child records before the parent record.
+   - Always delete from all referencing tables present in the schema to avoid foreign key violations.
 """
 
 

{dbagent_cli-0.11.0 → dbagent_cli-0.11.1}/dbagent/agent/pipeline.py

@@ -160,6 +160,9 @@ class QueryPipeline:
 
         # 2. Targeted on-demand table introspection with automatic junction expansion
         target_names = list(set(exact + fuzzy))
+        is_delete_or_mapping = any(w in user_prompt.lower() for w in ["delete", "remove", "drop", "cascade", "mapping", "map", "link", "clean", "without any mappings"])
+        max_tables_limit = 25 if is_delete_or_mapping else 12
+
         if target_names:
             try:
                 all_table_names = self.connector.get_table_names()
@@ -174,24 +177,29 @@ class QueryPipeline:
                     t_lower = t.lower()
                     if t in target_names:
                         continue
-                    is_map = any(m in t_lower for m in ["_map", "mapping", "_rel", "_junction", "_link", "_access", "_config"])
+                    is_map = any(m in t_lower for m in ["_map", "mapping", "_rel", "_junction", "_link", "_access", "_config", "_preference", "_profile", "_activity", "_log"])
                     matches_stem = any(s in t_lower for s in stems)
-                    if (is_map and matches_stem) or sum(1 for s in stems if s in t_lower) >= 2:
-                        if t not in target_names:
-                            target_names.append(t)
-                    if len(target_names) >= 12:
+                    if is_delete_or_mapping:
+                        if matches_stem or (is_map and matches_stem) or sum(1 for s in stems if s in t_lower) >= 1:
+                            if t not in target_names:
+                                target_names.append(t)
+                    else:
+                        if (is_map and matches_stem) or sum(1 for s in stems if s in t_lower) >= 2:
+                            if t not in target_names:
+                                target_names.append(t)
+                    if len(target_names) >= max_tables_limit:
                         break
             except Exception:
                 pass
 
             targeted = self.connector.inspect_schema(table_names=target_names, include_samples=True, max_samples=2)
             retriever = ContextRetriever(targeted)
-            return retriever.retrieve_context(user_prompt, exact_tables=exact, fuzzy_tables=fuzzy, max_tables=12)
+            return retriever.retrieve_context(user_prompt, exact_tables=exact, fuzzy_tables=fuzzy, max_tables=max_tables_limit)
 
         # 3. Fallback: inspect targeted
-        targeted = self.connector.inspect_targeted(user_prompt, max_tables=12, include_samples=True)
+        targeted = self.connector.inspect_targeted(user_prompt, max_tables=max_tables_limit, include_samples=True)
         retriever = ContextRetriever(targeted)
-        return retriever.retrieve_context(user_prompt, exact_tables=exact, fuzzy_tables=fuzzy, max_tables=12)
+        return retriever.retrieve_context(user_prompt, exact_tables=exact, fuzzy_tables=fuzzy, max_tables=max_tables_limit)
 
     def run(
         self,

{dbagent_cli-0.11.0 → dbagent_cli-0.11.1}/dbagent/execution/prompt_queue.py

@@ -83,15 +83,27 @@ class PromptQueueManager:
         if not raw_clean:
             return raw_clean
 
-        # Do not split direct SQL statements like "SELECT 1; SELECT 2;"
-        if raw_clean.lower().startswith(("select ", "insert ", "update ", "delete ", "create ", "alter ", "drop ", "with ")):
-            return raw_clean
-
         # Do not split special REPL commands
         if raw_clean.startswith(":"):
             return raw_clean
 
-        # Split by ';' or '&&'
+        # Do not split multi-line text with newlines containing SQL statements/keywords
+        if "\n" in raw_clean and any(kw in raw_clean.upper() for kw in [
+            "SELECT", "INSERT", "UPDATE", "DELETE", "FROM", "WHERE", "JOIN", "COMMIT", "BEGIN", "WITH", "CREATE", "ALTER", "DROP"
+        ]):
+            return raw_clean
+
+        # Do not split direct SQL statements or code blocks containing SQL DML/DDL
+        if re.search(r'\b(?:DELETE\s+FROM|INSERT\s+INTO|UPDATE\s+[a-zA-Z0-9_\"`.]+\s+SET|SELECT\s+.*?FROM|CREATE\s+TABLE|ALTER\s+TABLE|DROP\s+TABLE|COMMIT|ROLLBACK|BEGIN)\b', raw_clean, re.IGNORECASE | re.DOTALL):
+            return raw_clean
+
+        # Do not split prompts that ask to review, fix, or correct a code snippet (e.g. "... ; correct this")
+        if any(phrase in raw_clean.lower() for phrase in [
+            "correct this", "fix this", "check this", "review this", "optimize this", "explain this", "what does this do", "run this", "execute this"
+        ]):
+            return raw_clean
+
+        # Split by ';' or '&&' for distinct natural language prompts (e.g. "count users ; show top 5 sites")
         delimiter_pattern = r'\s*(?:;|&&)\s*'
         parts = [p.strip() for p in re.split(delimiter_pattern, raw_clean) if p.strip()]
 

{dbagent_cli-0.11.0 → dbagent_cli-0.11.1}/dbagent/sql/validator.py

@@ -150,17 +150,23 @@ class SQLValidator:
 
         stmt = statements[0]
 
-        for pat in cls.READ_PATTERNS:
-            if re.search(pat, stmt, re.IGNORECASE | re.DOTALL):
-                return "read"
+        # Check for data-modifying CTEs (WITH ... DELETE|INSERT|UPDATE ...)
+        if re.match(r"^\s*WITH\b", stmt, re.IGNORECASE):
+            if re.search(r"\b(?:DELETE\s+FROM|INSERT\s+INTO|UPDATE\s+[a-zA-Z0-9_\"`.]+\s+SET)\b", stmt, re.IGNORECASE):
+                return "write"
+            return "read"
+
+        for pat in cls.WRITE_PATTERNS:
+            if re.search(pat, stmt, re.IGNORECASE):
+                return "write"
 
         for pat in cls.DDL_PATTERNS:
             if re.search(pat, stmt, re.IGNORECASE):
                 return "ddl"
 
-        for pat in cls.WRITE_PATTERNS:
-            if re.search(pat, stmt, re.IGNORECASE):
-                return "write"
+        for pat in cls.READ_PATTERNS:
+            if re.search(pat, stmt, re.IGNORECASE | re.DOTALL):
+                return "read"
 
         return "unknown"
 

{dbagent_cli-0.11.0 → dbagent_cli-0.11.1}/dbagent/ui/console.py

@@ -53,8 +53,8 @@ def print_info(message: str) -> None:
 
 
 def print_code(code: str, language: str = "sql", title: Optional[str] = None) -> None:
-    """Print syntax-highlighted code block."""
-    syntax = Syntax(code, language, theme="monokai", line_numbers=True)
+    """Print syntax-highlighted code block without line numbers for easy copy-pasting."""
+    syntax = Syntax(code, language, theme="monokai", line_numbers=False)
     panel = Panel(syntax, title=f"[bold cyan]{title or language.upper()}[/bold cyan]", border_style="dim")
     console.print(panel)
 

{dbagent_cli-0.11.0 → dbagent_cli-0.11.1}/dbagent_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbagent-cli
-Version: 0.11.0
+Version: 0.11.1
 Summary: The Privacy-First AI Database Copilot, Schema Graph Introspector & Post-Commit Recovery Engine (CLI)
 Author: Santhosh Gupta
 License: MIT

{dbagent_cli-0.11.0 → dbagent_cli-0.11.1}/dbagent_cli.egg-info/SOURCES.txt

@@ -84,6 +84,7 @@ tests/test_graph.py
 tests/test_knowledge.py
 tests/test_plugins.py
 tests/test_prompt_queue.py
+tests/test_prompt_queue_and_sql.py
 tests/test_providers.py
 tests/test_recovery.py
 tests/test_safety.py

{dbagent_cli-0.11.0 → dbagent_cli-0.11.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dbagent-cli"
-version = "0.11.0"
+version = "0.11.1"
 description = "The Privacy-First AI Database Copilot, Schema Graph Introspector & Post-Commit Recovery Engine (CLI)"
 readme = "README.md"
 requires-python = ">=3.9"

dbagent_cli-0.11.1/tests/test_prompt_queue_and_sql.py

@@ -0,0 +1,48 @@
+"""
+Tests for PromptQueueManager SQL script handling and SQLValidator CTE classification.
+"""
+
+from dbagent.execution.prompt_queue import PromptQueueManager
+from dbagent.sql.validator import SQLValidator
+
+
+def test_queue_does_not_split_multiline_sql_with_semicolons():
+    """Verify that multi-line SQL scripts with internal semicolons are not split into queued fragments."""
+    queue_mgr = PromptQueueManager()
+
+    sql_input = """
+    DELETE FROM ivis_customer_user_map WHERE fk_user_id = 5201;
+    DELETE FROM ivis_user_access WHERE fk_user_id = 5201;
+    DELETE FROM user_activity WHERE user_id = 5201;
+    DELETE FROM ivis_user WHERE pk_user_id = 5201;
+    COMMIT; correct this
+    """
+
+    res = queue_mgr.split_and_enqueue_chained(sql_input)
+    assert res == sql_input.strip()
+    assert queue_mgr.has_next() is False
+
+
+def test_classify_query_with_cte_delete():
+    """Verify that data-modifying WITH CTE statements are classified as 'write'."""
+    cte_delete = """
+    WITH target_user AS (
+        SELECT pk_user_id FROM ivis_user WHERE username = 'target_user'
+    ),
+    del_access AS (
+        DELETE FROM ivis_user_access WHERE fk_user_id IN (SELECT pk_user_id FROM target_user)
+    )
+    DELETE FROM ivis_user WHERE pk_user_id IN (SELECT pk_user_id FROM target_user);
+    """
+    assert SQLValidator.classify_query(cte_delete) == "write"
+
+
+def test_classify_query_with_cte_read():
+    """Verify that regular SELECT WITH CTE statements remain classified as 'read'."""
+    cte_read = """
+    WITH active_users AS (
+        SELECT pk_user_id, username FROM ivis_user WHERE active = 'Y'
+    )
+    SELECT * FROM active_users LIMIT 10;
+    """
+    assert SQLValidator.classify_query(cte_read) == "read"