execsql2 2.6.0__py3-none-any.whl → 2.7.1__py3-none-any.whl

execsql/exporters/__init__.py

@@ -9,9 +9,9 @@ handlers can access them via ``_state.write_query_to_csv`` etc. without
 importing directly from here.
 
 Sub-modules: ``base``, ``delimited``, ``json``, ``xml``, ``html``,
-``latex``, ``ods``, ``xls``, ``zip``, ``raw``, ``pretty``, ``values``,
-``templates``, ``feather``, ``parquet``, ``duckdb``, ``sqlite``,
-``protocol``.
+``latex``, ``markdown``, ``ods``, ``xls``, ``zip``, ``raw``, ``pretty``,
+``values``, ``templates``, ``feather``, ``parquet``, ``duckdb``,
+``sqlite``, ``protocol``.
 """
 
 from execsql.exporters.protocol import QueryExporter, RowsetExporter

execsql/exporters/delimited.py

@@ -27,7 +27,7 @@ from execsql.exceptions import ErrInfo
 from execsql.models import DataTable
 from execsql.utils.errors import exception_desc
 from execsql.utils.fileio import filewriter_close
-from execsql.utils.strings import clean_words, fold_words
+from execsql.utils.strings import clean_words, dedup_words, fold_words
 
 __all__ = ["LineDelimiter", "CsvFile", "CsvWriter", "DelimitedWriter", "write_delimited_file"]
 
@@ -677,7 +677,7 @@ class CsvFile(EncodedFile):
         if conf.fold_col_hdrs != "no":
             colnames = fold_words(colnames, conf.fold_col_hdrs)
         if conf.dedup_col_hdrs:
-            colnames = _state.dedup_words(colnames)
+            colnames = dedup_words(colnames)
         return colnames
 
     def column_headers(self) -> list[str]:

execsql/exporters/markdown.py

@@ -0,0 +1,126 @@
+from __future__ import annotations
+
+"""
+GitHub-Flavored Markdown (GFM) pipe table export for execsql.
+
+Provides :func:`write_query_to_markdown`, which serializes a query result
+set as a GFM pipe table suitable for inclusion in GitHub README files,
+wikis, and any Markdown renderer that supports the pipe-table extension.
+
+Example output::
+
+    | id | name   | score |
+    |----|--------|-------|
+    | 1  | Alice  | 95.2  |
+    | 2  | Bob    | 87.0  |
+
+No optional dependencies — pure Python.
+"""
+
+from typing import Any
+
+import execsql.state as _state
+from execsql.exceptions import ErrInfo
+from execsql.exporters.zip import ZipWriter
+from execsql.utils.errors import exception_desc
+from execsql.utils.fileio import filewriter_close
+
+__all__ = ["write_query_to_markdown"]
+
+_PIPE_ESCAPE = str.maketrans({"|": r"\|", "\\": "\\\\"})
+
+
+def _cell(value: Any) -> str:
+    """Render a single cell value as a Markdown-safe string.
+
+    Args:
+        value: The cell value from the result set.  ``None`` is rendered as
+            an empty string.  Pipe characters are escaped so they do not
+            break the table structure.
+
+    Returns:
+        A string safe to embed between pipe characters in a GFM table row.
+    """
+    if value is None:
+        return ""
+    return str(value).translate(_PIPE_ESCAPE)
+
+
+def write_query_to_markdown(
+    select_stmt: str,
+    db: Any,
+    outfile: str,
+    append: bool = False,
+    desc: str | None = None,
+    zipfile: str | None = None,
+) -> None:
+    """Execute *select_stmt* and write the result set as a GFM pipe table.
+
+    Writes a GitHub-Flavored Markdown pipe table to *outfile* (or into
+    *zipfile* when provided).  Column widths are derived from the widest
+    value in each column (including the header), so the table renders
+    legibly in plain-text editors as well as in Markdown renderers.
+
+    Args:
+        select_stmt: SQL SELECT statement to execute.
+        db: Database connection object exposing ``select_rowsource()``.
+        outfile: Destination file path, or ``"stdout"`` for console output.
+        append: When ``True`` open the file in append mode.  A blank line
+            is written before the table so consecutive appended tables are
+            visually separated.
+        desc: Optional human-readable description.  When provided it is
+            written as an HTML comment (``<!-- desc -->``), which is valid
+            Markdown and invisible in rendered output.
+        zipfile: When set, write into this ZIP archive instead of a plain
+            file.  *outfile* becomes the entry name inside the archive.
+    """
+    conf = _state.conf
+    try:
+        hdrs, rows = db.select_rowsource(select_stmt)
+    except ErrInfo:
+        raise
+    except Exception as e:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
+
+    # Materialise the full result set so we can compute column widths in one
+    # pass before writing.  GFM tables require consistent column widths for
+    # readability; width computation requires seeing all rows first.
+    str_hdrs: list[str] = [_cell(h) for h in hdrs]
+    str_rows: list[list[str]] = [[_cell(v) for v in row] for row in rows]
+
+    # Minimum separator width is 3 dashes (GFM spec minimum for alignment row).
+    col_widths: list[int] = [max(3, len(h)) for h in str_hdrs]
+    for row in str_rows:
+        for i, cell in enumerate(row):
+            if len(cell) > col_widths[i]:
+                col_widths[i] = len(cell)
+
+    def _format_row(cells: list[str]) -> str:
+        padded = (f" {c:<{col_widths[i]}} " for i, c in enumerate(cells))
+        return "|" + "|".join(padded) + "|\n"
+
+    def _format_separator() -> str:
+        dashes = (f" {'-' * col_widths[i]} " for i in range(len(str_hdrs)))
+        return "|" + "|".join(dashes) + "|\n"
+
+    if zipfile is None:
+        filewriter_close(outfile)
+        from execsql.utils.fileio import EncodedFile
+
+        ef = EncodedFile(outfile, conf.output_encoding)
+        f = ef.open("at" if append else "wt")
+    else:
+        f = ZipWriter(zipfile, outfile, append)
+
+    try:
+        if append:
+            # Blank line separates consecutive tables when appending.
+            f.write("\n")
+        if desc is not None:
+            f.write(f"<!-- {desc} -->\n\n")
+        f.write(_format_row(str_hdrs))
+        f.write(_format_separator())
+        for row in str_rows:
+            f.write(_format_row(row))
+    finally:
+        f.close()

execsql/exporters/xlsx.py

@@ -0,0 +1,317 @@
+from __future__ import annotations
+
+"""
+XLSX (Excel Open XML) export for execsql.
+
+Provides :func:`write_query_to_xlsx` (single-sheet export) and
+:func:`write_queries_to_xlsx` (multi-sheet export).  Requires the
+``openpyxl`` package (``execsql2[excel]``).
+"""
+
+import datetime
+import getpass
+import os
+from pathlib import Path
+from typing import Any
+
+import execsql.state as _state
+from execsql.exceptions import ErrInfo
+from execsql.exporters.base import ExportRecord
+from execsql.exporters.pretty import prettyprint_query
+from execsql.script import current_script_line
+from execsql.utils.errors import exception_desc, fatal_error
+from execsql.utils.fileio import filewriter_close
+from execsql.utils.strings import unquoted
+
+__all__ = ["write_query_to_xlsx", "write_queries_to_xlsx"]
+
+# ---------------------------------------------------------------------------
+# Internal helpers
+# ---------------------------------------------------------------------------
+
+
+def _require_openpyxl() -> Any:
+    """Import and return the openpyxl module, raising a fatal error if absent."""
+    try:
+        import openpyxl
+
+        return openpyxl
+    except ImportError:
+        fatal_error("The openpyxl library is needed to write Excel (.xlsx) spreadsheets (install execsql2[excel]).")
+
+
+def _cell_value(item: Any) -> Any:
+    """Return a value suitable for writing directly to an openpyxl cell.
+
+    openpyxl natively handles int, float, bool, str, datetime.datetime,
+    datetime.date, and None.  datetime.time is converted to a string because
+    openpyxl does not have a native time-only cell type.
+    """
+    if item is None:
+        return None
+    if isinstance(item, bool):
+        # bool must be checked before int — bool is a subclass of int.
+        return item
+    if isinstance(item, int | float):
+        return item
+    if isinstance(item, datetime.datetime):
+        return item
+    if isinstance(item, datetime.date):
+        return item
+    if isinstance(item, datetime.time):
+        # openpyxl has no native time-only type; store as HH:MM:SS string.
+        return item.strftime("%H:%M:%S")
+    return str(item)
+
+
+# ---------------------------------------------------------------------------
+# Public API
+# ---------------------------------------------------------------------------
+
+
+def write_query_to_xlsx(
+    select_stmt: str,
+    db: Any,
+    outfile: str,
+    append: bool = False,
+    desc: str | None = None,
+    sheetname: str | None = None,
+) -> None:
+    """Execute *select_stmt* and write the result to a single worksheet in an XLSX file.
+
+    Args:
+        select_stmt: SQL SELECT statement to execute.
+        db: An execsql database adapter with a ``select_rowsource()`` method.
+        outfile: Destination ``.xlsx`` file path.
+        append: If ``True`` and *outfile* exists, add a new sheet to the
+            existing workbook.  If ``False``, overwrite any existing file.
+        desc: Optional human-readable description stored in the inventory sheet.
+        sheetname: Name for the new worksheet.  Defaults to ``"Sheet1"``
+            (or ``"Sheet2"``, ``"Sheet3"``, etc. when appending to avoid
+            name collisions).
+    """
+    openpyxl = _require_openpyxl()
+
+    try:
+        hdrs, rows = db.select_rowsource(select_stmt)
+    except ErrInfo:
+        raise
+    except Exception as e:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
+
+    # ------------------------------------------------------------------
+    # Determine sheet name and open/create workbook
+    # ------------------------------------------------------------------
+    if append and Path(outfile).is_file():
+        wb = openpyxl.load_workbook(outfile)
+        existing_names = wb.sheetnames
+        base = sheetname or "Sheet"
+        sheet_name = base
+        sheet_no = 1
+        while sheet_name in existing_names:
+            sheet_no += 1
+            sheet_name = f"{base}{sheet_no}"
+    else:
+        sheet_name = sheetname or "Sheet1"
+        if Path(outfile).is_file():
+            filewriter_close(outfile)
+            os.unlink(outfile)
+        wb = openpyxl.Workbook()
+        # openpyxl creates a default sheet named "Sheet"; remove it so we
+        # start with a clean workbook.
+        if wb.sheetnames:
+            del wb[wb.sheetnames[0]]
+
+    # ------------------------------------------------------------------
+    # Ensure the inventory sheet exists
+    # ------------------------------------------------------------------
+    inventory_name = "Datasheets"
+    if inventory_name not in wb.sheetnames:
+        inv_ws = wb.create_sheet(inventory_name)
+        bold_font = openpyxl.styles.Font(bold=True)
+        for col_idx, hdr in enumerate(
+            ("datasheet_name", "created_on", "created_by", "description", "source"),
+            start=1,
+        ):
+            cell = inv_ws.cell(row=1, column=col_idx, value=hdr)
+            cell.font = bold_font
+    else:
+        inv_ws = wb[inventory_name]
+
+    # ------------------------------------------------------------------
+    # Write data to a new sheet
+    # ------------------------------------------------------------------
+    ws = wb.create_sheet(sheet_name)
+    bold_font = openpyxl.styles.Font(bold=True)
+
+    # Header row
+    for col_idx, hdr in enumerate(hdrs, start=1):
+        cell = ws.cell(row=1, column=col_idx, value=str(hdr))
+        cell.font = bold_font
+
+    # Data rows
+    for row_idx, row in enumerate(rows, start=2):
+        for col_idx, item in enumerate(row, start=1):
+            ws.cell(row=row_idx, column=col_idx, value=_cell_value(item))
+
+    # ------------------------------------------------------------------
+    # Update inventory sheet
+    # ------------------------------------------------------------------
+    script, lno = current_script_line()
+    src = (
+        f"{select_stmt} with database {_state.dbs.current().name()}, "
+        f"with script {str(Path(script).resolve())}, line {lno}"
+    )
+    next_row = inv_ws.max_row + 1
+    for col_idx, value in enumerate(
+        (
+            sheet_name,
+            datetime.datetime.now().strftime("%Y-%m-%d %H:%M"),
+            getpass.getuser(),
+            desc,
+            src,
+        ),
+        start=1,
+    ):
+        inv_ws.cell(row=next_row, column=col_idx, value=value)
+
+    wb.save(outfile)
+    wb.close()
+
+
+def write_queries_to_xlsx(
+    table_list: str,
+    db: Any,
+    outfile: str,
+    append: bool = False,
+    tee: bool = False,
+    desc: str | None = None,
+) -> None:
+    """Write multiple tables/queries to separate worksheets in a single XLSX workbook.
+
+    Args:
+        table_list: Comma-separated list of table names (optionally schema-qualified).
+        db: An execsql database adapter with a ``select_rowsource()`` method.
+        outfile: Destination ``.xlsx`` file path.
+        append: If ``True`` and *outfile* exists, add new sheets to the existing
+            workbook rather than replacing it.
+        tee: If ``True``, also pretty-print each query result to stdout.
+        desc: Optional description(s).  A single string is applied to every
+            sheet; a comma-separated string with the same count as *table_list*
+            assigns individual descriptions per sheet.
+    """
+    openpyxl = _require_openpyxl()
+
+    tables = [t.strip() for t in table_list.split(",")]
+    if desc is not None:
+        descriptions = [d.strip() for d in desc.split(",")]
+        one_desc = len(descriptions) != len(tables)
+    else:
+        descriptions = []
+        one_desc = False
+
+    # ------------------------------------------------------------------
+    # Open or create workbook
+    # ------------------------------------------------------------------
+    if Path(outfile).is_file() and not append:
+        filewriter_close(outfile)
+        os.unlink(outfile)
+
+    if Path(outfile).is_file():
+        wb = openpyxl.load_workbook(outfile)
+    else:
+        wb = openpyxl.Workbook()
+        # Remove the default empty sheet created by openpyxl.
+        if wb.sheetnames:
+            del wb[wb.sheetnames[0]]
+
+    # ------------------------------------------------------------------
+    # Ensure the inventory sheet exists
+    # ------------------------------------------------------------------
+    inventory_name = "Datasheets"
+    if inventory_name not in wb.sheetnames:
+        inv_ws = wb.create_sheet(inventory_name)
+        bold_font = openpyxl.styles.Font(bold=True)
+        for col_idx, hdr in enumerate(
+            ("datasheet_name", "created_on", "created_by", "description", "source"),
+            start=1,
+        ):
+            cell = inv_ws.cell(row=1, column=col_idx, value=hdr)
+            cell.font = bold_font
+    else:
+        inv_ws = wb[inventory_name]
+
+    # ------------------------------------------------------------------
+    # Write each table to its own sheet
+    # ------------------------------------------------------------------
+    bold_font = openpyxl.styles.Font(bold=True)
+
+    for i, t in enumerate(tables):
+        # Determine the table name used for the sheet label.
+        if "." in t:
+            st = t.split(".")
+            if len(st) != 2:
+                raise ErrInfo("cmd", other_msg=f"Unrecognized table specification in <{t}>")
+            tblname = unquoted(st[1])
+        else:
+            tblname = unquoted(t)
+
+        # Avoid duplicate sheet names.
+        existing_names = wb.sheetnames
+        sheet_name = tblname
+        sheet_no = 1
+        while sheet_name in existing_names:
+            sheet_name = f"{tblname}_{sheet_no}"
+            sheet_no += 1
+
+        # Fetch data.
+        select_stmt = f"select * from {t};"
+        try:
+            hdrs, rows = db.select_rowsource(select_stmt)
+        except ErrInfo:
+            raise
+        except Exception as e:
+            raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
+
+        # Write data sheet.
+        ws = wb.create_sheet(sheet_name)
+
+        for col_idx, hdr in enumerate(hdrs, start=1):
+            cell = ws.cell(row=1, column=col_idx, value=str(hdr))
+            cell.font = bold_font
+
+        for row_idx, row in enumerate(rows, start=2):
+            for col_idx, item in enumerate(row, start=1):
+                ws.cell(row=row_idx, column=col_idx, value=_cell_value(item))
+
+        # Determine per-sheet description.
+        if desc is None:
+            d = None
+        elif one_desc:
+            d = desc
+        else:
+            d = descriptions[i]
+
+        # Update inventory sheet.
+        script, lno = current_script_line()
+        src = f"From database {_state.dbs.current().name()}, with script {str(Path(script).resolve())}, line {lno}"
+        next_row = inv_ws.max_row + 1
+        for col_idx, value in enumerate(
+            (
+                sheet_name,
+                datetime.datetime.now().strftime("%Y-%m-%d %H:%M"),
+                getpass.getuser(),
+                d,
+                src,
+            ),
+            start=1,
+        ):
+            inv_ws.cell(row=next_row, column=col_idx, value=value)
+
+        if tee and outfile.lower() != "stdout":
+            prettyprint_query(select_stmt, db, "stdout", False, desc=d)
+
+        _state.export_metadata.add(ExportRecord(queryname=select_stmt, outfile=outfile, zipfile=None, description=d))
+
+    wb.save(outfile)
+    wb.close()

execsql/exporters/yaml.py

@@ -0,0 +1,87 @@
+from __future__ import annotations
+
+"""
+YAML export for execsql.
+
+Provides :func:`write_query_to_yaml` which serialises a query result set as a
+YAML sequence of mappings (one mapping per row).
+
+Requires the ``PyYAML`` package (``pip install PyYAML`` or
+``pip install 'execsql2[formats]'``).
+"""
+
+from typing import Any
+
+import execsql.state as _state
+from execsql.exceptions import ErrInfo
+from execsql.exporters.zip import ZipWriter
+from execsql.utils.errors import exception_desc
+from execsql.utils.fileio import filewriter_close
+
+__all__ = ["write_query_to_yaml"]
+
+
+def write_query_to_yaml(
+    select_stmt: str,
+    db: Any,
+    outfile: str,
+    append: bool = False,
+    desc: str | None = None,
+    zipfile: str | None = None,
+) -> None:
+    """Execute *select_stmt* and write the result set to *outfile* as YAML.
+
+    The output is a YAML sequence of mappings — one mapping per row with
+    column headers as keys.  Python types are preserved: integers stay
+    integers, floats stay floats, ``None`` becomes ``null``.
+
+    Args:
+        select_stmt: SQL SELECT statement to execute.
+        db: Database connection object exposing ``select_rowsource()``.
+        outfile: Destination file path, or ``"stdout"``.
+        append: When ``True`` the YAML sequence is appended to an existing
+            file.  Note that concatenating two bare YAML sequences in one
+            file produces a multi-document stream; callers are responsible
+            for ensuring the resulting file is valid for their use-case.
+        desc: Optional description string.  Ignored in plain YAML output
+            (YAML does not have a standard metadata header), but accepted
+            for API consistency with other exporters.
+        zipfile: When provided, write *outfile* as a member of this zip
+            archive instead of writing to the filesystem directly.
+    """
+    try:
+        import yaml  # type: ignore[import-untyped]
+    except ImportError as exc:
+        raise ErrInfo(
+            "error",
+            other_msg=("PyYAML is required for FORMAT YAML export. Install it with: pip install PyYAML"),
+        ) from exc
+
+    conf = _state.conf
+    try:
+        hdrs, rows = db.select_rowsource(select_stmt)
+    except ErrInfo:
+        raise
+    except Exception as e:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
+
+    # Build the list of dicts in memory.  YAML output is human-readable and
+    # typically used for small-to-medium result sets; loading into memory is
+    # acceptable and required by yaml.dump().
+    uhdrs = [str(h) for h in hdrs]
+    data = [dict(zip(uhdrs, row)) for row in rows]
+    yaml_text = yaml.dump(data, default_flow_style=False, allow_unicode=True)
+
+    if zipfile is None:
+        filewriter_close(outfile)
+        from execsql.utils.fileio import EncodedFile
+
+        ef = EncodedFile(outfile, conf.output_encoding)
+        f = ef.open("at" if append else "wt")
+    else:
+        f = ZipWriter(zipfile, outfile, append)
+
+    try:
+        f.write(yaml_text)
+    finally:
+        f.close()

execsql/metacommands/__init__.py

@@ -105,6 +105,7 @@ from execsql.metacommands.io import (
     x_export_query_with_template,
     x_export_with_template,
     x_export_ods_multiple,
+    x_export_xlsx_multiple,
     x_export_metadata,
     x_export_metadata_table,
     x_import,
@@ -303,6 +304,7 @@ __all__ = [
     "x_export_query_with_template",
     "x_export_with_template",
     "x_export_ods_multiple",
+    "x_export_xlsx_multiple",
     "x_export_metadata",
     "x_export_metadata_table",
     "x_import",
@@ -427,12 +429,31 @@ TEXT_FORMATS = ["TXT", "TXT-AND", "PLAIN"]
 JSON_VARIANT_FORMATS = ["JSON_TS", "JSON_TABLESCHEMA"]
 
 QUERY_EXPORT_FORMATS = (
-    DELIMITED_FORMATS + TEXT_FORMATS + ["ODS", "JSON", "HTML", "CGI-HTML", "VALUES", "LATEX", "RAW", "B64", "FEATHER"]
+    DELIMITED_FORMATS
+    + TEXT_FORMATS
+    + ["ODS", "XLSX", "JSON", "HTML", "CGI-HTML", "VALUES", "LATEX", "RAW", "B64", "FEATHER", "YAML", "MARKDOWN", "MD"]
 )
 TABLE_EXPORT_FORMATS = (
     DELIMITED_FORMATS
     + TEXT_FORMATS
-    + ["JSON", "XML", "VALUES", "HTML", "CGI-HTML", "SQLITE", "DUCKDB", "LATEX", "RAW", "B64", "FEATHER", "HDF5"]
+    + [
+        "JSON",
+        "XML",
+        "VALUES",
+        "HTML",
+        "CGI-HTML",
+        "SQLITE",
+        "DUCKDB",
+        "LATEX",
+        "RAW",
+        "B64",
+        "FEATHER",
+        "HDF5",
+        "XLSX",
+        "YAML",
+        "MARKDOWN",
+        "MD",
+    ]
 )
 SERVE_FORMATS = ["BINARY", "CSV", "TXT", "TEXT", "ODS", "JSON", "HTML", "PDF", "ZIP"]
 METADATA_FORMATS = ["CSV", "TAB", "TSV", "TABQ", "TSVQ", "TXT", "TEXT"]

execsql/metacommands/dispatch.py

@@ -107,6 +107,7 @@ from execsql.metacommands.io import (
     x_export_metadata,
     x_export_metadata_table,
     x_export_ods_multiple,
+    x_export_xlsx_multiple,
     x_export_query,
     x_export_query_with_template,
     x_export_row_buffer,
@@ -395,6 +396,16 @@ def build_dispatch_table() -> MetaCommandList:
         ),
         x_export_ods_multiple,
     )
+    mcl.add(
+        ins_table_list_rxs(
+            r"^\s*EXPORT\s+",
+            ins_fn_rxs(
+                r"\s+(?P<tee>TEE\s+)?(?P<append>APPEND\s+)?TO\s+",
+                r'\s+AS\s+XLSX(?:\s+DESCRIP(?:TION)?\s+"(?P<description>[^"]*)")?\s*$',
+            ),
+        ),
+        x_export_xlsx_multiple,
+    )
 
     # ------------------------------------------------------------------
     # IMPORT_FILE

execsql/metacommands/io.py

@@ -22,6 +22,7 @@ from execsql.metacommands.io_export import (  # noqa: F401
     x_export_metadata,
     x_export_metadata_table,
     x_export_ods_multiple,
+    x_export_xlsx_multiple,
     x_export_query,
     x_export_query_with_template,
     x_export_row_buffer,
@@ -78,6 +79,7 @@ __all__ = [
     "x_export_metadata",
     "x_export_metadata_table",
     "x_export_ods_multiple",
+    "x_export_xlsx_multiple",
     "x_export_query",
     "x_export_query_with_template",
     "x_export_row_buffer",

execsql/metacommands/io_export.py

@@ -19,6 +19,7 @@ from execsql.exporters.html import write_query_to_cgi_html, write_query_to_html
 from execsql.exporters.json import write_query_to_json, write_query_to_json_ts
 from execsql.exporters.latex import write_query_to_latex
 from execsql.exporters.ods import write_queries_to_ods, write_query_to_ods
+from execsql.exporters.xlsx import write_queries_to_xlsx, write_query_to_xlsx
 from execsql.exporters.parquet import write_query_to_parquet
 from execsql.exporters.pretty import prettyprint_query, prettyprint_rowset
 from execsql.exporters.raw import write_query_b64, write_query_raw
@@ -26,6 +27,8 @@ from execsql.exporters.sqlite import write_query_to_sqlite
 from execsql.exporters.templates import report_query
 from execsql.exporters.values import write_query_to_values
 from execsql.exporters.xml import write_query_to_xml
+from execsql.exporters.markdown import write_query_to_markdown
+from execsql.exporters.yaml import write_query_to_yaml
 from execsql.importers.base import import_data_table
 from execsql.script import current_script_line
 from execsql.utils.errors import exception_desc
@@ -85,6 +88,8 @@ def x_export(**kwargs: Any) -> None:
             raise ErrInfo("error", other_msg="Cannot export to the HDF5 format within a zipfile.")
         if filefmt == "ods":
             raise ErrInfo("error", other_msg="Cannot export to an ODS workbook within a zipfile.")
+        if filefmt == "xlsx":
+            raise ErrInfo("error", other_msg="Cannot export to an XLSX workbook within a zipfile.")
     notype = bool(kwargs.get("notype"))
     if zipfilename is not None:
         check_dir(zipfilename)
@@ -120,6 +125,15 @@ def x_export(**kwargs: Any) -> None:
             sheetname=queryname,
             desc=description,
         )
+    elif filefmt == "xlsx":
+        write_query_to_xlsx(
+            select_stmt,
+            _state.dbs.current(),
+            outfile,
+            append,
+            sheetname=queryname,
+            desc=description,
+        )
     elif filefmt == "duckdb":
         write_query_to_duckdb(select_stmt, _state.dbs.current(), outfile, append, tablename=queryname)
     elif filefmt == "sqlite":
@@ -191,6 +205,24 @@ def x_export(**kwargs: Any) -> None:
         )
     elif filefmt == "hdf5":
         write_query_to_hdf5(table, select_stmt, _state.dbs.current(), outfile, append, desc=description)
+    elif filefmt == "yaml":
+        write_query_to_yaml(
+            select_stmt,
+            _state.dbs.current(),
+            outfile,
+            append,
+            desc=description,
+            zipfile=zipfilename,
+        )
+    elif filefmt in ("markdown", "md"):
+        write_query_to_markdown(
+            select_stmt,
+            _state.dbs.current(),
+            outfile,
+            append,
+            desc=description,
+            zipfile=zipfilename,
+        )
     else:
         try:
             hdrs, rows = _state.dbs.current().select_rowsource(select_stmt)
@@ -237,6 +269,8 @@ def x_export_query(**kwargs: Any) -> None:
             raise ErrInfo("error", other_msg="Cannot export to the HDF5 format within a zipfile.")
         if filefmt == "ods":
             raise ErrInfo("error", other_msg="Cannot export to an ODS workbook within a zipfile.")
+        if filefmt == "xlsx":
+            raise ErrInfo("error", other_msg="Cannot export to an XLSX workbook within a zipfile.")
     notype = bool(kwargs.get("notype"))
     check_dir(outfile)
     if tee and outfile.lower() != "stdout":
@@ -270,6 +304,16 @@ def x_export_query(**kwargs: Any) -> None:
             sheetname=f"Query_{lno}",
             desc=description,
         )
+    elif filefmt == "xlsx":
+        script_name, lno = current_script_line()
+        write_query_to_xlsx(
+            select_stmt,
+            _state.dbs.current(),
+            outfile,
+            append,
+            sheetname=f"Query_{lno}",
+            desc=description,
+        )
     elif filefmt == "json":
         write_query_to_json(
             select_stmt,
@@ -325,6 +369,24 @@ def x_export_query(**kwargs: Any) -> None:
             desc=description,
             zipfile=zipfilename,
         )
+    elif filefmt == "yaml":
+        write_query_to_yaml(
+            select_stmt,
+            _state.dbs.current(),
+            outfile,
+            append,
+            desc=description,
+            zipfile=zipfilename,
+        )
+    elif filefmt in ("markdown", "md"):
+        write_query_to_markdown(
+            select_stmt,
+            _state.dbs.current(),
+            outfile,
+            append,
+            desc=description,
+            zipfile=zipfilename,
+        )
     else:
         try:
             hdrs, rows = _state.dbs.current().select_rowsource(select_stmt)
@@ -403,6 +465,19 @@ def x_export_ods_multiple(**kwargs: Any) -> None:
     write_queries_to_ods(table_list, _state.dbs.current(), outfile, append, tee, desc=description)
 
 
+def x_export_xlsx_multiple(**kwargs: Any) -> None:
+    """Export multiple tables to separate worksheets in a single XLSX workbook."""
+    table_list = kwargs["tables"]
+    outfile = kwargs["filename"]
+    description = kwargs["description"]
+    tee = kwargs["tee"]
+    tee = bool(tee)
+    append = kwargs["append"]
+    append = append is not None
+    check_dir(outfile)
+    write_queries_to_xlsx(table_list, _state.dbs.current(), outfile, append, tee, desc=description)
+
+
 def x_export_metadata(**kwargs: Any) -> None:
     outfile = kwargs["filename"]
     append = kwargs["append"] is not None

{execsql2-2.6.0.dist-info → execsql2-2.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.6.0
+Version: 2.7.1
 Summary: Runs a SQL script against a PostgreSQL, SQLite, MariaDB/MySQL, DuckDB, Firebird, MS-Access, MS-SQL-Server, or Oracle database, or an ODBC DSN. Provides metacommands to import and export data, copy data between databases, conditionally execute SQL and metacommands, and dynamically alter SQL and metacommands with substitution variables.
 Project-URL: Repository, https://github.com/geocoug/execsql
 Project-URL: Issues, https://github.com/geocoug/execsql/issues
@@ -54,6 +54,7 @@ Requires-Dist: polars; extra == 'all'
 Requires-Dist: psycopg2-binary; extra == 'all'
 Requires-Dist: pymysql; extra == 'all'
 Requires-Dist: pyodbc; extra == 'all'
+Requires-Dist: pyyaml; extra == 'all'
 Requires-Dist: tables; extra == 'all'
 Requires-Dist: xlrd; extra == 'all'
 Provides-Extra: all-db
@@ -76,6 +77,7 @@ Requires-Dist: openpyxl; extra == 'dev'
 Requires-Dist: polars; extra == 'dev'
 Requires-Dist: pre-commit>=3.5.0; extra == 'dev'
 Requires-Dist: pytest-cov>=5.0.0; extra == 'dev'
+Requires-Dist: pyyaml; extra == 'dev'
 Requires-Dist: ruff>=0.4; extra == 'dev'
 Requires-Dist: tables; extra == 'dev'
 Requires-Dist: tox-uv>=1.13.1; extra == 'dev'
@@ -91,6 +93,7 @@ Requires-Dist: jinja2; extra == 'formats'
 Requires-Dist: odfpy; extra == 'formats'
 Requires-Dist: openpyxl; extra == 'formats'
 Requires-Dist: polars; extra == 'formats'
+Requires-Dist: pyyaml; extra == 'formats'
 Requires-Dist: tables; extra == 'formats'
 Requires-Dist: xlrd; extra == 'formats'
 Provides-Extra: mssql
@@ -227,7 +230,7 @@ Run `execsql --help` for the full option list, or `execsql -m` to list all metac
 # Features
 
 - Import data from CSV, TSV, Excel, OpenDocument, Feather, or Parquet files into a database table.
-- Export query results in 15+ formats including CSV, TSV, JSON, XML, HTML, LaTeX, OpenDocument, Feather, HDF5, DuckDB, SQLite, plain text, and Jinja2 templates.
+- Export query results in 20+ formats including CSV, TSV, JSON, YAML, XML, HTML, Markdown, LaTeX, XLSX, OpenDocument, Feather, Parquet, HDF5, DuckDB, SQLite, plain text, and Jinja2 templates.
 - Copy data between databases, including across different DBMS types.
 - Conditionally execute SQL and metacommands using `IF`/`ELSE`/`ENDIF` based on data values, DBMS type, or user input.
 - Loop over blocks of SQL and metacommands using `LOOP`/`ENDLOOP`.

{execsql2-2.6.0.dist-info → execsql2-2.7.1.dist-info}/RECORD

@@ -25,14 +25,15 @@ execsql/db/oracle.py,sha256=AFVHhGlCzBuU7JgrAqeUG6e8TUUkk1Y80XVJQnGOqLM,10547
 execsql/db/postgres.py,sha256=oXR7ODzQhR3yO6q-aNa9_il_rO3SpOX9yYGsfIqHwLI,20139
 execsql/db/sqlite.py,sha256=2fD3AfckIGWN1oHcOaqQlQnbig26top1IlW-ejPHttI,10204
 execsql/db/sqlserver.py,sha256=mNwmIIxTzqXU-cOjpNpeFi568HjQHsAk8Xnn-tR6F_E,7563
-execsql/exporters/__init__.py,sha256=IB3GdPKdRdyp9UPWTMqqJty769-LXKgBcLbEf3Q4LuM,656
+execsql/exporters/__init__.py,sha256=-Cnji-OgodJV8ftcDcOyTof0kQMy9J5kKVC8GVFpc3o,670
 execsql/exporters/base.py,sha256=W9USFyk_2eztjJ51X6CJh7-chE1i3cSx-STOtbHXCNI,6373
-execsql/exporters/delimited.py,sha256=VnqDRuybQ7D9fBWf8UtqYYKTiQ-qwMJZFg_SaxNUV-k,30298
+execsql/exporters/delimited.py,sha256=zMvurTRVl5W-6N8DuYtn_xILUkYLMlfflwWMfvdeaF0,30304
 execsql/exporters/duckdb.py,sha256=Wc9I5uiV4MzmVQzCX-vgVHQUL7U3ZWdOkFVFWBv5SXM,2911
 execsql/exporters/feather.py,sha256=w2qZAnewzeiRMnmPXECvkgD-6KtyxaiQwjokRT7Awrc,4167
 execsql/exporters/html.py,sha256=ISQBOr7AJ5koKlebXSvWqzEvl1nXriCRGeKmk-bzkrc,9335
 execsql/exporters/json.py,sha256=yljlRBbmvDVSTQUe0EdfdqTTRpD5sHfn7-jQ457ydvc,4139
 execsql/exporters/latex.py,sha256=w_B83_5vKPe8uYxCWGdqvxwJeq0mw5zzKYDiAb7dbN0,4503
+execsql/exporters/markdown.py,sha256=_ZX3dikbtAb6qZxYeWxDZAPF0-cNKTPR7or5kTbD2ZU,4436
 execsql/exporters/ods.py,sha256=jl2qVHUeCLLv8xrkZfG3jgXbaglQ3rggCHziv7tNQOI,18876
 execsql/exporters/parquet.py,sha256=186vUTH1oVAQ0s_qayLzEQVsKKu3ijAkhYEI6tysXkg,1095
 execsql/exporters/pretty.py,sha256=9isA8f6xUz-3-JhMJimibnvtybVrT1cnoAjGnzsPEGI,3423
@@ -42,7 +43,9 @@ execsql/exporters/sqlite.py,sha256=XA0ALLvy-r6Pz1lpOFkWWbvpSP9Hm1tHHiuo_BvPVDk,2
 execsql/exporters/templates.py,sha256=T9nk7vJrlxiPGfOWGc79xqqDxK3TCYu0wXq48U02npw,5564
 execsql/exporters/values.py,sha256=HIyud31aux_dbCphfKHEGeZB9fkIPE5PoGXQz817XIE,2520
 execsql/exporters/xls.py,sha256=nPROgxL8XK2oiBVoqN2L-o0j_jynRIMokwB8NpvOBt0,10623
+execsql/exporters/xlsx.py,sha256=xXTFIKkvJnNOsFdnhSYEkJa4ulTrtq9tIRk6SSchqA0,11299
 execsql/exporters/xml.py,sha256=lqcOM8uKDoCayU42BPSLNH1_2DIHU5D3LtQItREU90c,2564
+execsql/exporters/yaml.py,sha256=0bwLDU3Fy00yMryBOSBSptbjV8Re6Ks-b62DObFNP4o,3062
 execsql/exporters/zip.py,sha256=9-hExltQorONNThiMfxPDYHqHsbTeq9zM9zmtG4oFb8,4410
 execsql/gui/__init__.py,sha256=oCb-cyhLZzVpWJ4WU5HbqEDBrV-lm0ytEwxemrOZyqs,2048
 execsql/gui/base.py,sha256=sfNRkDrf7FhIgMRUOdyZpRLS1Xk9RqNhrV0A1RP6PXU,6068
@@ -55,15 +58,15 @@ execsql/importers/csv.py,sha256=Mu848WNzuhVO1ade-WurPyxqGOuVNRO8UwRF3-bav_I,4845
 execsql/importers/feather.py,sha256=g2B69d2uv9vmnXcmjFyTVsMP40LYEzFYkhk3gD26mGw,1900
 execsql/importers/ods.py,sha256=MJsdsjropzCvxAA3DDZfAL_AnmZ4yij7DnrjGyDJqHQ,2843
 execsql/importers/xls.py,sha256=e0Zfe47ZiCpA1Ae3XDJ1ko3sCiH3-8U6XLKi6NvD0jQ,3683
-execsql/metacommands/__init__.py,sha256=pdEMN1PoJFDgx1p4TFbi4H1Vx6h_QIXcuE-23AEkwvI,10813
+execsql/metacommands/__init__.py,sha256=zYRUuCnU-e-HbPdp_zCgQIriR_YgRqHkais45Eo3FNk,11082
 execsql/metacommands/conditions.py,sha256=u-XdeIWj9QMht9hRGhvH0XlB9V09AliAPKDBHRXc02s,24540
 execsql/metacommands/connect.py,sha256=Nsm0D91i3RX-R2rzQQ-Br-gULaI6Uvdn9fqb7DOAVfE,14804
 execsql/metacommands/control.py,sha256=FCIWD-ZivHRZDqMS-2k37iR05HKHsv_7UPh5zJAg4I4,7693
 execsql/metacommands/data.py,sha256=tRQBGTAuW-eJ2tBNWaoZI9OjTyNNyHJISo7gOdL-sm8,11370
 execsql/metacommands/debug.py,sha256=nmfQ2ijUbTQO3drnyV9EzFueGSTfMl-CddP_NlQyI14,8178
-execsql/metacommands/dispatch.py,sha256=th4vA2Vg4vY_fPcePRJUZ67CwUX-_j7tSckCucB3MQA,82065
-execsql/metacommands/io.py,sha256=Vv0NnUHiNKVnHbWJ0nsEdtN5SW042OtPCu7hrV57XyY,2913
-execsql/metacommands/io_export.py,sha256=kxfGnoBDdPFfncxgz6dazMIoGZEHPOO-Mg02kbpdd20,15965
+execsql/metacommands/dispatch.py,sha256=aZq4QFY3AjqbplCr2iSoD13ayvT34wWns63a15a_JRM,82407
+execsql/metacommands/io.py,sha256=Duh60caM4go9JczbGYNMKKYpcMimwPzF6EQ_tshKxdE,2971
+execsql/metacommands/io_export.py,sha256=7lkCSnPhXy9FVau9_hT1u68NOVdG2DsWmvUh9hM1QWI,18359
 execsql/metacommands/io_fileops.py,sha256=RKqbWPTYiwiqCZYG-lpih0w1JVOY4RBFdWr3BJb_pnY,9669
 execsql/metacommands/io_import.py,sha256=wyxJJdlW07P5ZIhweejhXyyGANAvEhY5uMjKZ200Jyc,12983
 execsql/metacommands/io_write.py,sha256=NpL2aYGfBpbqmPpYsqniYltYfd_SCA1EQz3_4qSdNbo,8279
@@ -86,24 +89,24 @@ execsql/utils/numeric.py,sha256=xh02ANSRk3nUpQ-rtm66ILoMqoi7HtzCoRMIOT9U8QI,1570
 execsql/utils/regex.py,sha256=diEzTZqU_HHwVMadPAvN1Vgzhl7I03eVaEFGCXyGGL8,3770
 execsql/utils/strings.py,sha256=5Dvzrk-9SIw2lpxXZQkiJbNyo1sy7iXXAtSULlZ0KG8,8488
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.6.0.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.6.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.6.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.6.0.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
-execsql2-2.6.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.6.0.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.6.0.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.6.0.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.6.0.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.6.0.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.6.0.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.6.0.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.6.0.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.6.0.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.6.0.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.6.0.dist-info/METADATA,sha256=NV6dRQPFMR13RsyM3my0svP-jfb6qd6sLePtERmD8S0,16573
-execsql2-2.6.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.6.0.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.6.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.6.0.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.6.0.dist-info/RECORD,,
+execsql2-2.7.1.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.7.1.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.7.1.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.7.1.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
+execsql2-2.7.1.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.7.1.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
+execsql2-2.7.1.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
+execsql2-2.7.1.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
+execsql2-2.7.1.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
+execsql2-2.7.1.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
+execsql2-2.7.1.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
+execsql2-2.7.1.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
+execsql2-2.7.1.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
+execsql2-2.7.1.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
+execsql2-2.7.1.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
+execsql2-2.7.1.dist-info/METADATA,sha256=UEW6Lpayq5sSHyOOrXXz0SvdAw0MzuoEbRQQ1Chr2VI,16722
+execsql2-2.7.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.7.1.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.7.1.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.7.1.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
+execsql2-2.7.1.dist-info/RECORD,,