harlequin 2.2.1__tar.gz → 2.3.0__tar.gz

{harlequin-2.2.1 → harlequin-2.3.0}/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.3.0] - 2025-10-24
+
+### Breaking Changes
+
+- Drops support for Python 3.9.
+
+### Bug Fixes
+
+- Harlequin will no longer execute an empty query; the Run Query button will appear disabled if the buffer is empty ([#873](https://github.com/tconbeer/harlequin/issues/873)).
+
 ## [2.2.1] - 2025-10-16
 
 ### Bug Fixes
@@ -835,7 +845,8 @@ All notable changes to this project will be documented in this file.
 
 - Use the DuckDB CLI.
 
-[unreleased]: https://github.com/tconbeer/harlequin/compare/2.2.1...HEAD
+[unreleased]: https://github.com/tconbeer/harlequin/compare/2.3.0...HEAD
+[2.3.0]: https://github.com/tconbeer/harlequin/compare/2.2.1...2.3.0
 [2.2.1]: https://github.com/tconbeer/harlequin/compare/2.2.0...2.2.1
 [2.2.0]: https://github.com/tconbeer/harlequin/compare/2.1.3...2.2.0
 [2.1.3]: https://github.com/tconbeer/harlequin/compare/2.1.2...2.1.3

{harlequin-2.2.1 → harlequin-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: harlequin
-Version: 2.2.1
+Version: 2.3.0
 Summary: The SQL IDE for Your Terminal.
 Project-URL: Homepage, https://harlequin.sh
 Project-URL: Documentation, https://harlequin.sh/docs/getting-started/index
@@ -10,24 +10,18 @@ Project-URL: Changelog, https://github.com/tconbeer/harlequin/blob/main/CHANGELO
 Author-email: Ted Conbeer <tconbeer@users.noreply.github.com>
 License-Expression: MIT
 License-File: LICENSE
-Keywords: harlequin,ide,sql,tui
-Requires-Python: <3.14,>=3.9
+Keywords: harlequin,ide,sql,textual,tui
+Requires-Python: <3.14,>=3.10
 Requires-Dist: click==8.1.8
 Requires-Dist: duckdb>=0.8.0
-Requires-Dist: importlib-metadata>=8.0; python_version < '3.10'
-Requires-Dist: numpy<2.1.0,>=2.0.0; python_version < '3.10'
-Requires-Dist: numpy<2.3.0,>=2.1.0; python_version >= '3.10'
 Requires-Dist: platformdirs<5.0,>=3.10
-Requires-Dist: pyarrow>=18.1.0; python_version >= '3.12'
 Requires-Dist: questionary==2.0.1
 Requires-Dist: rich-click==1.8.5
 Requires-Dist: shandy-sqlfmt>=0.19.0
-Requires-Dist: textual-fastdatatable==0.12.0
-Requires-Dist: textual-textarea==0.15.0
-Requires-Dist: textual==0.89.1
+Requires-Dist: textual-fastdatatable==0.13.0
+Requires-Dist: textual-textarea==0.17.2
+Requires-Dist: textual==6.4.0
 Requires-Dist: tomlkit<0.14.0,>=0.12.5
-Requires-Dist: tree-sitter-sql==0.3.7
-Requires-Dist: tree-sitter<0.25.0,>=0.23.0
 Provides-Extra: adbc
 Requires-Dist: harlequin-adbc; extra == 'adbc'
 Provides-Extra: bigquery

{harlequin-2.2.1 → harlequin-2.3.0}/pyproject.toml

@@ -1,20 +1,20 @@
 [project]
 
 name = "harlequin"
-version = "2.2.1"
-requires-python = ">=3.9,<3.14"
+version = "2.3.0"
+requires-python = ">=3.10,<3.14"
 description = "The SQL IDE for Your Terminal."
 authors = [
     { name = "Ted Conbeer", email = "tconbeer@users.noreply.github.com" }
 ]
 license = "MIT"
 readme = "README.md"
-keywords = ["sql", "tui", "ide", "harlequin"]
+keywords = ["sql", "tui", "ide", "textual", "harlequin"]
 dependencies = [
     # textual and component libraries
-    "textual==0.89.1",
-    "textual-fastdatatable==0.12.0",
-    "textual-textarea==0.15.0",
+    "textual==6.4.0",
+    "textual-fastdatatable==0.13.0",
+    "textual-textarea==0.17.2",
 
     # click
     "click==8.1.8",
@@ -26,20 +26,6 @@ dependencies = [
     "platformdirs>=3.10,<5.0",
     "tomlkit>=0.12.5,<0.14.0",
     "questionary==2.0.1",
-
-    # tree-sitter-sql 0.3.8 seems incompatible with tree-sitter 0.24.0
-    "tree-sitter-sql==0.3.7",
-    "tree-sitter>=0.23.0,<0.25.0",
-
-    # backports
-    "importlib_metadata>=8.0; python_version < '3.10'",
-
-    # wheel pins: these packages don't build wheels for all Pythons
-
-    "numpy>=2.0.0,<2.1.0; python_version < '3.10'",
-    "numpy>=2.1.0,<2.3.0; python_version >= '3.10'",
-
-    "pyarrow>=18.1.0; python_version >= '3.12'",
 ]
 
 
@@ -60,14 +46,14 @@ nebulagraph = ["harlequin-nebulagraph"]
 [dependency-groups]
 dev = [
     "pre-commit>=3.3,<4",
-    "textual-dev==1.0.1; python_version < '3.12'",
+    "textual-dev==1.8.0",
     "harlequin-postgres>=1.1.1,<2",
     "harlequin-mysql>=1,<2",
     "pyinstrument>=5,<6",
 ]
 static = [
-    "ruff>=0.6,<0.10",
-    "mypy>=1.11.0,<2",
+    "ruff>=0.14.1",
+    "mypy==1.18.2,<2",
     "pandas-stubs>=2,<3",
     "boto3-stubs>=1.34.23,<2",
 ]
@@ -75,12 +61,20 @@ test = [
     "pytest>=7.3.1,<9.0.0",
     "pytest-asyncio==0.21.0",
     "pytest-textual-snapshot @ https://github.com/tconbeer/pytest-textual-snapshot.git#main",
+    "boto3==1.34.22",
     # extension tests require consistent version of duckdb.
     "duckdb==1.1.1",
     "flaky>=3.8.1",
 ]
 
 
+# For development of related libraries
+# [tool.uv.sources]
+
+# textual-fastdatatable = { path = "../textual-fastdatatable" }
+# textual-textarea = { path = "../textual-textarea" }
+
+
 [project.urls]
 
 Homepage = "https://harlequin.sh"
@@ -134,7 +128,7 @@ only-include = [
 
 [tool.ruff]
 
-target-version = "py39"
+target-version = "py310"
 
 
 [tool.ruff.lint]
@@ -144,7 +138,7 @@ select = ["A", "B", "E", "F", "I"]
 
 [tool.mypy]
 
-python_version = "3.9"
+python_version = "3.10"
 files = [
     "src/**/*.py",
     "tests/**/*.py",
@@ -180,4 +174,5 @@ strict_equality = true
 markers = [
     "online: requeries internet connection (deselect with '-m \"not online\"')",
     "use_cache: override the autouse fixture the disables the buffer cache",
+    "py12: Only run on Python 3.12 or higher",
 ]

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin/app.py

@@ -326,12 +326,14 @@ class Harlequin(AppBase):
     @on(Button.Pressed, "#run_query")
     def submit_query_from_run_query_bar(self, message: Button.Pressed) -> None:
         message.stop()
-        self.post_message(
-            QuerySubmitted(
-                queries=self._get_selected_queries(),
-                limit=self.run_query_bar.limit_value,
+        queries = self._get_selected_queries()
+        if queries:
+            self.post_message(
+                QuerySubmitted(
+                    queries=queries,
+                    limit=self.run_query_bar.limit_value,
+                )
             )
-        )
 
     @on(Button.Pressed, "#cancel_query")
     def cancel_query(self, message: Button.Pressed) -> None:
@@ -374,12 +376,14 @@ class Harlequin(AppBase):
     @on(CodeEditor.Submitted)
     def submit_query_from_editor(self, message: CodeEditor.Submitted) -> None:
         message.stop()
-        self.post_message(
-            QuerySubmitted(
-                queries=self._get_selected_queries(),
-                limit=self.run_query_bar.limit_value,
+        queries = self._get_selected_queries()
+        if queries:
+            self.post_message(
+                QuerySubmitted(
+                    queries=queries,
+                    limit=self.run_query_bar.limit_value,
+                )
             )
-        )
 
     @on(DatabaseConnected)
     def initialize_app(self, message: DatabaseConnected) -> None:
@@ -494,12 +498,14 @@ class Harlequin(AppBase):
                 self.set_timer(delay=0.1, callback=callback)
                 return
         self.editor.focus()
+        self._sync_run_button_disabled()
+        self._sync_run_button_text()
+
+    def on_text_area_changed(self) -> None:
+        self._sync_run_button_disabled()
 
     def on_text_area_selection_changed(self) -> None:
-        if self._validate_selection():
-            self.run_query_bar.run_button.label = "Run Selection"
-        else:
-            self.run_query_bar.run_button.label = "Run Query"
+        self._sync_run_button_text()
 
     @on(Input.Changed, "#limit_input")
     def update_limit_tooltip(self, message: Input.Changed) -> None:
@@ -522,12 +528,14 @@ class Harlequin(AppBase):
             and message.validation_result
             and message.validation_result.is_valid
         ):
-            self.post_message(
-                QuerySubmitted(
-                    queries=self._get_selected_queries(),
-                    limit=self.run_query_bar.limit_value,
+            queries = self._get_selected_queries()
+            if queries:
+                self.post_message(
+                    QuerySubmitted(
+                        queries=queries,
+                        limit=self.run_query_bar.limit_value,
+                    )
                 )
-            )
 
     @on(DataTable.SelectionCopied)
     def copy_data_to_clipboard(self, message: DataTable.SelectionCopied) -> None:
@@ -1024,6 +1032,21 @@ class Harlequin(AppBase):
         self.data_catalog.update_file_tree()
         self.data_catalog.update_s3_tree()
 
+    def _sync_run_button_text(self) -> None:
+        if self._validate_selection():
+            self.run_query_bar.run_button.label = "Run Selection"
+        else:
+            self.run_query_bar.run_button.label = "Run Query"
+
+    def _sync_run_button_disabled(self) -> None:
+        if self.editor is None or self.editor.text_input is None:
+            return
+
+        if self.editor.text.strip():
+            self.run_query_bar.run_button.disabled = False
+        else:
+            self.run_query_bar.run_button.disabled = True
+
     @work(
         thread=True,
         exclusive=True,

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin/app.tcss

@@ -7,6 +7,7 @@ $border-title-color-focus: $primary;
 /* ALL WIDGETS */
 DataCatalog,
 EditorCollection,
+FooterContainer > Input,
 ResultsViewer,
 Lazy {
     border: round $border-color-nofocus;
@@ -20,6 +21,7 @@ LoadingIndicator {
 
 DataCatalog:focus-within,
 EditorCollection:focus-within,
+FooterContainer > Input:focus,
 ResultsViewer:focus-within,
 HistoryScreen TextArea:focus,
 HistoryScreen OptionList:focus {
@@ -97,8 +99,7 @@ DataCatalog * .directory-tree--folder {
 }
 
 DataCatalog * .directory-tree--hidden {
-    text-style: italic;
-    color: $text-muted;
+    text-style: dim italic;
 }
 
 DataCatalog ContextMenu {
@@ -211,6 +212,9 @@ RunQueryBar Button#run_query {
     margin: 0 0 0 4;
     &:hover {
         background: $secondary;
+        &:disabled {
+            background: $primary;
+        }
     }
     &:focus {
         text-style: reverse;

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin/autocomplete/completers.py

@@ -140,7 +140,7 @@ class MemberCompleter(WordCompleter):
             match_context = context.strip("'`\"").lower()
             separators = SEPARATOR_PROG.findall(prefix)
         value_prefix = "".join(
-            f"{w}{sep}" for w, sep in zip([*others, context], separators)
+            f"{w}{sep}" for w, sep in zip([*others, context], separators, strict=False)
         )
 
         context_completions = [

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin/cli.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import sys
+from importlib.metadata import entry_points, version
 from pathlib import Path
 from typing import Any, Sequence
 
@@ -24,11 +25,6 @@ from harlequin.options import AbstractOption
 from harlequin.plugins import load_adapter_plugins
 from harlequin.windows_timezone import check_and_install_tzdata
 
-if sys.version_info < (3, 10):
-    from importlib_metadata import entry_points, version
-else:
-    from importlib.metadata import entry_points, version
-
 # configure defaults
 DEFAULT_ADAPTER = "duckdb"
 DEFAULT_LIMIT = 100_000
@@ -106,7 +102,9 @@ def _version_option() -> str:
     adapter_eps = entry_points(group="harlequin.adapter")
     adapter_versions: dict[str, str] = {}
     for ep in adapter_eps:
-        adapter_versions.update({ep.name: ep.dist.version})
+        adapter_versions.update(
+            {ep.name: ep.dist.version if ep.dist is not None else "unknown"}
+        )
 
     adapter_output = "\n".join(
         [f"  - {name}, version {version}" for name, version in adapter_versions.items()]

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin/components/code_editor.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 from typing import List, Union
 
-from rich.text import TextType
 from sqlfmt.api import Mode, format_string
 from sqlfmt.exception import SqlfmtError
-from textual.css.query import NoMatches
+from textual.content import ContentType
+from textual.css.query import InvalidQueryFormat, NoMatches
 from textual.message import Message
 from textual.reactive import reactive
 from textual.widgets import ContentSwitcher, TabbedContent, TabPane, Tabs
@@ -38,18 +38,23 @@ class CodeEditor(TextEditor, inherit_bindings=False):
         Returns the list of queries that intersect
         with the current selection.
         """
-        if self.text_input is None:
+        if self.text_input is None or not self.text.strip():
             return []
 
-        semicolons = self._query_semicolons()
+        if ";" not in self.text:
+            return [self.text]
 
-        if not semicolons:
+        separators = self._query_separators()
+        if not separators:
+            # a semicolon could be in a string literal,
+            # so there may not be query separators even if
+            # there are literal semicolons in the text.
             return [self.text]
 
         queries: list[str] = []
         prev_query: str | None = None
         query_start = (0, 0)
-        for query_end in [*semicolons, self.text_input.document.end]:
+        for query_end in [*separators, self.text_input.document.end]:
             if query_start > self.selection.end:
                 break
             q = self.text_input.get_text_range(start=query_start, end=query_end).strip()
@@ -116,7 +121,11 @@ class CodeEditor(TextEditor, inherit_bindings=False):
         if hasattr(self.app, "action_focus_data_catalog"):
             self.app.action_focus_data_catalog()
 
-    def _query_semicolons(self) -> list[tuple[int, int]]:
+    def _query_separators(self) -> list[tuple[int, int]]:
+        """
+        Return a list of tuples that represent the row and col
+        positions of query separators (semicolons) in the buffer text.
+        """
         if self.text_input is None:
             return []
 
@@ -124,6 +133,7 @@ class CodeEditor(TextEditor, inherit_bindings=False):
             assert self._semicolon_query is not None
             query_result = self.query_syntax_tree(query=self._semicolon_query)
             return [n.end_point for n in query_result.get("semicolon", [])]
+
         else:
             # tree-sitter is not installed. naively split on semicolons and
             # show a warning.
@@ -138,10 +148,12 @@ class CodeEditor(TextEditor, inherit_bindings=False):
                     timeout=10,
                 )
                 self.has_shown_tree_sitter_error = True
+
             semicolons: list[tuple[int, int]] = []
             for i, line in enumerate(self.text.splitlines()):
                 for pos in [m.span()[1] for m in re.finditer(";", line)]:
                     semicolons.append((i, pos))
+
             return semicolons
 
 
@@ -156,7 +168,7 @@ class EditorCollection(TabbedContent):
 
     def __init__(
         self,
-        *titles: TextType,
+        *titles: ContentType,
         initial: str = "",
         name: Union[str, None] = None,
         id: Union[str, None] = None,  # noqa: A002
@@ -188,7 +200,7 @@ class EditorCollection(TabbedContent):
             try:
                 tab_pane = content.query_one(f"#{active_tab_id}", TabPane)
                 return tab_pane.query_one(CodeEditor)
-            except NoMatches:
+            except (NoMatches, InvalidQueryFormat):
                 pass
         all_editors = content.query(CodeEditor)
         return all_editors.first(CodeEditor)
@@ -310,7 +322,7 @@ class EditorCollection(TabbedContent):
         tabs = self.query(TabPane)
         next_tabs = tabs[1:]
         next_tabs.append(tabs[0])
-        lookup = {t.id: nt.id for t, nt in zip(tabs, next_tabs)}
+        lookup = {t.id: nt.id for t, nt in zip(tabs, next_tabs, strict=False)}
         self.active = lookup[active]  # type: ignore
         self.post_message(self.EditorSwitched(active_editor=None))
         self.current_editor.focus()

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin/components/data_catalog/__init__.py

@@ -4,9 +4,9 @@ from pathlib import Path
 from typing import TYPE_CHECKING, ClassVar, Sequence
 
 from rich.markup import escape
-from rich.text import TextType
 from textual import on
-from textual.css.query import NoMatches
+from textual.content import ContentType
+from textual.css.query import InvalidQueryFormat, NoMatches
 from textual.message import Message
 from textual.widgets import (
     DirectoryTree,
@@ -108,7 +108,7 @@ class DataCatalog(TabbedContent, can_focus=True):
 
     def __init__(
         self,
-        *titles: TextType,
+        *titles: ContentType,
         initial: str = "",
         name: str | None = None,
         id: str | None = None,  # noqa: A002
@@ -150,7 +150,7 @@ class DataCatalog(TabbedContent, can_focus=True):
                     error=Exception(
                         "Could not load s3 catalog because boto3 is not available.\n\n"
                         "Re-install harlequin with the s3 extra, like this:\n"
-                        "pip install harlequin[s3]"
+                        "uv tool install harlequin[s3]"
                     ),
                 )
             )
@@ -166,7 +166,7 @@ class DataCatalog(TabbedContent, can_focus=True):
     def on_focus(self) -> None:
         try:
             active_widget = self.query_one(f"#{self.active}").children[0]
-        except NoMatches:
+        except (NoMatches, InvalidQueryFormat):
             self.database_tree.focus()
         else:
             active_widget.focus()

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin/components/data_catalog/database_tree.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from asyncio import PriorityQueue
 from contextlib import suppress
-from pathlib import Path
 from typing import TYPE_CHECKING, Generator, Iterable, TypeVar
 
 from rich.style import Style
@@ -77,7 +76,7 @@ class DatabaseTree(HarlequinTree[CatalogItem], inherit_bindings=False):
     async def watch_catalog(self, catalog: Catalog | None) -> None:
         """Watch for changes to the `catalog` of the database tree.
 
-        If the Catalog is changed the directory tree will be repopulated using
+        If the Catalog is changed the database tree will be repopulated using
         the new value as the root.
         """
         assert isinstance(self.root.data, CatalogItem)
@@ -91,18 +90,12 @@ class DatabaseTree(HarlequinTree[CatalogItem], inherit_bindings=False):
 
     def _add_to_load_queue(
         self, node: TreeNode[InteractiveCatalogItem], priority: int = 100
-    ) -> AwaitComplete:
+    ) -> None:
         """Add the given node to the load priority queue.
 
-        The return value can optionally be awaited until the queue is empty.
-
         Args:
             node: The node to add to the load queue.
             priority: An order for this node to be loaded; lowest first.
-
-        Returns:
-            An optionally awaitable object that can be awaited until the
-                load queue has finished processing.
         """
         assert node.data is not None
         if not node.data.loaded:
@@ -111,8 +104,6 @@ class DatabaseTree(HarlequinTree[CatalogItem], inherit_bindings=False):
                 # since TreeNodes do not implement cmp operators.
                 self._load_queue.put_nowait((priority, str(node.label), id(node), node))
 
-        return AwaitComplete(self._load_queue.join())
-
     def reload(self) -> AwaitComplete:
         """Reload the `DirectoryTree` contents.
 
@@ -322,7 +313,7 @@ class DatabaseTree(HarlequinTree[CatalogItem], inherit_bindings=False):
             # Get the next node that needs loading off the queue. Note that
             # this blocks if the queue is empty.
             *_, node = await self._load_queue.get()
-            content: list[Path] = []
+            content: list[CatalogItem] = []
             async with self.lock:
                 try:
                     # Spin up a short-lived thread that will load the content of
@@ -354,7 +345,7 @@ class DatabaseTree(HarlequinTree[CatalogItem], inherit_bindings=False):
             return
         if isinstance(node.data, InteractiveCatalogItem) and not node.data.loaded:
             # if this node isn't loaded yet, add it to the front of the queue
-            await self._add_to_load_queue(node, priority=0)  # type: ignore[arg-type]
+            self._add_to_load_queue(node, priority=0)  # type: ignore[arg-type]
         if (
             isinstance(node.data, CatalogItem)
             and node.data.children

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin/components/debug_info.py

@@ -293,7 +293,7 @@ class DebugInfoScreen(ModalScreen):
         self.set_focus(focusables[next_idx])
 
     def on_key(self, event: events.Key) -> None:
-        if event.key in ("escape", "esc"):
+        if event.key == "escape":
             self.app.pop_screen()
             event.stop()
         elif event.key == "pageup":

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin/components/error_modal.py

@@ -13,7 +13,7 @@ class ClickableStatic(Static):
     def on_click(self, message: events.Click) -> None:
         message.stop()
         try:
-            pyperclip.copy(str(self.renderable))
+            pyperclip.copy(str(self.content))
         except pyperclip.PyperclipException:
             pass
         else:

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin/keys_app.py

@@ -522,7 +522,7 @@ class HarlequinKeys(AppBase):
         modified_bindings = [
             new_binding
             for new_binding, old_binding in zip(
-                self.bindings.values(), self.unmodifed_bindings.values()
+                self.bindings.values(), self.unmodifed_bindings.values(), strict=False
             )
             if new_binding != old_binding
         ]

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin/plugins.py

@@ -1,17 +1,12 @@
 from __future__ import annotations
 
-import sys
+from importlib.metadata import entry_points
 from typing import Literal, Sequence, overload
 
 from harlequin.adapter import HarlequinAdapter
 from harlequin.exception import HarlequinConfigError
 from harlequin.keymap import HarlequinKeyMap
 
-if sys.version_info < (3, 10):
-    from importlib_metadata import entry_points
-else:
-    from importlib.metadata import entry_points
-
 
 def load_adapter_plugins() -> dict[str, type[HarlequinAdapter]]:
     return _load_plugins(group="harlequin.adapter")

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin_duckdb/adapter.py

@@ -35,6 +35,7 @@ class DuckDbCursor(HarlequinCursor):
             zip(
                 self.relation.columns,
                 map(self.conn._short_column_type, self.relation.dtypes),
+                strict=False,
             )
         )
 

{harlequin-2.2.1 → harlequin-2.3.0}/src/harlequin_sqlite/adapter.py

@@ -374,7 +374,7 @@ class HarlequinSqliteAdapter(HarlequinAdapter):
         if hasattr(conn, "autocommit"):
             conn.autocommit = True
 
-        for uri, name in zip(other_dbs, db_names[1:]):
+        for uri, name in zip(other_dbs, db_names[1:], strict=False):
             try:
                 conn.execute(f"attach database '{uri}' as {name}")
             except sqlite3.Error as e: