Flat formatting of the df_markdown #20

magic_duckdb/duckdb_mode.py

@@ -4,7 +4,6 @@
 import json
 from magic_duckdb.extras.explain_analyze_graphviz import draw_graphviz
 from magic_duckdb.extras.ast_graphviz import ast_draw_graphviz, ast_tree
-from IPython.display import Markdown
 
 
 def execute_db(
@@ -139,14 +138,14 @@ def execute(
                 raise ValueError(f"Error executing {query_string} in DuckDB") from e
 
             if r is None or ("relation" == export_function):
-                return r, None
+                return r
             else:
                 if export_function == "df_markdown":
                     md = r.df().to_markdown(index=False)
-                    return md, Markdown(md)
+                    return md
 
                 else:
                     export_function = export_function
                     f = getattr(r, export_function)
 
-                    return f(**export_kwargs), None
+                    return f(**export_kwargs)

magic_duckdb/magic.py

@@ -236,7 +236,7 @@ def execute(self, line: str = "", cell: str = "", local_ns=None):
             if args.tables:
                 return thisconnection.get_table_names(query)
 
-            o, display_o = dbwrapper.execute(
+            o = dbwrapper.execute(
                 query_string=query,
                 connection=thisconnection,
                 export_function=args.type[0]
@@ -249,10 +249,8 @@ def execute(self, line: str = "", cell: str = "", local_ns=None):
             if args.output:
                 user_ns[args.output[0]] = o
 
-            if display_o is not None:
-                return display_o
-            else:
-                return o
+
+            return o
 
         except ConnectionException as e:
             logger.exception(

notebooks/format_examples.ipynb

@@ -67,7 +67,8 @@
     "# df_markdown in a line magic\n",
     "\n",
     "a = %dql -t df_markdown select 'asdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasd', 'asdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasd', 'asdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasd', null as nullvalue, * from range(10)\n",
-    "a.data"
+    "\n",
+    "a"
    ]
   }
  ],