execsql2 2.21.2__py3-none-any.whl → 2.22.1__py3-none-any.whl

execsql/script/parser.py

@@ -27,6 +27,7 @@ from __future__ import annotations
 import re
 from collections.abc import Iterable
 from pathlib import Path
+from typing import cast
 
 from execsql.exceptions import ErrInfo
 from execsql.utils.errors import write_warning
@@ -555,7 +556,7 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                         other_msg=_unclosed_block_msg(block_stack[-1]),
                     )
                 frame = block_stack[-1]
-                script_node = frame.node
+                script_node = cast(ScriptBlock, frame.node)
                 if end_name is not None and end_name != script_node.name:  # type: ignore[union-attr]
                     raise ErrInfo(
                         type="cmd",
@@ -619,8 +620,8 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                 frame = block_stack[-1]
                 frame._in_else = False
                 frame._in_elseif = True
-                if_node = frame.node
-                if_node.elseif_clauses.append(  # type: ignore[union-attr]
+                if_node = cast(IfBlock, frame.node)
+                if_node.elseif_clauses.append(
                     ElseIfClause(
                         condition=m.group("cond").strip(),
                         span=SourceSpan(source_name, file_lineno),
@@ -643,11 +644,11 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                     span=SourceSpan(source_name, file_lineno),
                 )
                 frame = block_stack[-1]
-                if_node = frame.node
-                if frame._in_elseif and if_node.elseif_clauses:  # type: ignore[union-attr]
-                    if_node.elseif_clauses[-1].condition_modifiers.append(modifier)  # type: ignore[union-attr]
+                if_node = cast(IfBlock, frame.node)
+                if frame._in_elseif and if_node.elseif_clauses:
+                    if_node.elseif_clauses[-1].condition_modifiers.append(modifier)
                 else:
-                    if_node.condition_modifiers.append(modifier)  # type: ignore[union-attr]
+                    if_node.condition_modifiers.append(modifier)
                 continue
 
             # -- ORIF --
@@ -665,11 +666,11 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                     span=SourceSpan(source_name, file_lineno),
                 )
                 frame = block_stack[-1]
-                if_node = frame.node
-                if frame._in_elseif and if_node.elseif_clauses:  # type: ignore[union-attr]
-                    if_node.elseif_clauses[-1].condition_modifiers.append(modifier)  # type: ignore[union-attr]
+                if_node = cast(IfBlock, frame.node)
+                if frame._in_elseif and if_node.elseif_clauses:
+                    if_node.elseif_clauses[-1].condition_modifiers.append(modifier)
                 else:
-                    if_node.condition_modifiers.append(modifier)  # type: ignore[union-attr]
+                    if_node.condition_modifiers.append(modifier)
                 continue
 
             # -- ELSE --
@@ -684,7 +685,7 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                 frame = block_stack[-1]
                 frame._in_else = True
                 frame._in_elseif = False
-                frame.node.else_span = SourceSpan(source_name, file_lineno)  # type: ignore[union-attr]
+                cast(IfBlock, frame.node).else_span = SourceSpan(source_name, file_lineno)
                 continue
 
             # -- ENDIF --

execsql/script/variables.py

@@ -91,7 +91,7 @@ class SubVarSet:
         self._lazy_providers: dict[str, Any] = {}
         self.prefix_list: list[str] = ["$", "&", "@"]
         # Don't construct/compile on init because deepcopy() can't handle compiled regexes.
-        self.var_rx = None
+        self.var_rx: re.Pattern[str] | None = None
 
     @property
     def substitutions(self) -> list[tuple]:
@@ -114,7 +114,9 @@ class SubVarSet:
     def var_name_ok(self, varname: str) -> bool:
         if self.var_rx is None:
             self.compile_var_rx()
-        return self.var_rx.match(varname) is not None
+        var_rx = self.var_rx
+        assert var_rx is not None
+        return var_rx.match(varname) is not None
 
     def check_var_name(self, varname: str) -> None:
         if not self.var_name_ok(varname.lower()):

execsql/state.pyi

@@ -0,0 +1,122 @@
+from __future__ import annotations
+
+import re
+import threading
+from contextlib import AbstractContextManager
+from dataclasses import dataclass
+from typing import Any
+
+from execsql.config import ConfigData, StatObj
+from execsql.db.base import DatabasePool
+from execsql.exporters.base import ExportMetadata, WriteSpec
+from execsql.script import CounterVars, MetaCommandList, ScriptExecSpec, SubVarSet
+from execsql.utils.fileio import FileWriter, Logger, TempFileMgr
+from execsql.utils.mail import MailSpec
+from execsql.utils.timer import Timer
+
+@dataclass
+class ExecFrame:
+    kind: str
+    label: str = ...
+    source: str = ...
+    line: int | None = ...
+    iteration: int = ...
+    params: dict[str, str] | None = ...
+    localvars: Any = ...
+    paramvals: Any = ...
+    paramnames: list[str] | None = ...
+    scope_ref: ExecFrame | None = ...
+
+varlike: re.Pattern[str]
+endloop_rx: re.Pattern[str]
+loop_rx: re.Pattern[str]
+defer_rx: re.Pattern[str]
+stringtypes: type[str]
+primary_vno: int
+secondary_vno: int
+tertiary_vno: int
+
+conf: ConfigData
+logfile_encoding: str
+last_command: Any
+upass: str | None
+err_halt_writespec: WriteSpec | None
+err_halt_email: MailSpec | None
+err_halt_exec: ScriptExecSpec | None
+cancel_halt_writespec: WriteSpec | None
+cancel_halt_mailspec: MailSpec | None
+cancel_halt_exec: ScriptExecSpec | None
+cmds_run: int
+exec_log: Logger
+subvars: SubVarSet
+status: StatObj
+output: Any
+filewriter: FileWriter
+counters: CounterVars
+timer: Timer
+dbs: DatabasePool
+tempfiles: TempFileMgr
+export_metadata: ExportMetadata
+metacommandlist: MetaCommandList
+conditionallist: MetaCommandList
+gui_console: Any
+gui_manager_queue: Any
+gui_manager_thread: threading.Thread | None
+profile_data: list[tuple[Any, ...]] | None
+step_mode: bool
+ast_scripts: dict[str, Any]
+include_chain: list[str]
+ast_exec_stack: list[ExecFrame]
+
+class RuntimeContext:
+    conf: ConfigData | None
+    logfile_encoding: str
+    last_command: Any
+    upass: str | None
+    err_halt_writespec: WriteSpec | None
+    err_halt_email: MailSpec | None
+    err_halt_exec: ScriptExecSpec | None
+    cancel_halt_writespec: WriteSpec | None
+    cancel_halt_mailspec: MailSpec | None
+    cancel_halt_exec: ScriptExecSpec | None
+    cmds_run: int
+    exec_log: Logger | None
+    subvars: SubVarSet | None
+    status: StatObj | None
+    output: Any
+    filewriter: FileWriter | None
+    counters: CounterVars | None
+    timer: Timer | None
+    dbs: DatabasePool | None
+    tempfiles: TempFileMgr | None
+    export_metadata: ExportMetadata | None
+    metacommandlist: MetaCommandList | None
+    conditionallist: MetaCommandList | None
+    gui_console: Any
+    gui_manager_queue: Any
+    gui_manager_thread: threading.Thread | None
+    profile_data: list[tuple[Any, ...]] | None
+    step_mode: bool
+    ast_scripts: dict[str, Any]
+    include_chain: list[str]
+    ast_exec_stack: list[ExecFrame]
+    def __init__(self) -> None: ...
+    def current_scope(self) -> ExecFrame | None: ...
+    def current_localvars(self) -> Any: ...
+    def current_paramvals(self) -> Any: ...
+    def outer_script_scopes(self) -> list[ExecFrame]: ...
+
+def xcmd_test(teststr: str) -> bool: ...
+def current_scope() -> ExecFrame | None: ...
+def current_localvars() -> Any: ...
+def current_paramvals() -> Any: ...
+def outer_script_scopes() -> list[ExecFrame]: ...
+def get_context() -> RuntimeContext: ...
+def set_context(ctx: RuntimeContext) -> None: ...
+def reset() -> None: ...
+def initialize(config: ConfigData, dispatch_table: object, conditional_table: object) -> None: ...
+
+class active_context(AbstractContextManager[RuntimeContext]):
+    def __init__(self, ctx: RuntimeContext) -> None: ...
+    def __enter__(self) -> RuntimeContext: ...
+    def __exit__(self, exc_type: object, exc: object, tb: object) -> None: ...

execsql/types.py

@@ -34,7 +34,9 @@ provided at module level for every supported DBMS:
 import collections
 import datetime
 import re
+from collections.abc import Callable
 from decimal import Decimal
+from typing import Any, cast
 
 from execsql.exceptions import DataTypeError, DbTypeError
 from execsql.utils.numeric import leading_zero_num
@@ -71,13 +73,13 @@ __all__ = [
 class DataType:
     """Abstract base class for all data-type matchers used during column inference."""
 
-    data_type_name = None
-    data_type = None
+    data_type_name: str = "unknown"
+    data_type: type[Any] = object
     lenspec = False  # Is a length specification required for a (SQL) declaration of this data type?
     varlen = False  # Do we need to know if a set of data values varies in length?
     precspec = False  # Do we need to know the precision and scale of the data?
-    precision = None  # Precision (total number of digits) for numeric values.
-    scale = None  # Scale (number of digits to the right of the decimal point) for numeric values.
+    precision: int | None = None  # Precision (total number of digits) for numeric values.
+    scale: int | None = None  # Scale (number of digits to the right of the decimal point) for numeric values.
     _CONV_ERR = "Can't convert %s"
 
     def __repr__(self) -> str:
@@ -402,7 +404,7 @@ class DT_Integer(DataType):
         if isinstance(data, str) and not self._INT_RX.match(data):
             raise DataTypeError(self.data_type_name, self._CONV_ERR % data)
         try:
-            i = int(data)
+            i = int(cast(Any, data))
         except Exception as e:
             raise DataTypeError(self.data_type_name, self._CONV_ERR % data) from e
         if leading_zero_num(data):
@@ -440,7 +442,7 @@ class DT_Long(DataType):
         if isinstance(data, str) and not data.isdigit():
             raise DataTypeError(self.data_type_name, self._CONV_ERR % data)
         try:
-            i = int(data)
+            i = int(cast(Any, data))
         except Exception as e:
             raise DataTypeError(self.data_type_name, self._CONV_ERR % data) from e
         return i
@@ -466,7 +468,7 @@ class DT_Float(DataType):
         if isinstance(data, str) and not self._FLOAT_RX.match(data):
             return False
         try:
-            float(data)
+            float(cast(Any, data))
         except Exception:
             return False
         return True
@@ -481,7 +483,7 @@ class DT_Float(DataType):
         if isinstance(data, str) and not self._FLOAT_RX.match(data):
             raise DataTypeError(self.data_type_name, self._CONV_ERR % data)
         try:
-            i = float(data)
+            i = float(cast(Any, data))
         except Exception as e:
             raise DataTypeError(self.data_type_name, self._CONV_ERR % data) from e
         return i
@@ -503,11 +505,16 @@ class DT_Decimal(DataType):
         # 'dec' should be Decimal.
         x = dec.as_tuple()
         digits = len(x.digits)
-        if x.exponent < 0 and abs(x.exponent) > digits:
-            self.precision = abs(x.exponent) + 1
+        exponent = x.exponent
+        if not isinstance(exponent, int):
+            self.precision = digits
+            self.scale = 0
+            return
+        if exponent < 0 and abs(exponent) > digits:
+            self.precision = abs(exponent) + 1
         else:
             self.precision = digits
-        self.scale = abs(x.exponent)
+        self.scale = abs(exponent)
 
     def _from_data(self, data: object) -> object:
         if data is None:
@@ -643,22 +650,22 @@ class DbType:
         #   3. a function to perform a dbms-specific modification of the type conversion result
         #   4. the precision for numeric data types.
         #   5. the scale for numeric data types.
-        self.dialect = None
+        self.dialect: dict[type[DataType], tuple[str, bool, str | None, Callable[[Any], Any] | None, Any, Any]] = {}
         # The dt_xlate dictionary translates one data type to another.
-        self.dt_xlate: dict = {}
+        self.dt_xlate: dict[type[DataType], type[DataType]] = {}
 
     def __repr__(self) -> str:
         return f"DbType({self.dbms_id!r}, {self.quotechars!r})"
 
     def name_datatype(
         self,
-        data_type: object,
+        data_type: type[DataType],
         dbms_name: str,
         length_required: bool = False,
-        casting_name: object = None,
-        conv_mod_fn: object = None,
-        precision: object = None,
-        scale: object = None,
+        casting_name: str | None = None,
+        conv_mod_fn: Callable[[Any], Any] | None = None,
+        precision: Any = None,
+        scale: Any = None,
     ) -> None:
         """Register a DBMS-specific SQL type name for a DataType class."""
         # data_type is a DataType class object.
@@ -666,11 +673,9 @@ class DbType:
         # length_required indicates whether length information is required.
         # casting_name is an alternate to the data type name to use in SQL "cast(x as <casting_name>)" expressions.
         # conv_mod_fn is a function that modifies the result of data_type().from_data(x).
-        if self.dialect is None:
-            self.dialect = {}
         self.dialect[data_type] = (dbms_name, length_required, casting_name, conv_mod_fn, precision, scale)
 
-    def datatype_name(self, data_type: object) -> str:
+    def datatype_name(self, data_type: type[DataType]) -> str:
         """Return the DBMS-specific SQL type name for the given DataType class."""
         # A convenience function to simplify access to data type names.
         try:
@@ -690,7 +695,7 @@ class DbType:
             return self.quotechars[0] + dbms_object + self.quotechars[1]
         return dbms_object
 
-    def spec_type(self, data_type: object) -> object:
+    def spec_type(self, data_type: type[DataType]) -> type[DataType]:
         """Return the translated data type, or the original if no translation exists."""
         # Returns a translated data type or the original if there is no translation.
         if data_type in self.dt_xlate:
@@ -700,11 +705,11 @@ class DbType:
     def column_spec(
         self,
         column_name: str,
-        data_type: object,
-        max_len: object = None,
+        data_type: type[DataType],
+        max_len: int | None = None,
         is_nullable: bool = False,
-        precision: object = None,
-        scale: object = None,
+        precision: int | None = None,
+        scale: int | None = None,
     ) -> str:
         """Return a column specification string suitable for a CREATE TABLE statement."""
         # Returns a column specification as it would be used in a CREATE TABLE statement.

execsql/utils/auth.py

@@ -26,6 +26,7 @@ Keyring service names follow the pattern
 """
 
 import getpass
+from typing import Any, cast
 
 import execsql.state as _state
 
@@ -181,6 +182,7 @@ def get_password(
     if other_msg is not None:
         prompt = f"{prompt}\n{other_msg}"
 
+    passwd = ""
     # Try GUI path if a GUI manager thread is running.
     use_gui = False
     try:
@@ -189,9 +191,10 @@ def get_password(
         gui_manager_thread = getattr(_state, "gui_manager_thread", None)
         gui_manager_queue = getattr(_state, "gui_manager_queue", None)
         if gui_manager_thread:
-            return_queue = queue.Queue()
+            return_queue: queue.Queue[Any] = queue.Queue()
             from execsql.utils.gui import GuiSpec, QUERY_CONSOLE
 
+            assert gui_manager_queue is not None
             gui_manager_queue.put(GuiSpec(QUERY_CONSOLE, {}, return_queue))
             user_response = return_queue.get(block=True)
             use_gui = user_response["console_running"]
@@ -215,10 +218,11 @@ def get_password(
                 "hidetext": True,
             }
             gui_manager_queue = getattr(_state, "gui_manager_queue", None)
+            assert gui_manager_queue is not None
             gui_manager_queue.put(GuiSpec(GUI_DISPLAY, gui_args, return_queue))
             user_response = return_queue.get(block=True)
             btn = user_response["button"]
-            passwd = user_response["return_value"]
+            passwd = cast(str, user_response["return_value"])
             if not btn and _state.status and _state.status.cancel_halt:
                 if _state.exec_log:
                     _state.exec_log.log_exit_halt(

execsql/utils/datetime.py

@@ -13,7 +13,7 @@ Delegates to ``dateutil.parser.parse()`` for robust, format-agnostic parsing.
 
 import datetime
 import re
-from typing import Any
+from typing import Any, cast
 
 from dateutil import parser as _dateutil_parser
 
@@ -66,7 +66,7 @@ def parse_datetime(datestr: Any) -> datetime.datetime | None:
     if _looks_time_only(datestr):
         return None
     try:
-        return _dateutil_parser.parse(datestr)
+        return cast(datetime.datetime, _dateutil_parser.parse(datestr))
     except (ValueError, OverflowError, TypeError):
         return None
 
@@ -90,7 +90,7 @@ def parse_datetimetz(data: Any) -> datetime.datetime | None:
     if _looks_numeric(data):
         return None
     try:
-        dt = _dateutil_parser.parse(data)
+        dt = cast(datetime.datetime, _dateutil_parser.parse(data))
     except (ValueError, OverflowError, TypeError):
         return None
     if dt.tzinfo is None or dt.tzinfo.utcoffset(dt) is None:

execsql/utils/errors.py

@@ -48,11 +48,13 @@ def exception_info() -> tuple:
     exc_param = sys.exc_info()[1]
     if isinstance(exc_param, str):
         exc_message = exc_param
-    else:
-        if hasattr(exc_param, "message") and isinstance(exc_param.message, str) and len(exc_param.message) > 0:
-            exc_message = exc_param.message
-        elif hasattr(exc_param, "value") and isinstance(exc_param.value, str) and len(exc_param.value) > 0:
-            exc_message = exc_param.value
+    elif exc_param is not None:
+        message = getattr(exc_param, "message", None)
+        value = getattr(exc_param, "value", None)
+        if isinstance(message, str) and len(message) > 0:
+            exc_message = message
+        elif isinstance(value, str) and len(value) > 0:
+            exc_message = value
         else:
             exc_message = str(exc_param)
     try: