PyPI - execsql2 - Versions diffs - 2.1.2__py3-none-any.whl → 2.2.1__py3-none-any.whl - Mend

execsql2 2.1.2py3-none-any.whl → 2.2.1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (75) hide show

execsql/cli/__init__.py +436 -0
execsql/cli/dsn.py +86 -0
execsql/cli/help.py +140 -0
execsql/{cli.py → cli/run.py} +14 -589
execsql/config.py +13 -1
execsql/db/access.py +16 -12
execsql/db/base.py +158 -90
execsql/db/dsn.py +6 -5
execsql/db/duckdb.py +2 -2
execsql/db/firebird.py +23 -19
execsql/db/mysql.py +8 -7
execsql/db/oracle.py +11 -11
execsql/db/postgres.py +28 -16
execsql/db/sqlite.py +12 -11
execsql/db/sqlserver.py +5 -3
execsql/exceptions.py +7 -7
execsql/exporters/base.py +6 -1
execsql/exporters/delimited.py +44 -35
execsql/exporters/duckdb.py +2 -2
execsql/exporters/feather.py +6 -6
execsql/exporters/html.py +83 -69
execsql/exporters/json.py +50 -42
execsql/exporters/latex.py +33 -27
execsql/exporters/ods.py +4 -4
execsql/exporters/parquet.py +2 -2
execsql/exporters/pretty.py +11 -9
execsql/exporters/raw.py +17 -13
execsql/exporters/sqlite.py +2 -2
execsql/exporters/templates.py +23 -15
execsql/exporters/values.py +22 -20
execsql/exporters/xls.py +4 -4
execsql/exporters/xml.py +28 -13
execsql/importers/base.py +4 -4
execsql/importers/csv.py +6 -6
execsql/importers/feather.py +4 -4
execsql/importers/ods.py +4 -4
execsql/importers/xls.py +4 -4
execsql/metacommands/__init__.py +518 -67
execsql/metacommands/conditions.py +101 -27
execsql/metacommands/control.py +8 -4
execsql/metacommands/data.py +6 -6
execsql/metacommands/debug.py +6 -2
execsql/metacommands/io.py +67 -1310
execsql/metacommands/io_export.py +442 -0
execsql/metacommands/io_fileops.py +287 -0
execsql/metacommands/io_import.py +398 -0
execsql/metacommands/io_write.py +248 -0
execsql/metacommands/prompt.py +22 -66
execsql/metacommands/system.py +7 -2
execsql/py.typed +0 -0
execsql/script.py +49 -5
execsql/types.py +20 -20
execsql/utils/fileio.py +15 -8
{execsql2-2.1.2.dist-info → execsql2-2.2.1.dist-info}/METADATA +6 -6
execsql2-2.2.1.dist-info/RECORD +104 -0
execsql2-2.1.2.dist-info/RECORD +0 -96
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/READ_ME.rst +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/config_settings.sqlite +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/example_config_prompt.sql +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/execsql.conf +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/make_config_db.sql +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/md_compare.sql +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/md_glossary.sql +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/md_upsert.sql +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/pg_compare.sql +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/pg_glossary.sql +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/pg_upsert.sql +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/script_template.sql +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/ss_compare.sql +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/ss_glossary.sql +0 -0
{execsql2-2.1.2.data → execsql2-2.2.1.data}/data/execsql2_extras/ss_upsert.sql +0 -0
{execsql2-2.1.2.dist-info → execsql2-2.2.1.dist-info}/WHEEL +0 -0
{execsql2-2.1.2.dist-info → execsql2-2.2.1.dist-info}/entry_points.txt +0 -0
{execsql2-2.1.2.dist-info → execsql2-2.2.1.dist-info}/licenses/LICENSE.txt +0 -0
{execsql2-2.1.2.dist-info → execsql2-2.2.1.dist-info}/licenses/NOTICE +0 -0

execsql/exporters/html.py CHANGED Viewed

@@ -11,6 +11,7 @@ CSS styling.
 import datetime
 import getpass
+import html as html_mod
 import os
 import sys
 import tempfile
