ghostbase-cli 0.1.0__tar.gz → 0.1.2__tar.gz

{ghostbase_cli-0.1.0/ghostbase_cli.egg-info → ghostbase_cli-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ghostbase-cli
-Version: 0.1.0
+Version: 0.1.2
 Summary: A fast, keyboard-driven terminal database studio for SQLite, PostgreSQL & MySQL
 Author-email: 4yk5 <contact.4yk5@proton.me>
 License-Expression: MIT
@@ -31,7 +31,7 @@ Dynamic: license-file
                                                  
 ```
 
-# GhostBase 👻🗄️
+# GhostBase 👻
 
 > **A fast, keyboard-driven terminal database studio for SQLite, PostgreSQL, and MySQL.**  
 > *No Java runtimes. No 1.5GB RAM bloat. Built-in production safety guard, instant SQL beautifier & zero-config `.env` connect.*
@@ -42,6 +42,10 @@ Dynamic: license-file
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
 [![UI: Textual](https://img.shields.io/badge/UI-Textual-bd93f9.svg)](https://github.com/Textualize/textual)
 
+<p align="center">
+  <img src="assets/ghostbase.png" alt="GhostBase Terminal Studio" width="100%">
+</p>
+
 ---
 
 ## ⚡ Why GhostBase?
@@ -75,10 +79,10 @@ Opening **DBeaver** or **DataGrip** just to run a quick `SELECT`, inspect an ind
 - ⚡ **1-Key Query Plan (`Ctrl + P`):**
   - Run instant execution plans (`EXPLAIN QUERY PLAN` / `EXPLAIN`) on any query to see index usage and bottlenecks.
 - 🔌 **Universal Database Support:** Connects natively to **SQLite**, **PostgreSQL**, and **MySQL**.
-- 🔍 **Zero-Config `.env` Auto-Connect:** Just run `ghostbase` in any project folder; it automatically picks up `DATABASE_URL` or standard database environment variables.
-- 🔎 **Real-time Table Search (`Ctrl + F`):** Type in the search bar to filter dozens of tables and views instantly.
+- 🔑 **Zero-Config `.env` Auto-Connect:** Just run `ghostbase` in any project folder; it automatically picks up `DATABASE_URL` or standard database environment variables.
+- 🔍 **Real-time Table Search (`Ctrl + F`):** Type in the search bar to filter dozens of tables and views instantly.
 - 📊 **Explorer with Tables & Views:** Browse tables and views with live row counts.
-- 📐 **Instant Schema & Foreign Keys:** See primary keys, column types, nullability, and foreign key references at a glance.
+- 📋 **Instant Schema & Foreign Keys:** See primary keys, column types, nullability, and foreign key references at a glance.
 - 💾 **Multi-Format Exports:** Instant SQL `INSERT`s (`Ctrl + I`), Markdown (`Ctrl + M`), CSV (`Ctrl + E`), and JSON (`Ctrl + J`).
 - 📜 **Query History:** Cycle through your last 20 queries with `Ctrl + ↑` and `Ctrl + ↓`.
 - 🎨 **Clean Cyberpunk Aesthetic:** Fast, high-contrast, zero-flicker terminal interface.
@@ -153,10 +157,9 @@ ghostbase postgresql://prod-db:5432/main --read-only
 
 ---
 
-## 📬 Contact & Inquiries
+## 🤝 Contributing
 
-For partnerships, feature requests, or business inquiries:  
-📧 **[contact.4yk5@proton.me](mailto:contact.4yk5@proton.me)**
+Contributions, feedback, and pull requests are very welcome! Feel free to open an issue for bug reports or feature requests.
 
 ---
 

{ghostbase_cli-0.1.0 → ghostbase_cli-0.1.2}/README.md

@@ -7,7 +7,7 @@
                                                  
 ```
 
-# GhostBase 👻🗄️
+# GhostBase 👻
 
 > **A fast, keyboard-driven terminal database studio for SQLite, PostgreSQL, and MySQL.**  
 > *No Java runtimes. No 1.5GB RAM bloat. Built-in production safety guard, instant SQL beautifier & zero-config `.env` connect.*
@@ -18,6 +18,10 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
 [![UI: Textual](https://img.shields.io/badge/UI-Textual-bd93f9.svg)](https://github.com/Textualize/textual)
 
+<p align="center">
+  <img src="assets/ghostbase.png" alt="GhostBase Terminal Studio" width="100%">
+</p>
+
 ---
 
 ## ⚡ Why GhostBase?
@@ -51,10 +55,10 @@ Opening **DBeaver** or **DataGrip** just to run a quick `SELECT`, inspect an ind
 - ⚡ **1-Key Query Plan (`Ctrl + P`):**
   - Run instant execution plans (`EXPLAIN QUERY PLAN` / `EXPLAIN`) on any query to see index usage and bottlenecks.
 - 🔌 **Universal Database Support:** Connects natively to **SQLite**, **PostgreSQL**, and **MySQL**.
-- 🔍 **Zero-Config `.env` Auto-Connect:** Just run `ghostbase` in any project folder; it automatically picks up `DATABASE_URL` or standard database environment variables.
-- 🔎 **Real-time Table Search (`Ctrl + F`):** Type in the search bar to filter dozens of tables and views instantly.
+- 🔑 **Zero-Config `.env` Auto-Connect:** Just run `ghostbase` in any project folder; it automatically picks up `DATABASE_URL` or standard database environment variables.
+- 🔍 **Real-time Table Search (`Ctrl + F`):** Type in the search bar to filter dozens of tables and views instantly.
 - 📊 **Explorer with Tables & Views:** Browse tables and views with live row counts.
-- 📐 **Instant Schema & Foreign Keys:** See primary keys, column types, nullability, and foreign key references at a glance.
+- 📋 **Instant Schema & Foreign Keys:** See primary keys, column types, nullability, and foreign key references at a glance.
 - 💾 **Multi-Format Exports:** Instant SQL `INSERT`s (`Ctrl + I`), Markdown (`Ctrl + M`), CSV (`Ctrl + E`), and JSON (`Ctrl + J`).
 - 📜 **Query History:** Cycle through your last 20 queries with `Ctrl + ↑` and `Ctrl + ↓`.
 - 🎨 **Clean Cyberpunk Aesthetic:** Fast, high-contrast, zero-flicker terminal interface.
@@ -129,10 +133,9 @@ ghostbase postgresql://prod-db:5432/main --read-only
 
 ---
 
-## 📬 Contact & Inquiries
+## 🤝 Contributing
 
-For partnerships, feature requests, or business inquiries:  
-📧 **[contact.4yk5@proton.me](mailto:contact.4yk5@proton.me)**
+Contributions, feedback, and pull requests are very welcome! Feel free to open an issue for bug reports or feature requests.
 
 ---
 

{ghostbase_cli-0.1.0 → ghostbase_cli-0.1.2}/app.py

@@ -1,5 +1,7 @@
 import sys
 import os
+import time
+import re
 
 if sys.platform == "win32":
     try:
@@ -138,164 +140,127 @@ ListItem.section-header {
 #schema-title {
     color: #f0883e;
     text-style: bold;
-    margin-bottom: 1;
 }
 #schema-content {
     color: #8b949e;
 }
 
-/* Query editor */
+/* Content Area */
 #content-area {
     width: 1fr;
-    padding: 0 1;
+    background: #0d1117;
 }
+
+/* Query Editor */
 #query-box {
-    height: 7;
-    border: solid #30363d;
+    height: 9;
     background: #010409;
-    margin-bottom: 0;
+    border-bottom: solid #30363d;
+    color: #e6edf3;
 }
 #query-box:focus {
-    border: solid #388bfd;
+    border-bottom: solid #388bfd;
 }
 
-/* Actions toolbar */
+/* Toolbar */
 #toolbar {
     height: 3;
+    background: #161b22;
+    border-bottom: solid #30363d;
     align: left middle;
-    margin: 0;
-    overflow-x: hidden;
+    padding: 0 1;
+}
+#toolbar Button {
+    margin-right: 1;
+    min-width: 8;
+    height: 1;
+    border: none;
 }
 #btn-run {
     background: #238636;
     color: #ffffff;
-    border: none;
-    min-width: 6;
-    margin-right: 1;
 }
-#btn-run:hover { background: #2ea043; }
-
+#btn-run:hover {
+    background: #2ea043;
+}
 #btn-explain {
-    background: #388bfd;
+    background: #1f6feb;
     color: #ffffff;
-    border: none;
-    min-width: 9;
-    margin-right: 1;
 }
-#btn-explain:hover { background: #58a6ff; }
-
+#btn-explain:hover {
+    background: #388bfd;
+}
 #btn-format {
-    background: #1f6feb;
-    color: #ffffff;
-    border: none;
-    min-width: 8;
-    margin-right: 1;
+    background: #21262d;
+    color: #c9d1d9;
+}
+#btn-format:hover {
+    background: #30363d;
 }
