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

execsql/importers/csv.py

@@ -9,38 +9,33 @@ a delimited file), used by the ``IMPORT`` metacommand with ``FORMAT csv``,
 ``FORMAT tsv``, and ``FORMAT txt``.
 """
 
-import codecs
-import csv
-import os
-import re
-from typing import Any, Optional
+from pathlib import Path
+from typing import Any
 
 from execsql.exceptions import ErrInfo
 from execsql.db.base import Database
-from execsql.importers.base import import_data_table
 import execsql.state as _state
+from execsql.types import dbt_firebird
 
 
 def importtable(
     db: Database,
-    schemaname: Optional[str],
+    schemaname: str | None,
     tablename: str,
     filename: str,
     is_new: Any,
     skip_header_line: bool = True,
-    quotechar: Optional[str] = None,
-    delimchar: Optional[str] = None,
-    encoding: Optional[str] = None,
+    quotechar: str | None = None,
+    delimchar: str | None = None,
+    encoding: str | None = None,
     junk_header_lines: int = 0,
 ) -> None:
     from execsql.utils.errors import exception_info
 
     conf = _state.conf
-    dbt_firebird = _state.dbt_firebird
-
-    if not os.path.isfile(filename):
+    if not Path(filename).is_file():
         raise ErrInfo(type="error", other_msg=f"Non-existent file ({filename}) used with the IMPORT metacommand")
-    enc = conf.import_encoding if not encoding else encoding
+    enc = encoding if encoding else conf.import_encoding
 
     # Lazy import of CsvFile
     from execsql.exporters.delimited import CsvFile
@@ -57,8 +52,6 @@ def importtable(
             try:
                 db.drop_table(db.schema_qualified_table_name(schemaname, tablename))
             except Exception:
-                from execsql.utils.fileio import Logger
-
                 _state.exec_log.log_status_info(f"Could not drop existing table ({tablename}) for IMPORT metacommand")
                 # Don't raise an exception; this may not be a problem because the table may not already exist.
         try:
@@ -104,7 +97,7 @@ def importtable(
 
 def importfile(
     db: Database,
-    schemaname: Optional[str],
+    schemaname: str | None,
     tablename: str,
     columname: str,
     filename: str,

execsql/importers/feather.py

@@ -3,13 +3,12 @@ from __future__ import annotations
 """
 Feather and Parquet import for execsql.
 
-Provides :func:`import_feather` (Apache Arrow Feather v2 via ``pyarrow``)
-and :func:`import_parquet` (Parquet format via ``pyarrow``), used by
-``IMPORT … FORMAT feather`` and ``FORMAT parquet``.
+Provides :func:`import_feather` (Apache Arrow Feather v2 / Arrow IPC via
+``polars``) and :func:`import_parquet` (Parquet format via ``polars``),
+used by ``IMPORT … FORMAT feather`` and ``FORMAT parquet``.
 """
 
-import os
-from typing import Any, Optional
+from typing import Any
 
 from execsql.exceptions import ErrInfo
 from execsql.db.base import Database
@@ -18,7 +17,7 @@ from execsql.importers.base import import_data_table
 
 def import_feather(
     db: Database,
-    schemaname: Optional[str],
+    schemaname: str | None,
     tablename: str,
     filename: str,
     is_new: Any,
@@ -26,25 +25,22 @@ def import_feather(
     from execsql.utils.errors import exception_info
 
     try:
-        import numpy as np
-        import pandas as pd
-        import pyarrow.feather
+        import polars as pl
     except Exception:
         raise ErrInfo(
             "exception",
             exception_msg=exception_info(),
-            other_msg="The pandas and pyarrow Python libraries must be installed to import data from the Feather format.",
+            other_msg="The polars Python library must be installed to import data from the Feather format.",
         )
-    df = pd.read_feather(filename)
-    df = df.replace({np.nan: None})
-    hdrs = df.columns.values.tolist()
-    data = df.values.tolist()
+    df = pl.read_ipc(filename)
+    hdrs = df.columns
+    data = [list(row) for row in df.rows()]
     import_data_table(db, schemaname, tablename, is_new, hdrs, data)
 
 
 def import_parquet(
     db: Database,
-    schemaname: Optional[str],
+    schemaname: str | None,
     tablename: str,
     filename: str,
     is_new: Any,
@@ -52,16 +48,14 @@ def import_parquet(
     from execsql.utils.errors import exception_info
 
     try:
-        import numpy as np
-        import pandas as pd
+        import polars as pl
     except Exception:
         raise ErrInfo(
             "exception",
             exception_msg=exception_info(),
-            other_msg="The pandas and fastparquet or pyarrow Python libraries must be installed to import data from the Parquet format.",
+            other_msg="The polars Python library must be installed to import data from the Parquet format.",
         )
-    df = pd.read_parquet(filename)
-    df = df.replace({np.nan: None})
-    hdrs = df.columns.values.tolist()
-    data = df.values.tolist()
+    df = pl.read_parquet(filename)
+    hdrs = df.columns
+    data = [list(row) for row in df.rows()]
     import_data_table(db, schemaname, tablename, is_new, hdrs, data)

execsql/importers/ods.py

@@ -9,8 +9,7 @@ the ``IMPORT … FORMAT ods`` metacommand.  Requires ``odfpy``
 (``execsql2[ods]``).
 """
 
-import os
-from typing import Any, List, Optional
+from typing import Any
 
 from execsql.exceptions import ErrInfo
 from execsql.db.base import Database
@@ -39,7 +38,7 @@ def ods_data(
     except Exception:
         raise ErrInfo(type="cmd", other_msg=f"{sheetname} is not a worksheet in {filename}.")
     colhdrs = alldata[0]
-    if any([x is None or len(x.strip()) == 0 for x in colhdrs]):
+    if any(x is None or len(x.strip()) == 0 for x in colhdrs):
         if conf.del_empty_cols:
             blanks = [i for i in range(len(colhdrs)) if colhdrs[i] is None or len(colhdrs[i].strip()) == 0]
             while len(blanks) > 0:
@@ -70,7 +69,7 @@ def ods_data(
 
 def importods(
     db: Database,
-    schemaname: Optional[str],
+    schemaname: str | None,
     tablename: str,
     is_new: Any,
     filename: str,

execsql/importers/xls.py

@@ -9,8 +9,7 @@ reader) and the XLSX equivalent using ``openpyxl``.  Used by
 ``execsql2[excel]``.
 """
 
-import os
-from typing import Any, List, Optional
+from typing import Any
 
 from execsql.exceptions import ErrInfo
 from execsql.db.base import Database
@@ -22,7 +21,7 @@ def xls_data(
     filename: str,
     sheetname: str,
     junk_header_rows: int,
-    encoding: Optional[str] = None,
+    encoding: str | None = None,
 ) -> tuple:
     """Returns the data from the specified worksheet as a list of headers and a list of lists of rows."""
     from execsql.utils.strings import clean_words, trim_words, fold_words, dedup_words
@@ -59,7 +58,7 @@ def xls_data(
     if len(alldata) == 1:
         return alldata[0], []
     colhdrs = alldata[0]
-    if any([x is None or (isinstance(x, str) and len(x.strip()) == 0) for x in colhdrs]):
+    if any(x is None or (isinstance(x, str) and len(x.strip()) == 0) for x in colhdrs):
         if conf.del_empty_cols:
             blanks = [i for i in range(len(colhdrs)) if colhdrs[i] is None or len(colhdrs[i].strip()) == 0]
             while len(blanks) > 0:
@@ -90,13 +89,13 @@ def xls_data(
 
 def importxls(
     db: Database,
-    schemaname: Optional[str],
+    schemaname: str | None,
     tablename: str,
     is_new: Any,
     filename: str,
     sheetname: str,
     junk_header_rows: int,
-    encoding: Optional[str],
+    encoding: str | None,
 ) -> None:
     hdrs, data = xls_data(filename, sheetname, junk_header_rows, encoding)
     import_data_table(db, schemaname, tablename, is_new, hdrs, data)

execsql/metacommands/__init__.py

@@ -12,7 +12,7 @@ from __future__ import annotations
 
 import re
 
-import execsql.state as _state
+import execsql.state as _state  # noqa: F401
 
 # Handler imports — grouped by module for readability.
 from execsql.metacommands.connect import (
@@ -29,7 +29,7 @@ from execsql.metacommands.connect import (
     x_connect_user_ora,
     x_connect_duckdb,
     x_connect_sqlite,
-    x_connect_dsn,
+    x_connect_dsn,  # noqa: F401
     x_use,
     x_disconnect,
     x_autocommit_on,
@@ -188,13 +188,13 @@ from execsql.metacommands.system import (
     x_cancel_halt_write,
     x_cancel_halt_email_clear,
     x_cancel_halt_email,
-    x_cancel_halt_exec,
+    x_cancel_halt_exec,  # noqa: F401
     x_cancel_halt_exec_clear,
     x_error_halt_write_clear,
     x_error_halt_write,
     x_error_halt_email_clear,
     x_error_halt_email,
-    x_error_halt_exec,
+    x_error_halt_exec,  # noqa: F401
     x_error_halt_exec_clear,
     x_write_warnings,
     x_gui_level,
@@ -204,17 +204,18 @@ from execsql.metacommands.system import (
 # Regex helper functions (from utils/regex.py)
 from execsql.utils.regex import (
     ins_rxs,
-    ins_quoted_rx,
+    ins_quoted_rx,  # noqa: F401
     ins_schema_rxs,
     ins_table_rxs,
     ins_table_list_rxs,
     ins_fn_rxs,
 )
+from execsql.script import MetaCommandList
 
 
-def build_dispatch_table() -> _state.MetaCommandList:
+def build_dispatch_table() -> MetaCommandList:
     """Construct and return the complete metacommand dispatch table."""
-    mcl = _state.MetaCommandList()
+    mcl = MetaCommandList()
 
     # ------------------------------------------------------------------
     # DEBUG metacommands
@@ -1040,7 +1041,6 @@ def build_dispatch_table() -> _state.MetaCommandList:
         x_halt,
     )
     for errmsg_delim in (r"\[", r"\#", r"\`", r"\'", r"\~", r'"'):
-        close = errmsg_delim.replace("\\", "") if errmsg_delim.startswith("\\") else errmsg_delim
         # Use the same open/close bracket pair for the errmsg capture
         open_c = errmsg_delim if not errmsg_delim.startswith("\\") else errmsg_delim[1:]
         close_c = "]" if open_c == "[" else open_c

execsql/metacommands/conditions.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+from execsql.exceptions import ErrInfo
 
 """
 Conditional test handler functions for execsql.
@@ -15,10 +16,19 @@ at registration time.
 
 import os
 import time
-from typing import Any, Callable
+from pathlib import Path
+from typing import Any
+from collections.abc import Callable
 
 import execsql.state as _state
-from execsql.utils.regex import ins_fn_rxs, ins_rxs
+from execsql.utils.regex import ins_fn_rxs
+from execsql.parser import CondParser
+from execsql.script import MetaCommandList
+from execsql.types import DT_Boolean, DT_Date, DT_Timestamp, DT_TimestampTZ
+from execsql.utils.datetime import parse_datetime
+from execsql.utils.errors import exception_desc
+from execsql.utils.gui import gui_console_isrunning
+from execsql.utils.strings import unquoted
 
 
 def xf_contains(**kwargs: Any) -> bool:
@@ -53,10 +63,10 @@ def xf_hasrows(**kwargs: Any) -> bool:
     sql = f"select count(*) from {queryname};"
     try:
         hdrs, rec = _state.dbs.current().select_data(sql)
-    except _state.ErrInfo:
+    except ErrInfo:
         raise
     except Exception:
-        raise _state.ErrInfo("db", sql, exception_msg=_state.exception_desc())
+        raise ErrInfo("db", sql, exception_msg=exception_desc())
     nrows = rec[0][0]
     return nrows > 0
 
@@ -71,12 +81,12 @@ def xf_dialogcanceled(**kwargs: Any) -> bool:
 
 def xf_fileexists(**kwargs: Any) -> bool:
     filename = kwargs["filename"]
-    return os.path.isfile(filename.strip())
+    return Path(filename.strip()).is_file()
 
 
 def xf_direxists(**kwargs: Any) -> bool:
     dirname = kwargs["dirname"]
-    return os.path.isdir(dirname.strip())
+    return Path(dirname.strip()).is_dir()
 
 
 def xf_schemaexists(**kwargs: Any) -> bool:
@@ -115,7 +125,7 @@ def xf_sub_empty(**kwargs: Any) -> bool:
     else:
         subvarset = _state.commandliststack[-1].paramvals
     if not subvarset.sub_exists(varname):
-        raise _state.ErrInfo(
+        raise ErrInfo(
             type="cmd",
             command_text=kwargs["metacommandline"],
             other_msg=f"Unrecognized substitution variable name: {varname}",
@@ -136,10 +146,10 @@ def xf_equals(**kwargs: Any) -> bool:
     converters = (
         int,
         float,
-        _state.DT_Timestamp().from_data,
-        _state.DT_TimestampTZ().from_data,
-        _state.DT_Date().from_data,
-        _state.DT_Boolean().from_data,
+        DT_Timestamp().from_data,
+        DT_TimestampTZ().from_data,
+        DT_Date().from_data,
+        DT_Boolean().from_data,
     )
     for convf in converters:
         try:
@@ -171,7 +181,7 @@ def xf_iszero(**kwargs: Any) -> bool:
     try:
         v = float(val)
     except Exception:
-        raise _state.ErrInfo(
+        raise ErrInfo(
             type="cmd",
             command_text=kwargs["metacommandline"],
             other_msg=f"The value {{{val}}} is not numeric.",
@@ -186,7 +196,7 @@ def xf_isgt(**kwargs: Any) -> bool:
         v1 = float(val1)
         v2 = float(val2)
     except Exception:
-        raise _state.ErrInfo(
+        raise ErrInfo(
             type="cmd",
             command_text=kwargs["metacommandline"],
             other_msg=f"Values {{{val1}}} and {{{val2}}} are not both numeric.",
@@ -201,7 +211,7 @@ def xf_isgte(**kwargs: Any) -> bool:
         v1 = float(val1)
         v2 = float(val2)
     except Exception:
-        raise _state.ErrInfo(
+        raise ErrInfo(
             type="cmd",
             command_text=kwargs["metacommandline"],
             other_msg=f"Values {{{val1}}} and {{{val2}}} are not both numeric.",
@@ -210,11 +220,11 @@ def xf_isgte(**kwargs: Any) -> bool:
 
 
 def xf_boolliteral(**kwargs: Any) -> bool:
-    return _state.unquoted(kwargs["value"].strip()).lower() in ("true", "yes", "1")
+    return unquoted(kwargs["value"].strip()).lower() in ("true", "yes", "1")
 
 
 def xf_istrue(**kwargs: Any) -> bool:
-    return _state.unquoted(kwargs["value"].strip()).lower() in ("yes", "y", "true", "t", "1")
+    return unquoted(kwargs["value"].strip()).lower() in ("yes", "y", "true", "t", "1")
 
 
 def xf_dbms(**kwargs: Any) -> bool:
@@ -249,33 +259,33 @@ def xf_metacommanderror(**kwargs: Any) -> bool:
 
 
 def xf_console(**kwargs: Any) -> bool:
-    return _state.gui_console_isrunning()
+    return gui_console_isrunning()
 
 
 def xf_newer_file(**kwargs: Any) -> bool:
     file1 = kwargs["file1"]
     file2 = kwargs["file2"]
-    if not os.path.exists(file1):
-        raise _state.ErrInfo(type="cmd", other_msg=f"File {file1} does not exist.")
-    if not os.path.exists(file2):
-        raise _state.ErrInfo(type="cmd", other_msg=f"File {file2} does not exist.")
+    if not Path(file1).exists():
+        raise ErrInfo(type="cmd", other_msg=f"File {file1} does not exist.")
+    if not Path(file2).exists():
+        raise ErrInfo(type="cmd", other_msg=f"File {file2} does not exist.")
     return os.stat(file1).st_mtime > os.stat(file2).st_mtime
 
 
 def xf_newer_date(**kwargs: Any) -> bool:
     file1 = kwargs["file1"]
-    datestr = _state.unquoted(kwargs["datestr"])
-    if not os.path.exists(file1):
-        raise _state.ErrInfo(type="cmd", other_msg=f"File {file1} does not exist.")
-    dt_value = _state.parse_datetime(datestr)
+    datestr = unquoted(kwargs["datestr"])
+    if not Path(file1).exists():
+        raise ErrInfo(type="cmd", other_msg=f"File {file1} does not exist.")
+    dt_value = parse_datetime(datestr)
     if not dt_value:
-        raise _state.ErrInfo(type="cmd", other_msg=f"{datestr} can't be interpreted as a date/time.")
+        raise ErrInfo(type="cmd", other_msg=f"{datestr} can't be interpreted as a date/time.")
     return os.stat(file1).st_mtime > time.mktime(dt_value.timetuple())
 
 
 def build_conditional_table() -> Any:
     """Construct and return the conditional predicate dispatch table."""
-    mcl = _state.MetaCommandList()
+    mcl = MetaCommandList()
 
     # CONTAINS
     mcl.add(
@@ -607,16 +617,16 @@ CONDITIONAL_TABLE = build_conditional_table()
 
 
 def xcmd_test(teststr: str) -> bool:
-    result = _state.CondParser(teststr).parse().eval()
+    result = CondParser(teststr).parse().eval()
     if result is not None:
         return result
     else:
-        raise _state.ErrInfo(type="cmd", command_text=teststr, other_msg="Unrecognized conditional")
+        raise ErrInfo(type="cmd", command_text=teststr, other_msg="Unrecognized conditional")
 
 
 def file_size_date(filename: str) -> tuple[int, str]:
     """Returns the file size and date (as string) of the given file."""
-    s_file = os.path.abspath(filename)
+    s_file = str(Path(filename).resolve())
     f_stat = os.stat(s_file)
     return f_stat.st_size, time.strftime("%Y-%m-%d %H:%M", time.gmtime(f_stat.st_mtime))
 
@@ -632,8 +642,6 @@ def chainfuncs(*funcs: Callable) -> Callable:
 
 
 def as_none(item: Any) -> Any:
-    if isinstance(item, str) and len(item) == 0:
-        return None
-    elif isinstance(item, int) and item == 0:
+    if isinstance(item, str) and len(item) == 0 or isinstance(item, int) and item == 0:
         return None
     return item