@@ -42,12 +43,12 @@ def export_html(
             f.write(f"<caption>{desc}</caption>\n")
         f.write("<thead><tr>")
         for h in hdrs:
-            f.write(f"<th>{h}</th>")
+            f.write(f"<th>{html_mod.escape(str(h))}</th>")
         f.write("</tr></thead>\n<tbody>\n")
         for r in rows:
             f.write("<tr>")
             for v in r:
-                f.write(f"<td>{v if v else ''}</td>")
+                f.write(f"<td>{html_mod.escape(str(v)) if v else ''}</td>")
             f.write("</tr>\n")
         f.write("</tbody>\n</table>\n")
@@ -67,42 +68,47 @@ def export_html(
                 f = ef.open("wt")
         else:
             f = ZipWriter(zipfile, outfile, append)
-        f.write('<!DOCTYPE html>\n<html>\n<head>\n<meta charset="utf-8" />\n')
-        if querytext:
-            descrip = f"Source: [{querytext}] with database {_state.dbs.current().name()} in script {str(Path(script).resolve())}, line {lno}"
-        else:
-            descrip = f"From database {_state.dbs.current().name()} in script {str(Path(script).resolve())}, line {lno}"
-        f.write(f'<meta name="description" content="{descrip}" />\n')
-        datecontent = datetime.datetime.now().strftime("%Y-%m-%d")
-        f.write(f'<meta name="created" content="{datecontent}" />\n')
-        f.write(f'<meta name="revised" content="{datecontent}" />\n')
-        f.write(f'<meta name="author" content="{getpass.getuser()}" />\n')
-        f.write("<title>Data Table</title>\n")
-        if conf.css_file or conf.css_styles:
-            if conf.css_file:
-                f.write(f'<link rel="stylesheet" type="text/css" href="{conf.css_file}">')
-            if conf.css_styles:
-                f.write(f'<style type="text/css">\n{conf.css_styles}\n</style>')
-        else:
-            f.write('<style type="text/css">\n')
-            f.write(
-                'table {font-family: "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Lucida Console", "Courier New", Courier, fixed; '
-                + "border-top: 3px solid #814324; border-bottom: 3px solid #814324; "
-                + "border-left: 2px solid #814324; border-right: 2px solid #814324; "
-                + "border-collapse: collapse; }\n",
-            )
-            f.write("td {text-align: left; padding 0 10px; border-right: 1px dotted #814324; }\n")
-            f.write(
-                "th {padding: 2px 10px; text-align: center; border-bottom: 1px solid #814324; border-right: 1px dotted #814324;}\n",
-            )
-            f.write("tr.hdr {font-weight: bold;}\n")
-            f.write("thead tr {border-bottom: 1px solid #814324; background-color: #F3F1E2; }\n")
-            f.write("tbody tr { border-bottom: 1px dotted #814324; }\n")
-            f.write("</style>")
-        f.write("\n</head>\n<body>\n")
-        write_table(f)
-        f.write("</body>\n</html>\n")
-        f.close()
+        try:
+            f.write('<!DOCTYPE html>\n<html>\n<head>\n<meta charset="utf-8" />\n')
+            if querytext:
+                descrip = f"Source: [{querytext}] with database {_state.dbs.current().name()} in script {str(Path(script).resolve())}, line {lno}"
+            else:
+                descrip = (
+                    f"From database {_state.dbs.current().name()} in script {str(Path(script).resolve())}, line {lno}"
+                )
+            f.write(f'<meta name="description" content="{descrip}" />\n')
+            datecontent = datetime.datetime.now().strftime("%Y-%m-%d")
+            f.write(f'<meta name="created" content="{datecontent}" />\n')
+            f.write(f'<meta name="revised" content="{datecontent}" />\n')
+            f.write(f'<meta name="author" content="{getpass.getuser()}" />\n')
+            f.write("<title>Data Table</title>\n")
+            if conf.css_file or conf.css_styles:
+                if conf.css_file:
+                    f.write(f'<link rel="stylesheet" type="text/css" href="{conf.css_file}">')
+                if conf.css_styles:
+                    f.write(f'<style type="text/css">\n{conf.css_styles}\n</style>')
+            else:
+                f.write('<style type="text/css">\n')
+                f.write(
+                    'table {font-family: "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Lucida Console", "Courier New", Courier, fixed; '
+                    + "border-top: 3px solid #814324; border-bottom: 3px solid #814324; "
+                    + "border-left: 2px solid #814324; border-right: 2px solid #814324; "
+                    + "border-collapse: collapse; }\n",
+                )
+                f.write("td {text-align: left; padding 0 10px; border-right: 1px dotted #814324; }\n")
+                f.write(
+                    "th {padding: 2px 10px; text-align: center; border-bottom: 1px solid #814324; border-right: 1px dotted #814324;}\n",
+                )
+                f.write("tr.hdr {font-weight: bold;}\n")
+                f.write("thead tr {border-bottom: 1px solid #814324; background-color: #F3F1E2; }\n")
+                f.write("tbody tr { border-bottom: 1px dotted #814324; }\n")
+                f.write("</style>")
+            f.write("\n</head>\n<body>\n")
+            write_table(f)
+            f.write("</body>\n</html>\n")
+        finally:
+            if outfile.lower() != "stdout":
+                f.close()
     elif not zipfile and append:
         if outfile.lower() == "stdout":
             f = sys.stdout
@@ -112,8 +118,10 @@ def export_html(
             ef = EncodedFile(outfile, conf.output_encoding)
             f = ef.open("wt")
-            write_table(f)
-            f.close()
+            try:
+                write_table(f)
+            finally:
+                f.close()
         else:
             filewriter_close(outfile)
             from execsql.utils.fileio import EncodedFile
@@ -124,23 +132,25 @@ def export_html(
             os.close(tempf)  # Close the fd from mkstemp; EncodedFile opens its own handle
             tf = EncodedFile(tempfname, conf.output_encoding)
             t = tf.open("wt")
-            remainder = ""
-            for line in f:
-                bodypos = line.lower().find("</body>")
-                if bodypos > -1:
-                    t.write(line[0:bodypos])
-                    t.write("\n")
-                    remainder = line[bodypos:]
-                    break
-                else:
+            try:
+                remainder = ""
+                for line in f:
+                    bodypos = line.lower().find("</body>")
+                    if bodypos > -1:
+                        t.write(line[0:bodypos])
+                        t.write("\n")
+                        remainder = line[bodypos:]
+                        break
+                    else:
+                        t.write(line)
+                t.write("\n")
+                write_table(t)
+                t.write(remainder)
+                for line in f:
                     t.write(line)
-            t.write("\n")
-            write_table(t)
-            t.write(remainder)
-            for line in f:
-                t.write(line)
-            t.close()
-            f.close()
+            finally:
+                t.close()
+                f.close()
             os.unlink(outfile)
             os.rename(tempfname, outfile)
@@ -162,12 +172,12 @@ def export_cgi_html(
             f.write(f"<caption>{desc}</caption>\n")
         f.write("<thead><tr>")
         for h in hdrs:
-            f.write(f"<th>{h}</th>")
+            f.write(f"<th>{html_mod.escape(str(h))}</th>")
         f.write("</tr></thead>\n<tbody>\n")
         for r in rows:
             f.write("<tr>")
             for v in r:
-                f.write(f"<td>{v if v else ''}</td>")
+                f.write(f"<td>{html_mod.escape(str(v)) if v else ''}</td>")
             f.write("</tr>\n")
         f.write("</tbody>\n</table>\n")
@@ -184,10 +194,12 @@ def export_cgi_html(
                 f = ef.open("wt")
         else:
             f = ZipWriter(zipfile, outfile, append)
-        f.write("Content-Type: text/html\n\n")
-        write_table(f)
-        if outfile.lower() != "stdout":
-            f.close()
+        try:
+            f.write("Content-Type: text/html\n\n")
+            write_table(f)
+        finally:
+            if outfile.lower() != "stdout":
+                f.close()
     else:
         if outfile == "stdout":
             f = sys.stdout
@@ -196,9 +208,11 @@ def export_cgi_html(
             ef = EncodedFile(outfile, conf.output_encoding)
             f = ef.open("a")
-        write_table(f)
-        if outfile.lower() != "stdout":
-            f.close()
+        try:
+            write_table(f)
+        finally:
+            if outfile.lower() != "stdout":
+                f.close()
 def write_query_to_html(
@@ -213,8 +227,8 @@ def write_query_to_html(
         hdrs, rows = db.select_rowsource(select_stmt)
     except ErrInfo:
         raise
-    except Exception:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc())
+    except Exception as e:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
     export_html(outfile, hdrs, rows, append, select_stmt, desc, zipfile=zipfile)
@@ -230,6 +244,6 @@ def write_query_to_cgi_html(
         hdrs, rows = db.select_rowsource(select_stmt)
     except ErrInfo:
         raise
-    except Exception:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc())
+    except Exception as e:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
     export_cgi_html(outfile, hdrs, rows, append, select_stmt, desc, zipfile=zipfile)

execsql/exporters/json.py CHANGED Viewed

@@ -34,8 +34,8 @@ def write_query_to_json(
         hdrs, rows = db.select_rowsource(select_stmt)
     except ErrInfo:
         raise
-    except Exception:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc())
+    except Exception as e:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
     if zipfile is None:
         filewriter_close(outfile)
         from execsql.utils.fileio import EncodedFile
@@ -48,20 +48,22 @@ def write_query_to_json(
             f = ef.open("wt")
     else:
         f = ZipWriter(zipfile, outfile, append)
-    f.write("[")
-    uhdrs = [str(h) for h in hdrs]
-    first = True
-    for row in rows:
-        if first:
-            f.write("\n")
-        else:
-            f.write(",\n")
-        first = False
-        dictdata = dict(zip(uhdrs, [str(v) if isinstance(v, str) else v for v in row]))
-        jsondata = json.dumps(dictdata, separators=(",", ":"), default=str)
-        f.write(str(jsondata))
-    f.write("\n]\n")
-    f.close()
+    try:
+        f.write("[")
+        uhdrs = [str(h) for h in hdrs]
+        first = True
+        for row in rows:
+            if first:
+                f.write("\n")
+            else:
+                f.write(",\n")
+            first = False
+            dictdata = dict(zip(uhdrs, [str(v) if isinstance(v, str) else v for v in row]))
+            jsondata = json.dumps(dictdata, separators=(",", ":"), default=str)
+            f.write(str(jsondata))
+        f.write("\n]\n")
+    finally:
+        f.close()
 def write_query_to_json_ts(
@@ -73,13 +75,16 @@ def write_query_to_json_ts(
     desc: str | None = None,
     zipfile: str | None = None,
 ) -> None:
+    global json
+    import json
     conf = _state.conf
     try:
         hdrs, rows = db.select_rowsource(select_stmt)
     except ErrInfo:
         raise
-    except Exception:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc())
+    except Exception as e:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
     max_col_idx = len(hdrs) - 1
     if zipfile is None:
         filewriter_close(outfile)
@@ -93,27 +98,30 @@ def write_query_to_json_ts(
             f = ef.open("wt")
     else:
         f = ZipWriter(zipfile, outfile, append)
-    f.write("{\n")
-    if desc is not None:
-        f.write(f'  "description": "{desc}",\n')
-    f.write('  "fields": [\n')
-    if write_types:
-        # Scan the data to determine data types.
-        tbl_desc = DataTable(hdrs, rows)
-        # Write the column descriptions to the header.
-        # Iterate over hdrs instead of tbl_desc.cols to preserve column order.
-        for i, h in enumerate(hdrs):
-            qcomma = "," if i < max_col_idx else ""
-            c = [col for col in tbl_desc.cols if col.name == h][0]
-            f.write(
-                f'    {{\n      "name": "{c.name}",\n      "title": "{c.name.capitalize().replace("_", " ")}",\n      "type": "{_state.to_json_type[c.dt[1]]}"\n    }}{qcomma}\n',
-            )
-    else:
-        # Write the column descriptions to the header.
-        for i, h in enumerate(hdrs):
-            qcomma = "," if i < max_col_idx else ""
-            f.write(
-                f'    {{\n      "name": "{h}",\n      "title": "{h.capitalize().replace("_", " ")}"\n    }}{qcomma}\n',
-            )
-    f.write("  ]\n}\n")
-    f.close()
+    try:
+        f.write("{\n")
+        if desc is not None:
+            escaped_desc = json.dumps(desc)
+            f.write(f'  "description": {escaped_desc},\n')
+        f.write('  "fields": [\n')
+        if write_types:
+            # Scan the data to determine data types.
+            tbl_desc = DataTable(hdrs, rows)
+            # Write the column descriptions to the header.
+            # Iterate over hdrs instead of tbl_desc.cols to preserve column order.
+            for i, h in enumerate(hdrs):
+                qcomma = "," if i < max_col_idx else ""
+                c = [col for col in tbl_desc.cols if col.name == h][0]
+                f.write(
+                    f'    {{\n      "name": "{c.name}",\n      "title": "{c.name.capitalize().replace("_", " ")}",\n      "type": "{_state.to_json_type[c.dt[1]]}"\n    }}{qcomma}\n',
+                )
+        else:
+            # Write the column descriptions to the header.
+            for i, h in enumerate(hdrs):
+                qcomma = "," if i < max_col_idx else ""
+                f.write(
+                    f'    {{\n      "name": "{h}",\n      "title": "{h.capitalize().replace("_", " ")}"\n    }}{qcomma}\n',
+                )
+        f.write("  ]\n}\n")
+    finally:
+        f.close()

execsql/exporters/latex.py CHANGED Viewed

@@ -60,12 +60,14 @@ def export_latex(
                 f = ef.open("wt")
             else:
                 f = WriteableZipfile(zipfile).open(outfile, append)
-        f.write("\\documentclass{article}\n")
-        f.write("\\begin{document}\n")
-        write_table(f)
-        f.write("\\end{document}\n")
-        if outfile.lower() != "stdout":
-            f.close()
+        try:
+            f.write("\\documentclass{article}\n")
+            f.write("\\begin{document}\n")
+            write_table(f)
+            f.write("\\end{document}\n")
+        finally:
+            if outfile.lower() != "stdout":
+                f.close()
     else:
         if outfile.lower() == "stdout" or not Path(outfile).is_file():
             if outfile.lower() == "stdout":
@@ -75,9 +77,11 @@ def export_latex(
             else:
                 ef = EncodedFile(outfile, conf.output_encoding)
                 f = ef.open("wt")
-            write_table(f)
-            if outfile.lower() != "stdout":
-                f.close()
+            try:
+                write_table(f)
+            finally:
+                if outfile.lower() != "stdout":
+                    f.close()
         else:
             ef = EncodedFile(outfile, conf.output_encoding)
             f = ef.open("rt")
@@ -85,23 +89,25 @@ def export_latex(
             os.close(tempf)  # Close the fd from mkstemp; EncodedFile opens its own handle
             tf = EncodedFile(tempfname, conf.output_encoding)
             t = tf.open("wt")
-            remainder = ""
-            for line in f:
-                bodypos = line.lower().find("\\end{document}")
-                if bodypos > -1:
-                    t.write(line[0:bodypos])
-                    t.write("\n")
-                    remainder = line[bodypos:]
-                    break
-                else:
+            try:
+                remainder = ""
+                for line in f:
+                    bodypos = line.lower().find("\\end{document}")
+                    if bodypos > -1:
+                        t.write(line[0:bodypos])
+                        t.write("\n")
+                        remainder = line[bodypos:]
+                        break
+                    else:
+                        t.write(line)
+                t.write("\n")
+                write_table(t)
+                t.write(remainder)
+                for line in f:
                     t.write(line)
-            t.write("\n")
-            write_table(t)
-            t.write(remainder)
-            for line in f:
-                t.write(line)
-            t.close()
-            f.close()
+            finally:
+                t.close()
+                f.close()
             os.unlink(outfile)
             os.rename(tempfname, outfile)
@@ -120,6 +126,6 @@ def write_query_to_latex(
         hdrs, rows = db.select_rowsource(select_stmt)
     except ErrInfo:
         raise
-    except Exception:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc())
+    except Exception as e:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
     export_latex(outfile, hdrs, rows, append, select_stmt, desc, zipfile=zipfile)

execsql/exporters/ods.py CHANGED Viewed

@@ -342,8 +342,8 @@ def write_query_to_ods(
         hdrs, rows = db.select_rowsource(select_stmt)
     except ErrInfo:
         raise
-    except Exception:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc())
+    except Exception as e:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
     export_ods(outfile, hdrs, rows, append, select_stmt, sheetname, desc)
@@ -403,8 +403,8 @@ def write_queries_to_ods(
             hdrs, rows = db.select_rowsource(select_stmt)
         except ErrInfo:
             raise
-        except Exception:
-            raise ErrInfo("db", select_stmt, exception_msg=exception_desc())
+        except Exception as e:
+            raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
         # Add the data to a new sheet.
         tbl = wbk.new_sheet(sheet_name)
         wbk.add_row_to_sheet(hdrs, tbl, header=True)

execsql/exporters/parquet.py CHANGED Viewed

@@ -17,12 +17,12 @@ from execsql.utils.fileio import filewriter_close
 def write_query_to_parquet(outfile: str, headers: list[str], rows: Any) -> None:
     try:
         import polars as pl
-    except ImportError:
+    except ImportError as e:
         raise ErrInfo(
             "exception",
             exception_msg=exception_desc(),
             other_msg="The polars Python package must be installed to export data to the parquet format.",
-        )
+        ) from e
     rows_list = list(rows)
     if rows_list:
         df = pl.DataFrame(rows_list, schema=headers, orient="row")

execsql/exporters/pretty.py CHANGED Viewed

@@ -43,12 +43,12 @@ def prettyprint_rowset(
     if not isinstance(rows, list):
         try:
             rows = list(rows)
-        except Exception:
+        except Exception as e:
             raise ErrInfo(
                 "exception",
                 exception_msg=exception_desc(),
                 other_msg="Can't create a list in memory of the data to be displayed as formatted text.",
-            )
+            ) from e
     rcols = range(len(colhdrs))
     rrows = range(len(rows))
     colwidths = [max(0, len(colhdrs[j]), *(len(as_ucode(rows[i][j])) for i in rrows)) for j in rcols]
@@ -76,13 +76,15 @@ def prettyprint_rowset(
                 ofile = EncodedFile(output_dest, _state.conf.output_encoding).open("w")
         else:
             ofile = ZipWriter(zipfile, output_dest, append)
-    if desc is not None:
-        ofile.write(f"{desc}\n")
-    for row in rows:
-        ln = f"{margin}{row}\n"
-        ofile.write(ln)
-    if output_dest != "stdout":
-        ofile.close()
+    try:
+        if desc is not None:
+            ofile.write(f"{desc}\n")
+        for row in rows:
+            ln = f"{margin}{row}\n"
+            ofile.write(ln)
+    finally:
+        if output_dest != "stdout":
+            ofile.close()
     return None

execsql/exporters/raw.py CHANGED Viewed

@@ -28,16 +28,18 @@ def write_query_raw(
         of = open(outfile, mode)  # noqa: SIM115
     else:
         of = ZipWriter(zipfile, outfile, append)
-    for row in rowsource:
-        for col in row:
-            if isinstance(col, bytearray):
-                of.write(col)
-            else:
-                if isinstance(col, str):
-                    of.write(bytes(col, db_encoding))
+    try:
+        for row in rowsource:
+            for col in row:
+                if isinstance(col, bytearray):
+                    of.write(col)
                 else:
-                    of.write(bytes(str(col), db_encoding))
-    of.close()
+                    if isinstance(col, str):
+                        of.write(bytes(col, db_encoding))
+                    else:
+                        of.write(bytes(str(col), db_encoding))
+    finally:
+        of.close()
 def write_query_b64(outfile: str, rowsource: Any, append: bool = False, zipfile: str | None = None) -> None:
@@ -50,7 +52,9 @@ def write_query_b64(outfile: str, rowsource: Any, append: bool = False, zipfile:
         of = open(outfile, mode)  # noqa: SIM115
     else:
         of = ZipWriter(zipfile, outfile, append)
-    for row in rowsource:
-        for col in row:
-            of.write(base64.standard_b64decode(col))
-    of.close()
+    try:
+        for row in rowsource:
+            for col in row:
+                of.write(base64.standard_b64decode(col))
+    finally:
+        of.close()

execsql/exporters/sqlite.py CHANGED Viewed

@@ -77,6 +77,6 @@ def write_query_to_sqlite(
         hdrs, rows = db.select_rowsource(select_stmt)
     except ErrInfo:
         raise
-    except Exception:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc())
+    except Exception as e:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
     export_sqlite(outfile, hdrs, rows, append, tablename)

execsql/exporters/templates.py CHANGED Viewed

@@ -29,8 +29,11 @@ class StrTemplateReport:
         from execsql.utils.fileio import EncodedFile
         inf = EncodedFile(self.infname, conf.script_encoding)
-        self.template = string.Template(inf.open("r").read())
-        inf.close()
+        fh = inf.open("r")
+        try:
+            self.template = string.Template(fh.read())
+        finally:
+            fh.close()
     def __repr__(self) -> str:
         return f"StrTemplateReport({self.infname})"
@@ -58,10 +61,12 @@ class StrTemplateReport:
                     ofile = EncodedFile(output_dest, conf.output_encoding).open("w")
             else:
                 ofile = ZipWriter(zipfile, output_dest, append)
-        for dd in data_dict_rows:
-            ofile.write(self.template.safe_substitute(dd))
-        if output_dest != "stdout":
-            ofile.close()
+        try:
+            for dd in data_dict_rows:
+                ofile.write(self.template.safe_substitute(dd))
+        finally:
+            if output_dest != "stdout":
+                ofile.close()
 class JinjaTemplateReport:
@@ -70,6 +75,7 @@ class JinjaTemplateReport:
         global jinja2
         try:
             import jinja2
+            from jinja2.sandbox import SandboxedEnvironment
         except ImportError:
             fatal_error(
                 "The jinja2 library is required to produce reports with the Jinja2 templating system.   See http://jinja.pocoo.org/",
@@ -79,11 +85,14 @@ class JinjaTemplateReport:
         from execsql.utils.fileio import EncodedFile
         inf = EncodedFile(template_file, conf.script_encoding)
-        self.template = jinja2.Template(inf.open("r").read())
-        inf.close()
+        fh = inf.open("r")
+        try:
+            self.template = SandboxedEnvironment().from_string(fh.read())
+        finally:
+            fh.close()
     def __repr__(self) -> str:
-        return f"StrTemplateReport({self.infname})"
+        return f"JinjaTemplateReport({self.infname})"
     def write_report(
         self,
@@ -111,13 +120,12 @@ class JinjaTemplateReport:
         try:
             ofile.write(self.template.render(headers=headers, datatable=data_dict_rows))
         except jinja2.TemplateSyntaxError as e:
-            raise ErrInfo("error", other_msg=e.message + f" on template line {e.lineno}")
+            raise ErrInfo("error", other_msg=e.message + f" on template line {e.lineno}") from e
         except jinja2.TemplateError as e:
-            raise ErrInfo("error", other_msg=f"Jinja2 template error ({e.message})")
-        except:
-            raise
-        if output_dest != "stdout":
-            ofile.close()
+            raise ErrInfo("error", other_msg=f"Jinja2 template error ({e.message})") from e
+        finally:
+            if output_dest != "stdout":
+                ofile.close()
 def report_query(

execsql2 2.1.2__py3-none-any.whl → 2.2.1__py3-none-any.whl

execsql2 2.1.2py3-none-any.whl → 2.2.1py3-none-any.whl