-#btn-format:hover { background: #388bfd; }
-
 #btn-clear {
     background: #21262d;
     color: #8b949e;
-    border: none;
-    min-width: 7;
-    margin-right: 1;
 }
-#btn-clear:hover { background: #30363d; color: #c9d1d9; }
-
+#btn-clear:hover {
+    background: #30363d;
+    color: #f85149;
+}
 #btn-safe {
+    background: #21262d;
+    color: #3fb950;
+}
+#btn-safe:hover {
     background: #30363d;
-    color: #c9d1d9;
-    border: none;
-    min-width: 6;
-    margin-right: 1;
 }
-#btn-safe:hover { background: #484f58; }
-
 #status-label {
+    margin-left: 2;
     color: #8b949e;
-    text-overflow: ellipsis;
-    overflow: hidden;
 }
 
-/* Results & export bar */
+/* Results Bar */
 #results-bar {
     height: 3;
+    background: #161b22;
+    border-bottom: solid #30363d;
     align: left middle;
     padding: 0 1;
-    background: #161b22;
-    border: solid #30363d;
-    border-bottom: none;
-    overflow-x: hidden;
 }
 #results-title {
-    color: #79c0ff;
+    color: #58a6ff;
     text-style: bold;
-    margin-right: 1;
 }
 #results-count {
-    color: #8b949e;
-    margin-right: 1;
+    color: #484f58;
+    margin-left: 1;
 }
 .export-sep {
     color: #30363d;
-    margin-right: 1;
+    margin: 0 1;
 }
 .export-label {
     color: #484f58;
     margin-right: 1;
 }
-#btn-csv {
-    background: #0d419d;
-    color: #79c0ff;
-    border: none;
-    min-width: 5;
+#results-bar Button {
     margin-right: 1;
-}
-#btn-csv:hover { background: #1158c7; }
-
-#btn-json {
-    background: #5a1e02;
-    color: #ffa657;
-    border: none;
     min-width: 6;
-    margin-right: 1;
-}
-#btn-json:hover { background: #7d2d00; }
-
-#btn-md {
-    background: #232a35;
-    color: #a5d6ff;
+    height: 1;
     border: none;
-    min-width: 4;
-    margin-right: 1;
+    background: #21262d;
+    color: #8b949e;
 }
-#btn-md:hover { background: #30363d; }
-
-#btn-sql {
-    background: #3b2300;
-    color: #ffc680;
-    border: none;
-    min-width: 5;
-    margin-right: 1;
+#results-bar Button:hover {
+    background: #30363d;
+    color: #c9d1d9;
 }
-#btn-sql:hover { background: #5a3500; }
 
-/* Results table */
+/* Data Table */
 #data-table {
     height: 1fr;
-    border: solid #30363d;
     background: #0d1117;
 }
-DataTable > .datatable--header {
-    background: #161b22;
-    color: #79c0ff;
-    text-style: bold;
-}
-DataTable > .datatable--cursor {
-    background: #1c2128;
-}
 
-/* Status bar */
+/* Status Bar */
 #status-bar {
     height: 1;
     dock: bottom;
@@ -344,18 +309,22 @@ class GhostBaseApp(App):
     selected_table: reactive[str] = reactive("")
     safe_mode: reactive[bool] = reactive(False)
 
-    def __init__(self, db_path: str = None, read_only: bool = False):
+    def __init__(self, db_path: str = None, read_only: bool = False, populate_sample: bool = False):
         super().__init__()
         self.db_path = db_path or "sample.db"
+        self.populate_sample = populate_sample
         self.db = DatabaseEngine(self.db_path)
         self.safe_mode = read_only
         self.last_columns: list = []
         self.last_rows:    list = []
+        self.last_query_table: str = None
         self.query_history: list = []
         self.history_index: int = -1
         self.all_tables: list = []
         self.all_views:  list = []
+        self._row_count_cache: dict = {}
         self._pending_destructive_query = None
