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

execsql/exporters/values.py

@@ -40,24 +40,26 @@ def export_values(
                 f = ef.open("wt")
         else:
             f = ZipWriter(zipfile, outfile, append)
-    if desc is not None:
-        f.write(f"-- {desc}\n")
-    f.write(f"INSERT INTO !!target_table!!\n    ({', '.join(hdrs)})\n")
-    f.write("VALUES\n")
-    firstrow = True
-    for r in rows:
-        if firstrow:
-            firstrow = False
-        else:
-            f.write(",\n")
-        quoted_row = [
-            f"'{v.replace(chr(39), chr(39) * 2)}'" if isinstance(v, str) else str(v) if v is not None else "NULL"
-            for v in r
-        ]
-        f.write(f"    ({', '.join(quoted_row)})")
-    f.write("\n    ;\n")
-    if outfile.lower() != "stdout":
-        f.close()
+    try:
+        if desc is not None:
+            f.write(f"-- {desc}\n")
+        f.write(f"INSERT INTO !!target_table!!\n    ({', '.join(hdrs)})\n")
+        f.write("VALUES\n")
+        firstrow = True
+        for r in rows:
+            if firstrow:
+                firstrow = False
+            else:
+                f.write(",\n")
+            quoted_row = [
+                f"'{v.replace(chr(39), chr(39) * 2)}'" if isinstance(v, str) else str(v) if v is not None else "NULL"
+                for v in r
+            ]
+            f.write(f"    ({', '.join(quoted_row)})")
+        f.write("\n    ;\n")
+    finally:
+        if outfile.lower() != "stdout":
+            f.close()
 
 
 def write_query_to_values(
@@ -72,6 +74,6 @@ def write_query_to_values(
         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_values(outfile, hdrs, rows, append, desc, zipfile=zipfile)

execsql/exporters/xls.py

@@ -76,8 +76,8 @@ class XlsFile:
     def sheet_data(self, sheetname: Any, junk_header_rows: int = 0) -> list:
         try:
             sheet = self.sheet_named(sheetname)
-        except Exception:
-            raise XlsFileError(f"There is no Excel worksheet named {sheetname} in {self.filename}.")
+        except Exception as e:
+            raise XlsFileError(f"There is no Excel worksheet named {sheetname} in {self.filename}.") from e
 
         # Don't rely on sheet.ncols and sheet.nrows, because Excel will count columns
         # and rows that have ever been filled, even if they are now empty.  Base the column count
@@ -211,8 +211,8 @@ class XlsxFile:
     def sheet_data(self, sheetname: Any, junk_header_rows: int = 0) -> list:
         try:
             sheet = self.sheet_named(sheetname)
-        except Exception:
-            raise XlsxFileError(f"There is no Excel worksheet named {sheetname} in {self.filename}.")
+        except Exception as e:
+            raise XlsxFileError(f"There is no Excel worksheet named {sheetname} in {self.filename}.") from e
         # Don't rely on sheet.max_column and sheet.max_row, because Excel will count columns
         # and rows that have ever been filled, even if they are now empty.  Base the column count
         # on the number of contiguous non-empty cells in the first row, and process the data up to nrows until

execsql/exporters/xml.py

@@ -8,7 +8,9 @@ to a well-formed XML file with one element per row and column values as
 child elements or attributes.
 """
 
+import re
 from typing import Any
+from xml.sax.saxutils import escape as xml_escape
 
 import execsql.state as _state
 from execsql.exporters.zip import ZipWriter
@@ -31,8 +33,8 @@ def write_query_to_xml(
         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
@@ -47,14 +49,27 @@ def write_query_to_xml(
     else:
         f = ZipWriter(zipfile, outfile, append)
         f.write(f"<?xml version='1.0' encoding='{conf.output_encoding}'?>\n")
-    if desc is not None:
-        f.write(f"<!--{desc}-->\n")
-    f.write(f"<{tablename}>\n")
-    str_hdrs = [str(h) for h in hdrs]
-    for row in rows:
-        f.write("  <row>\n")
-        for i, col in enumerate(str_hdrs):
-            f.write(f"    <{col}>{row[i]}</{col}>\n")
-        f.write("  </row>\n")
-    f.write(f"</{tablename}>\n")
-    f.close()
+
+    def _safe_xml_name(name: str) -> str:
+        """Sanitize a string for use as an XML element name."""
+        # Replace characters that are invalid in XML names with underscores.
+        s = re.sub(r"[^\w.\-]", "_", str(name))
+        # XML names must start with a letter or underscore, not a digit or dot.
+        if s and not (s[0].isalpha() or s[0] == "_"):
+            s = "_" + s
+        return s or "_"
+
+    try:
+        if desc is not None:
+            f.write(f"<!--{desc.replace('--', '- -')}-->\n")
+        safe_tablename = _safe_xml_name(tablename)
+        f.write(f"<{safe_tablename}>\n")
+        str_hdrs = [_safe_xml_name(h) for h in hdrs]
+        for row in rows:
+            f.write("  <row>\n")
+            for i, col in enumerate(str_hdrs):
+                f.write(f"    <{col}>{xml_escape(str(row[i]) if row[i] is not None else '')}</{col}>\n")
+            f.write("  </row>\n")
+        f.write(f"</{safe_tablename}>\n")
+    finally:
+        f.close()

execsql/importers/base.py

@@ -85,13 +85,13 @@ def import_data_table(
             # ...except for Firebird.
             if db.type == dbt_firebird:
                 db.conn.commit()
-        except Exception:
+        except Exception as e:
             raise ErrInfo(
                 type="db",
                 command_text=sql,
                 exception_msg=exception_info(),
                 other_msg=f"Could not create new table ({tablename}) for IMPORT metacommand",
-            )
+            ) from e
     table_cols = db.table_columns(tablename, schemaname)
     if conf.import_common_cols_only:
         import_cols = [col for col in hdrs if col.lower() in [tc.lower() for tc in table_cols]]
@@ -108,5 +108,5 @@ def import_data_table(
         db.commit()
     except ErrInfo:
         raise
-    except Exception:
-        raise ErrInfo("db", "Call to populate_table when importing data", exception_msg=exception_info())
+    except Exception as e:
+        raise ErrInfo("db", "Call to populate_table when importing data", exception_msg=exception_info()) from e

execsql/importers/csv.py

@@ -60,13 +60,13 @@ def importtable(
             # ...except for Firebird.  Execute the commit directly via the connection so it is always done.
             if db.type == dbt_firebird:
                 db.conn.commit()
-        except Exception:
+        except Exception as e:
             raise ErrInfo(
                 type="db",
                 command_text=sql,
                 exception_msg=exception_info(),
                 other_msg=f"Could not create new table ({tablename}) for IMPORT metacommand",
-            )
+            ) from e
     else:
         if schemaname is not None:
             if not db.table_exists(tablename, schemaname):
@@ -85,13 +85,13 @@ def importtable(
         db.commit()
     except ErrInfo:
         raise
-    except Exception:
+    except Exception as e:
         fq_tablename = db.schema_qualified_table_name(schemaname, tablename)
         raise ErrInfo(
             "exception",
             exception_msg=exception_info(),
             other_msg=f"Can't import tabular file ({filename}) to table ({fq_tablename})",
-        )
+        ) from e
     inf.close()
 
 
@@ -121,10 +121,10 @@ def importfile(
         db.commit()
     except ErrInfo:
         raise
-    except Exception:
+    except Exception as e:
         fq_tablename = db.schema_qualified_table_name(schemaname, tablename)
         raise ErrInfo(
             "exception",
             exception_msg=exception_info(),
             other_msg=f"Can't import file ({filename}) to table ({fq_tablename})",
-        )
+        ) from e

execsql/importers/feather.py

@@ -26,12 +26,12 @@ def import_feather(
 
     try:
         import polars as pl
-    except Exception:
+    except Exception as e:
         raise ErrInfo(
             "exception",
             exception_msg=exception_info(),
             other_msg="The polars Python library must be installed to import data from the Feather format.",
-        )
+        ) from e
     df = pl.read_ipc(filename)
     hdrs = df.columns
     data = [list(row) for row in df.rows()]
@@ -49,12 +49,12 @@ def import_parquet(
 
     try:
         import polars as pl
-    except Exception:
+    except Exception as e:
         raise ErrInfo(
             "exception",
             exception_msg=exception_info(),
             other_msg="The polars Python library must be installed to import data from the Parquet format.",
-        )
+        ) from e
     df = pl.read_parquet(filename)
     hdrs = df.columns
     data = [list(row) for row in df.rows()]

execsql/importers/ods.py

@@ -31,12 +31,12 @@ def ods_data(
     wbk = OdsFile()
     try:
         wbk.open(filename)
-    except Exception:
-        raise ErrInfo(type="cmd", other_msg=f"{filename} is not a valid OpenDocument spreadsheet.")
+    except Exception as e:
+        raise ErrInfo(type="cmd", other_msg=f"{filename} is not a valid OpenDocument spreadsheet.") from e
     try:
         alldata = wbk.sheet_data(sheetname, junk_header_rows)
-    except Exception:
-        raise ErrInfo(type="cmd", other_msg=f"{sheetname} is not a worksheet in {filename}.")
+    except Exception as e:
+        raise ErrInfo(type="cmd", other_msg=f"{sheetname} is not a worksheet in {filename}.") from e
     colhdrs = alldata[0]
     if any(x is None or len(x.strip()) == 0 for x in colhdrs):
         if conf.del_empty_cols:

execsql/importers/xls.py

@@ -45,12 +45,12 @@ def xls_data(
         raise ErrInfo(type="cmd", other_msg=f"{filename} is not a recognizable Excel spreadsheet name.")
     try:
         wbk.open(filename, encoding, read_only=True)
-    except Exception:
-        raise ErrInfo(type="cmd", other_msg=f"{filename} is not a valid Excel spreadsheet.")
+    except Exception as e:
+        raise ErrInfo(type="cmd", other_msg=f"{filename} is not a valid Excel spreadsheet.") from e
     try:
         alldata = wbk.sheet_data(sheetname, junk_header_rows)
-    except Exception:
-        raise ErrInfo(type="cmd", other_msg=f"Error reading worksheet {sheetname} from {filename}.")
+    except Exception as e:
+        raise ErrInfo(type="cmd", other_msg=f"Error reading worksheet {sheetname} from {filename}.") from e
     if len(alldata) == 0:
         raise ErrInfo(type="cmd", other_msg=f"There are no data on worksheet {sheetname} of file {filename}.")
     if ext3 == "lsx":