Update sql

snejus · Jun 16, 2024 · a1fac07 · a1fac07
1 parent 178cbbc
commit a1fac07
Show file tree

Hide file tree

Showing 5 changed files with 374 additions and 451 deletions.
diff --git a/rich_tables/fields.py b/rich_tables/fields.py
@@ -11,7 +11,6 @@
 from typing import TYPE_CHECKING, Any, Callable, Iterable, MutableMapping
 
 from rich.bar import Bar
-from rich.syntax import Syntax
 from rich.text import Text
 
 from .utils import (
@@ -33,6 +32,7 @@
     progress_bar,
     simple_panel,
     split_with_color,
+    sql_syntax,
     syntax,
     timestamp2timestr,
     wrap,
@@ -213,6 +213,7 @@ def counts_table(data: list[JSONDict]) -> Table:
     diffHunk=lambda x: syntax(x, "diff"),
     snippet=lambda x: border_panel(syntax(x, "python", indent_guides=True)),
     query=lambda x: Text(x, style="bold"),
+    sql=lambda x: border_panel(sql_syntax(x)),
 )
 fields_by_func: dict[Callable[..., RenderableType], Iterable[str]] = {
     format_with_color: (
@@ -298,29 +299,6 @@ def counts_table(data: list[JSONDict]) -> Table:
     for field in fields:
         FIELDS_MAP[field] = func
 
-try:
-    import sqlparse
-except ModuleNotFoundError:
-    pass
-else:
-    FIELDS_MAP["sql"] = lambda x: border_panel(
-        Syntax(
-            sqlparse.format(
-                x,
-                indent_columns=False,
-                strip_whitespace=True,
-                strip_comments=True,
-                reindent=True,
-                reindent_aligned=False,
-            ),
-            "sql",
-            theme="material",
-            background_color="#000000",
-            word_wrap=True,
-        )
-    )
-
-
 DISPLAY_HEADER: dict[str, str] = {
     "track": "#",
     "bpm": "🚀",

diff --git a/rich_tables/utils.py b/rich_tables/utils.py
@@ -25,6 +25,7 @@
 )
 
 import platformdirs
+import sqlparse
 from multimethod import multimethod
 from rich import box
 from rich.align import Align
@@ -388,6 +389,23 @@ def syntax(*args: Any, **kwargs: Any) -> Syntax:
     return Syntax(*args, **{**default, **kwargs})
 
 
+def sql_syntax(sql_string: str) -> Syntax:
+    return Syntax(
+        sqlparse.format(
+            sql_string,
+            indent_columns=True,
+            strip_whitespace=True,
+            strip_comments=True,
+            reindent=True,
+            reindent_aligned=False,
+        ),
+        "sql",
+        theme="gruvbox-dark",
+        background_color="black",
+        word_wrap=True,
+    )
+
+
 @multimethod
 def diff(before: str, after: str) -> Any:
     return make_difftext(before, after)