+        self._pending_destructive_time = 0.0
 
     # Layout
 
@@ -373,7 +342,7 @@ class GhostBaseApp(App):
             yield Label(f"[{self.db.db_type_label()}]", id="db-type-label")
             yield Label(db_label, id="db-name-label")
             yield Label(safe_text, id="safe-badge", classes=safe_class)
-            yield Label("v0.1.0", id="version-label")
+            yield Label("v0.1.2", id="version-label")
 
         with Horizontal(id="main-container"):
             with Vertical(id="sidebar"):
@@ -420,26 +389,49 @@ class GhostBaseApp(App):
     # Lifecycle
 
     async def on_mount(self):
+        # Configure database engine level Read-Only mode if safe_mode is enabled
+        if self.safe_mode:
+            self.db.set_read_only(True)
+
         tables = self.db.get_tables()
-        if not tables and self.db.db_type == "sqlite":
+        # Only populate demo tables when explicitly requested, in-memory, or default sample.db AND NOT in safe_mode
+        is_default_sample = (
+            self.populate_sample
+            or self.db_path == ":memory:"
+            or os.path.basename(os.path.abspath(self.db_path)) == "sample.db"
+        )
+        if not tables and self.db.db_type == "sqlite" and is_default_sample and not self.safe_mode:
             self._create_sample_data()
             tables = self.db.get_tables()
 
         self.all_tables = tables
         self.all_views  = self.db.get_views()
+        self._refresh_row_counts()
         self._refresh_sidebar(self.all_tables, self.all_views)
 
         if self.all_tables:
             first = self.all_tables[0]
             self.selected_table = first
+            quoted = self.db.quote_table_name(first)
             self.query_one("#query-box", TextArea).text = (
-                f"SELECT * FROM {first} LIMIT 50;"
+                f"SELECT * FROM {quoted} LIMIT 50;"
             )
             self.action_run_query()
             self._show_schema(first)
+        else:
+            self.query_one("#query-box", TextArea).text = (
+                "-- Connected to database.\n-- Write a query and press Ctrl+R to execute.\n"
+            )
 
         self._update_status_bar()
 
+    # Row count caching
+
+    def _refresh_row_counts(self):
+        self._row_count_cache = {}
+        for t in self.all_tables:
+            self._row_count_cache[t] = self.db.get_row_count(t)
+
     # Sample schema
 
     def _create_sample_data(self):
@@ -500,7 +492,7 @@ class GhostBaseApp(App):
             lv.append(_sep_tables)
 
             for t in tables:
-                rc   = self.db.get_row_count(t)
+                rc   = self._row_count_cache.get(t, 0)
                 item = ListItem(Label(f"  {t}  ({rc})"))
                 item.table_name  = t    # type: ignore
                 item.is_view     = False  # type: ignore
@@ -533,6 +525,11 @@ class GhostBaseApp(App):
                 filtered_views  = [v for v in self.all_views if q in v.lower()]
             self._refresh_sidebar(filtered_tables, filtered_views)
 
+    def on_text_area_changed(self, event: TextArea.Changed):
+        if event.text_area.id == "query-box" and self._pending_destructive_query is not None:
+            self._pending_destructive_query = None
+            self._pending_destructive_time = 0.0
+
     # Schema panel
 
     def _show_schema(self, table_name: str, is_view: bool = False):
@@ -591,8 +588,12 @@ class GhostBaseApp(App):
             return
         is_view = getattr(item, "is_view", False)
         self.selected_table = t
+        self._pending_destructive_query = None
+        self._pending_destructive_time = 0.0
+
+        quoted = self.db.quote_table_name(t)
         self.query_one("#query-box", TextArea).text = (
-            f"SELECT * FROM {t} LIMIT 50;"
+            f"SELECT * FROM {quoted} LIMIT 50;"
         )
         self.action_run_query()
         self._show_schema(t, is_view=is_view)
@@ -626,26 +627,32 @@ class GhostBaseApp(App):
         status = self.query_one("#status-label", Label)
         res_cnt = self.query_one("#results-count", Label)
 
-        # Safety guard check
-        is_destructive, reason = self.db.check_safety(query)
+        # Safety guard check (strict read-only in safe mode, destructive guard in normal mode)
+        is_destructive, reason = self.db.check_safety(query, is_safe_mode=self.safe_mode)
         if is_destructive:
             if self.safe_mode:
                 self.notify(f"BLOCKED BY SAFE MODE: {reason}", severity="error", timeout=5)
                 status.update(f"[bold red]BLOCKED BY SAFE MODE:[/] {reason}")
                 return
 
-            if self._pending_destructive_query != query:
+            now = time.time()
+            if self._pending_destructive_query == query and (now - self._pending_destructive_time) <= 10.0:
+                # Double confirmation received within 10s window
+                self._pending_destructive_query = None
+                self._pending_destructive_time = 0.0
+            else:
                 self._pending_destructive_query = query
+                self._pending_destructive_time = now
                 self.notify(
-                    f"DANGER: {reason}!\nPress Ctrl+R again to confirm.",
+                    f"DANGER: {reason}!\nPress Ctrl+R within 10s to confirm.",
                     severity="warning",
                     timeout=5,
                 )
                 status.update(f"[bold red]DANGER:[/] {reason} -> Press Ctrl+R to CONFIRM")
                 return
-
-            # Double confirmation received
+        else:
             self._pending_destructive_query = None
+            self._pending_destructive_time = 0.0
 
         if not self.query_history or self.query_history[-1] != query:
             self.query_history.append(query)
@@ -658,6 +665,10 @@ class GhostBaseApp(App):
         dt.clear(columns=True)
 
         if not res["success"]:
+            # Clear export cache on error
+            self.last_columns = []
+            self.last_rows    = []
+            self.last_query_table = None
             err = res.get("error", "Unknown error")
             status.update(f"[bold red]ERROR[/] {err}")
             res_cnt.update("(Error)")
@@ -667,6 +678,12 @@ class GhostBaseApp(App):
         if res["is_select"]:
             self.last_columns = res["columns"]
             self.last_rows    = res["rows"]
+
+            # Detect target table for export from final SELECT statement (ignoring CTE definitions)
+            main_q = re.sub(r"^WITH\s+[\s\S]*?\)\s*", "", query, flags=re.IGNORECASE)
+            m = re.search(r"\bFROM\s+([`\"\[]?[a-zA-Z0-9_\.]+(?:\"|\'|\]|`)?)", main_q, flags=re.IGNORECASE)
+            self.last_query_table = m.group(1).strip('`"[]') if m else (self.selected_table or "query_result")
+
             dt.add_columns(*self.last_columns)
             for row in self.last_rows:
                 styled = []
@@ -685,16 +702,66 @@ class GhostBaseApp(App):
             rc = res["row_count"]
             ms = res["elapsed_ms"]
             status.update(f"[bold green]OK[/] ({ms}ms)")
-            res_cnt.update(f"({rc} rows)")
+
+            if res.get("truncated"):
+                res_cnt.update(f"({rc}+ rows, capped at 1,000)")
+                self.notify("Displaying first 1,000 rows (use LIMIT / OFFSET for more)", severity="information", timeout=4)
+            else:
+                res_cnt.update(f"({rc} rows)")
+
+            self._update_status_bar(row_count=rc, ms=ms)
+        elif res.get("is_returning"):
+            # DML with RETURNING: Render returned rows in DataTable, but treat as write operation
+            self.last_columns = res["columns"]
+            self.last_rows    = res["rows"]
+
+            # Extract target table from INSERT/UPDATE
+            m = re.search(r"\b(?:INTO|UPDATE)\s+([`\"\[]?[a-zA-Z0-9_\.]+(?:\"|\'|\]|`)?)", query, flags=re.IGNORECASE)
+            self.last_query_table = m.group(1).strip('`"[]') if m else (self.selected_table or "query_result")
+
+            dt.add_columns(*self.last_columns)
+            for row in self.last_rows:
+                styled = []
+                for val in row:
+                    if val is None:
+                        styled.append(Text("NULL", style="dim #6e7681"))
+                    elif isinstance(val, (int, float)):
+                        styled.append(Text(str(val), style="#79c0ff"))
+                    else:
+                        s = str(val).replace("\r\n", " ").replace("\n", " ").replace("\t", " ")
+                        if len(s) > 200:
+                            s = s[:197] + "..."
+                        styled.append(Text(s, style="#c9d1d9"))
+                dt.add_row(*styled)
+
+            aff = res.get("affected_rows", len(self.last_rows))
+            rc = res.get("row_count", len(self.last_rows))
+            ms = res["elapsed_ms"]
+            status.update(f"[bold green]OK[/] ({ms}ms)")
+            res_cnt.update(f"({rc} rows returned, {aff} affected)")
+            self.notify(f"Done — {aff} row(s) affected (RETURNING {rc} rows)")
+
+            # Refresh schema & row counts
+            self.all_tables = self.db.get_tables()
+            self.all_views  = self.db.get_views()
+            self._refresh_row_counts()
+            self._refresh_sidebar(self.all_tables, self.all_views)
             self._update_status_bar(row_count=rc, ms=ms)
         else:
+            # Pure DML / DDL statement -> clear export cache so previous SELECT results are not mistakenly exported
+            self.last_columns = []
+            self.last_rows    = []
+            self.last_query_table = None
+
             aff = res.get("affected_rows", 0)
             ms  = res["elapsed_ms"]
             status.update(f"[bold green]OK[/] ({ms}ms)")
             res_cnt.update(f"({aff} rows affected)")
             self.notify(f"Done — {aff} row(s) affected")
+
             self.all_tables = self.db.get_tables()
             self.all_views  = self.db.get_views()
+            self._refresh_row_counts()
             self._refresh_sidebar(self.all_tables, self.all_views)
             self._update_status_bar(ms=ms)
 
@@ -745,21 +812,29 @@ class GhostBaseApp(App):
     def action_toggle_safe_mode(self):
         """Toggle Production Safe Mode (Ctrl+S)"""
         self.safe_mode = not self.safe_mode
+        self._pending_destructive_query = None
+        self._pending_destructive_time = 0.0
+
+        # Enforce/revoke database session level Read-Only
+        self.db.set_read_only(self.safe_mode)
+
         badge = self.query_one("#safe-badge", Label)
         if self.safe_mode:
             badge.update("[SAFE: ON]")
             badge.remove_class("unsafe")
-            self.notify("Safe Mode ENABLED: Destructive queries blocked", timeout=3)
+            self.notify("Safe Mode ENABLED: Modifications strictly blocked (Read-Only)", timeout=3)
         else:
             badge.update("[SAFE: OFF]")
             badge.add_class("unsafe")
-            self.notify("Safe Mode DISABLED: Destructive queries allowed with confirmation", severity="warning", timeout=3)
+            self.notify("Safe Mode DISABLED: Destructive queries require confirmation", severity="warning", timeout=3)
         self._update_status_bar()
 
     def action_focus_filter(self):
         self.query_one("#table-search", Input).focus()
 
     def action_clear_query(self):
+        self._pending_destructive_query = None
+        self._pending_destructive_time = 0.0
         self.query_one("#query-box", TextArea).text = ""
         self.query_one("#status-label", Label).update("Ready")
         self.query_one("#query-box", TextArea).focus()
@@ -782,7 +857,7 @@ class GhostBaseApp(App):
 
     def action_export_csv(self):
         if not self.last_columns:
-            self.notify("Run a query first", severity="warning")
+            self.notify("Run a SELECT query first", severity="warning")
             return
         db_dir = (
             os.path.dirname(os.path.abspath(self.db_path))
@@ -795,7 +870,7 @@ class GhostBaseApp(App):
 
     def action_export_json(self):
         if not self.last_columns:
-            self.notify("Run a query first", severity="warning")
+            self.notify("Run a SELECT query first", severity="warning")
             return
         db_dir = (
             os.path.dirname(os.path.abspath(self.db_path))
@@ -808,7 +883,7 @@ class GhostBaseApp(App):
 
     def action_export_markdown(self):
         if not self.last_columns:
-            self.notify("Run a query first", severity="warning")
+            self.notify("Run a SELECT query first", severity="warning")
             return
         db_dir = (
             os.path.dirname(os.path.abspath(self.db_path))
@@ -821,9 +896,9 @@ class GhostBaseApp(App):
 
     def action_export_sql(self):
         if not self.last_columns:
-            self.notify("Run a query first", severity="warning")
+            self.notify("Run a SELECT query first", severity="warning")
             return
-        table_name = self.selected_table or "exported_table"
+        table_name = getattr(self, "last_query_table", None) or self.selected_table or "exported_table"
         db_dir = (
             os.path.dirname(os.path.abspath(self.db_path))
             if (self.db.db_type == "sqlite" and self.db_path != ":memory:")