execsql2 2.11.0__py3-none-any.whl → 2.12.0__py3-none-any.whl

execsql/metacommands/control.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from execsql.exceptions import ErrInfo
 
 """
 Control-flow metacommand handlers for execsql.
@@ -18,6 +17,8 @@ Implements the imperative ``x_*`` functions for script flow control:
 """
 
 import time
+
+from execsql.exceptions import ErrInfo
 from typing import Any
 
 import execsql.state as _state
@@ -62,7 +63,8 @@ def x_assert(**kwargs: Any) -> None:
 
     result = _state.xcmd_test(condition)
     if result:
-        _state.exec_log.log_user_msg(f"ASSERT passed: {condition}")
+        if _state.exec_log is not None:
+            _state.exec_log.log_user_msg(f"ASSERT passed: {condition}")
     else:
         raise ErrInfo(type="cmd", other_msg=message)
 
@@ -134,14 +136,6 @@ def x_loop(**kwargs: Any) -> None:
         )
 
 
-def endloop() -> None:
-    if len(_state.loopcommandstack) == 0:
-        raise ErrInfo("error", other_msg="END LOOP metacommand without a matching preceding LOOP metacommand.")
-    _state.compiling_loop = False
-    _state.commandliststack.append(_state.loopcommandstack[-1])
-    _state.loopcommandstack.pop()
-
-
 def x_halt(**kwargs: Any) -> None:
     errmsg = kwargs["errmsg"]
     tee = kwargs["tee"]

execsql/metacommands/debug.py

@@ -74,7 +74,7 @@ def x_debug_log_subvars(**kwargs: Any) -> None:
     local = kwargs["local"]
     user = kwargs["user"]
     for s in _state.commandliststack[-1].localvars.substitutions:
-        _state.exec_log.log_status_info(f"Substitution [{s}] = [{s}]")
+        _state.exec_log.log_status_info(f"Substitution [{s[0]}] = [{s[1]}]")
     if local is None:
         for s in _state.subvars.substitutions:
             if user is None or s[0][0].isalnum() or s[0][0] == "_":

execsql/metacommands/dispatch.py

@@ -100,7 +100,7 @@ from execsql.metacommands.debug import (
     x_debug_write_odbc_drivers,
     x_debug_write_subvars,
 )
-from execsql.metacommands.debug_repl import x_breakpoint
+from execsql.debug.repl import x_breakpoint
 from execsql.metacommands.io import (
     x_cd,
     x_copy,

execsql/script/engine.py

@@ -194,7 +194,7 @@ class MetaCommandList:
         patterns; each compiles into a separate :class:`MetaCommand` prepended to
         the dispatch list so that later registrations take priority.
         """
-        if type(matching_regexes) in (tuple, list):
+        if isinstance(matching_regexes, (tuple, list)):
             raw_patterns = list(matching_regexes)
             regexes = [re.compile(rx, re.I) for rx in raw_patterns]
         else:
@@ -305,9 +305,14 @@ class SqlStmt:
             except Exception:
                 e = ErrInfo(type="exception", exception_msg=exception_desc())
             if e:
+                from execsql.utils.errors import stamp_errinfo
+
+                stamp_errinfo(e)
                 _state.subvars.add_substitution("$LAST_ERROR", cmd)
-                _state.subvars.add_substitution("$ERROR_MESSAGE", str(e))
+                _state.subvars.add_substitution("$ERROR_MESSAGE", e.errmsg())
                 _state.status.sql_error = True
+                if _state.exec_log is not None:
+                    _state.exec_log.log_status_info(f"SQL error: {e.errmsg()}")
                 if _state.status.halt_on_err:
                     from execsql.utils.errors import exit_now
 
@@ -349,9 +354,14 @@ class MetacommandStmt:
         except Exception:
             e = ErrInfo(type="exception", exception_msg=exception_desc())
         if e:
+            from execsql.utils.errors import stamp_errinfo
+
+            stamp_errinfo(e)
             _state.status.metacommand_error = True
             _state.subvars.add_substitution("$LAST_ERROR", cmd)
-            _state.subvars.add_substitution("$ERROR_MESSAGE", str(e))
+            _state.subvars.add_substitution("$ERROR_MESSAGE", e.errmsg())
+            if _state.exec_log is not None:
+                _state.exec_log.log_status_info(f"Metacommand error: {e.errmsg()}")
             if _state.status.halt_on_metacommand_err:
                 # Re-raise the original ErrInfo so its message is preserved, not
                 # replaced with the generic "Unknown metacommand" text.
@@ -495,9 +505,9 @@ class CommandList:
             _state.subvars.add_substitution("$SCRIPT_LINE", str(cmditem.line_no))
             if _state.step_mode:
                 _state.step_mode = False
-                from execsql.metacommands.debug_repl import _debug_repl
+                from execsql.debug.repl import _debug_repl
 
-                _debug_repl()
+                _debug_repl(step=True)
             _profiling = _state.profile_data is not None
             if _profiling:
                 import time as _time

execsql/state.py

@@ -336,8 +336,7 @@ class _StateModule(types.ModuleType):
             # via setattr (local) or delattr (non-local).  Since context
             # attrs live on _ctx, not __dict__, patch takes the delattr
             # path.  We reset to the default rather than truly deleting.
-            _defaults = RuntimeContext()
-            setattr(self.__dict__["_ctx"], name, getattr(_defaults, name))
+            setattr(self.__dict__["_ctx"], name, getattr(_DEFAULT_CTX, name))
         else:
             super().__delattr__(name)
 
@@ -468,4 +467,5 @@ def initialize(
 # ---------------------------------------------------------------------------
 
 _ctx = RuntimeContext()
+_DEFAULT_CTX = RuntimeContext()  # Cached defaults for __delattr__ reset
 sys.modules[__name__].__class__ = _StateModule

execsql/utils/gui.py

@@ -358,13 +358,35 @@ def gui_console_wait_user(message: str = "") -> None:
         print(message, file=sys.stderr)
 
 
-def gui_console_width() -> int:
-    """Return the current console width in characters."""
+def gui_console_width(width: int | None = None) -> int:
+    """Get or set the console width in characters.
+
+    When *width* is provided, updates the active GUI console (if any).
+    Always returns the current width.
+    """
+    global _console_width
+    if width is not None:
+        import execsql.state as _state
+
+        _console_width = int(width)
+        if _state.gui_console is not None and hasattr(_state.gui_console, "set_width"):
+            _state.gui_console.set_width(_console_width)
     return _console_width
 
 
-def gui_console_height() -> int:
-    """Return the current console height in lines."""
+def gui_console_height(height: int | None = None) -> int:
+    """Get or set the console height in lines.
+
+    When *height* is provided, updates the active GUI console (if any).
+    Always returns the current height.
+    """
+    global _console_height
+    if height is not None:
+        import execsql.state as _state
+
+        _console_height = int(height)
+        if _state.gui_console is not None and hasattr(_state.gui_console, "set_height"):
+            _state.gui_console.set_height(_console_height)
     return _console_height
 
 

{execsql2-2.11.0.dist-info → execsql2-2.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.11.0
+Version: 2.12.0
 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
@@ -220,8 +220,11 @@ execsql script.sql                          # read connection from config file
 | `-v {0,1,2,3}`                      | GUI level (0=none, 1=password, 2=selection, 3=full)             |
 | `-w`                                | Skip password prompt when a username is supplied                |
 | `--dsn URL`                         | Connection string (e.g. `postgresql://user:pass@host/db`)       |
+| `--output-dir DIR`                  | Default base directory for EXPORT output files                  |
 | `--dry-run`                         | Parse the script and report commands without executing          |
 | `--lint`                            | Static analysis: check structure and warn on issues (no DB)     |
+| `--ping`                            | Test database connectivity and exit                             |
+| `--profile`                         | Show per-statement timing summary after execution               |
 | `--progress`                        | Show a progress bar for long-running IMPORT operations          |
 | `--debug`                           | Start in step-through debug mode (REPL pauses before each stmt) |
 | `--dump-keywords`                   | Print metacommand keywords as JSON and exit                     |
@@ -298,7 +301,7 @@ execsql-format --check scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.4.4
+    rev: v2.11.0
     hooks:
       - id: execsql-format
         args: [--in-place]

{execsql2-2.11.0.dist-info → execsql2-2.12.0.dist-info}/RECORD

@@ -7,13 +7,13 @@ execsql/format.py,sha256=-6iknDddqbkapMo4NKmT5LAynDLqMW5kHgDWRg0KSws,11990
 execsql/models.py,sha256=DxkGp9iWbuZDWPGmnxZp9mvEeyOwxEJNx94fxQQiLfQ,13538
 execsql/parser.py,sha256=mbNSMiAMR1NvNvFtQAZq6nxBOupMGJZXSimLWLtZeNs,15537
 execsql/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-execsql/state.py,sha256=ovUQOr78R3LzsDUzBLL9Bq9ZdHiiFVlBvCNzilQ-K-s,15055
+execsql/state.py,sha256=29b3SwG4GirED2KVQc-cCC7Z_-FsGN3fEt9xQNN-Puo,15090
 execsql/types.py,sha256=HVWb4umIB9lpxCGgqk3xy1hoGYPfN39xci5mHF0Izq4,31882
-execsql/cli/__init__.py,sha256=dPKq7KOY7soD1GfBEztoRWcKuDLY5QyhzgC6PuyeyII,16270
+execsql/cli/__init__.py,sha256=YXxOVF2lNkCkifXyjoC7yWrhHJFT9PzI7cnCzsLJwT8,16488
 execsql/cli/dsn.py,sha256=svaZtrUXFRL2W5G6FRRiKtR6kehOp7urrVhIx_642Z8,2820
 execsql/cli/help.py,sha256=Sn_TgSJiQeBx-xZH0fuP5OvR_wasSTumjWF9UHfIX5k,5414
-execsql/cli/lint.py,sha256=KluYROdjGJNUrVbO3cJym-H296zbih4no-F10HF0P4U,16165
-execsql/cli/run.py,sha256=p4QWuBO7WvMPAJDyLtwiVZAdpwjgq1H3wz__WgUiRKA,30218
+execsql/cli/lint.py,sha256=XWuVcEsheZ8ql48VFWqICWEkAUezB2nIePX6SUiKSg8,16109
+execsql/cli/run.py,sha256=JGfndnBnJMkEqbz26pflhEdXDScZNIdGu6b6jTRLYl8,30681
 execsql/db/__init__.py,sha256=jTbuafuKOqYtXFR1wvCOoKK5Lr3l1uErfaIbIr6UywI,1063
 execsql/db/access.py,sha256=L79gUnAnnM9EJ_f4k42jr7DI0qGcKtLOnJTlBC7uPm0,17879
 execsql/db/base.py,sha256=hfMFj8fXY0T1aXLvWJHqb0aU4EQUDFOc-YrS29HH8U4,30405
@@ -26,6 +26,8 @@ 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/debug/__init__.py,sha256=j6EGUR0dHzUhWN1mHHtf1-Lhjq3Sb1V-vmnq2Ztgj1M,178
+execsql/debug/repl.py,sha256=HeQ9emFKUjo7UTouxuTcmpGCTJIR1nOLxKkRJ5mvd2c,16669
 execsql/exporters/__init__.py,sha256=-Cnji-OgodJV8ftcDcOyTof0kQMy9J5kKVC8GVFpc3o,670
 execsql/exporters/base.py,sha256=W9USFyk_2eztjJ51X6CJh7-chE1i3cSx-STOtbHXCNI,6373
 execsql/exporters/delimited.py,sha256=zMvurTRVl5W-6N8DuYtn_xILUkYLMlfflwWMfvdeaF0,30304
@@ -44,9 +46,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/xlsx.py,sha256=Gm8ns_KeqSMu2DONSSJ1DcwPBEjYwpbU7frmX0g5L7c,11487
 execsql/exporters/xml.py,sha256=lqcOM8uKDoCayU42BPSLNH1_2DIHU5D3LtQItREU90c,2564
-execsql/exporters/yaml.py,sha256=0bwLDU3Fy00yMryBOSBSptbjV8Re6Ks-b62DObFNP4o,3062
+execsql/exporters/yaml.py,sha256=1Vuc6uMDuLTkCuXCfXWKz4gLkkAVdEXkLs4gEB_67Xo,3110
 execsql/exporters/zip.py,sha256=9-hExltQorONNThiMfxPDYHqHsbTeq9zM9zmtG4oFb8,4410
 execsql/gui/__init__.py,sha256=oCb-cyhLZzVpWJ4WU5HbqEDBrV-lm0ytEwxemrOZyqs,2048
 execsql/gui/base.py,sha256=sfNRkDrf7FhIgMRUOdyZpRLS1Xk9RqNhrV0A1RP6PXU,6068
@@ -59,14 +61,13 @@ 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=TT1ARHgHltHqZ7qx4Y62o1h_GOPvUztZKCem-wAE560,11215
-execsql/metacommands/conditions.py,sha256=QUpevCHce9kbKpt6XpHkc73q3bYAIfaBin0b6eaJnYQ,29259
+execsql/metacommands/__init__.py,sha256=EmYUZZq1oaubbSQ26-8F9jJI_JnOJ2R697NeossXF1Q,11202
+execsql/metacommands/conditions.py,sha256=Fzrk83-pWbFOoKahYdQW7CZjQeh3zByDUbfgpTM_bjQ,29259
 execsql/metacommands/connect.py,sha256=Nsm0D91i3RX-R2rzQQ-Br-gULaI6Uvdn9fqb7DOAVfE,14804
-execsql/metacommands/control.py,sha256=CBCg0ZKSR-BGejBW5cXwk6aJ9VrYBzCg9C40ofi8qi8,8776
+execsql/metacommands/control.py,sha256=xNHyTrYUM042OgDarNq7HxslY7JuQs-KOKcb-fHUngM,8510
 execsql/metacommands/data.py,sha256=tRQBGTAuW-eJ2tBNWaoZI9OjTyNNyHJISo7gOdL-sm8,11370
-execsql/metacommands/debug.py,sha256=nmfQ2ijUbTQO3drnyV9EzFueGSTfMl-CddP_NlQyI14,8178
-execsql/metacommands/debug_repl.py,sha256=TA4aDWgl_wvR63R9ddBIF-vUB2wRamsxdxzeM8F3WZo,9805
-execsql/metacommands/dispatch.py,sha256=1Mae6yqrea6wViFLBsvVt33Zgx4xP8tnhOuB_aQC89c,84054
+execsql/metacommands/debug.py,sha256=pnT24dfvfOx8xFu86mO5czfVCGKbcvgBLyXnqaMWO4w,8184
+execsql/metacommands/dispatch.py,sha256=OQwLOo9XT3N9C96wsRt0zmu1Nn4HL-7cSBOsGCfp5V4,84041
 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
@@ -77,7 +78,7 @@ execsql/metacommands/script_ext.py,sha256=TUgAldB2LSJAwZrCvDDi804hQ1d9BDQD2GDqHN
 execsql/metacommands/system.py,sha256=sUR5kLL7idTVg8WXIMdd-Kv7nkERIiaeL0beWsz8NyY,7293
 execsql/script/__init__.py,sha256=pIo0EJ7-vg67rSMbOvbri_BOUgLoGoSEUfJgxUN7ZS0,3380
 execsql/script/control.py,sha256=s-1eZdGARM6H1FwZ6VDdO_f50j7bvvRtTHesfUm9tbc,6144
-execsql/script/engine.py,sha256=PqR8_5CUoHu1Wm8uLfudGN08h_vWD_3diYzlKhuqdgU,40633
+execsql/script/engine.py,sha256=NJk4Is7Lp2Ov6zO8NNOOU8ACfmIFs2dD7PdhvJn6nNQ,41083
 execsql/script/variables.py,sha256=MOT9XEHucpuuuHQZM5bklxGMBQcwHzwTBxd0q3aO0XY,11641
 execsql/utils/__init__.py,sha256=0uR6JwVJQRX3vceByNBduCAf5dd5assKjeqJUWvpZoA,278
 execsql/utils/auth.py,sha256=onXzNkNZQZxGC5w7eey06sjvAIAX_Lf9g7nUJtcsel0,7009
@@ -85,30 +86,30 @@ execsql/utils/crypto.py,sha256=2OnBWwn9bCBGc1ZkyRv16TvhottoCNYtXqgbE3mG3Sg,2960
 execsql/utils/datetime.py,sha256=V_itd5vVvUPjT86P_z_hh4mlerMDGhDzI5MwPMDBaI4,7715
 execsql/utils/errors.py,sha256=YKhYD27-3timuZavc2vIrRIfHa71vzih-KVPsAKgvkU,8163
 execsql/utils/fileio.py,sha256=F6M4osE0Mb2ycTcvwwcYnhBXH1L36v6d7Oxdab6J16s,24110
-execsql/utils/gui.py,sha256=kCfHvqY60jdoJa1k5HlxhrmzM4HPp7uajV6nxz3_Qh4,17583
+execsql/utils/gui.py,sha256=UFtwrXPNqNvZCJFCbumZ1aG2d9B-vyaJXIG83fDHteo,18409
 execsql/utils/mail.py,sha256=75A1cMnEfyP0_QMMWuSLv8hrcIjc9cGBCrttLpr2TXQ,5372
 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.11.0.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.11.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.11.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.11.0.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
-execsql2-2.11.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.11.0.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.11.0.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.11.0.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.11.0.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.11.0.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.11.0.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.11.0.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.11.0.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.11.0.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.11.0.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.11.0.dist-info/METADATA,sha256=Cmn0y2Xx2ZC-S3lsADP1gSyoCCfAsUGj8wlbyVJ6e8c,17062
-execsql2-2.11.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.11.0.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.11.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.11.0.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.11.0.dist-info/RECORD,,
+execsql2-2.12.0.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.12.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.12.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.12.0.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
+execsql2-2.12.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.12.0.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
+execsql2-2.12.0.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
+execsql2-2.12.0.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
+execsql2-2.12.0.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
+execsql2-2.12.0.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
+execsql2-2.12.0.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
+execsql2-2.12.0.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
+execsql2-2.12.0.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
+execsql2-2.12.0.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
+execsql2-2.12.0.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
+execsql2-2.12.0.dist-info/METADATA,sha256=l6mKQU4tPA9vkX6ZlUWNFRbou5rw5KPLML8V3urrV10,17381
+execsql2-2.12.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.12.0.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.12.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.12.0.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
+execsql2-2.12.0.dist-info/RECORD,,

execsql/metacommands/debug_repl.py

@@ -1,288 +0,0 @@
-from __future__ import annotations
-
-"""
-Interactive debug REPL metacommand handler for execsql.
-
-Implements ``x_breakpoint`` — the ``BREAKPOINT`` metacommand — which pauses
-script execution and drops into an interactive read-eval-print loop.
-
-The REPL allows the user to:
-
-- Inspect and print substitution variables.
-- Run ad-hoc SQL queries against the current database.
-- Step through the script one statement at a time.
-- Resume or abort execution.
-
-All REPL commands are dot-prefixed (``.continue``, ``.vars``, ``.next``)
-to avoid ambiguity with variable names and SQL.  Anything not starting
-with ``.`` is treated as either a variable lookup (if it matches a known
-variable) or SQL (if it ends with ``;``).
-
-In non-interactive environments (CI, piped input, ``sys.stdin.isatty()`` is
-``False``) the metacommand is silently skipped so automated pipelines are not
-blocked.
-"""
-
-import sys
-from typing import Any
-
-import execsql.state as _state
-
-__all__ = ["x_breakpoint"]
-
-# ---------------------------------------------------------------------------
-# Public handler
-# ---------------------------------------------------------------------------
-
-_HELP_TEXT = """\
-execsql debug REPL — all commands start with '.'
-
-  .continue  .c       Resume script execution
-  .abort     .q       Halt the script (exit 1)
-  .vars               List user, system, local, and counter variables
-  .vars all           Include environment variables (&) in the listing
-  .next      .n       Execute the next statement then pause again (step mode)
-  .stack              Show the command-list stack (script name, line, depth)
-  .help               Show this help text
-
-Everything else:
-  varname             Print a variable's value (e.g. logfile, $ARG_1, &HOME)
-  SELECT ...;         Run ad-hoc SQL against the current database
-"""
-
-
-def x_breakpoint(**kwargs: Any) -> None:
-    """Pause execution and enter the interactive debug REPL.
-
-    If ``sys.stdin`` is not a TTY (CI, piped input), the metacommand is
-    silently skipped — scripts will not hang in automation.
-
-    Args:
-        **kwargs: Keyword arguments injected by the dispatch table (unused).
-    """
-    if not sys.stdin.isatty():
-        return
-    _debug_repl()
-
-
-# ---------------------------------------------------------------------------
-# REPL core
-# ---------------------------------------------------------------------------
-
-
-def _debug_repl() -> None:
-    """Interactive read-eval-print loop for script debugging.
-
-    Reads commands from stdin until the user types ``.continue`` or ``.abort``,
-    or until EOF / KeyboardInterrupt.
-    """
-    try:
-        import readline as _readline  # noqa: F401 — side-effect: enables history/arrow keys
-    except ImportError:
-        pass  # readline not available on Windows; continue without it
-
-    _write("\n[Breakpoint] Script paused. Type '.help' for commands, '.c' to resume.\n")
-
-    while True:
-        try:
-            line = input("execsql debug> ").strip()
-        except EOFError:
-            _write("\n")
-            return  # Ctrl-D → continue
-        except KeyboardInterrupt:
-            _write("\n")
-            return  # Ctrl-C → continue
-
-        if not line:
-            continue
-
-        # Dot-prefixed → REPL command
-        if line.startswith("."):
-            _handle_dot_command(line)
-            if line.lower().lstrip(".") in ("continue", "c"):
-                return
-            if line.lower().lstrip(".") in ("abort", "q", "quit"):
-                # _handle_dot_command already raised SystemExit, but guard anyway
-                return
-            if line.lower().lstrip(".") in ("next", "n"):
-                return
-            continue
-
-        # SQL (ends with semicolon)
-        if line.rstrip().endswith(";"):
-            _run_sql(line)
-            continue
-
-        # Everything else → variable lookup
-        _print_var(line)
-
-
-def _handle_dot_command(line: str) -> None:
-    """Dispatch a dot-prefixed REPL command."""
-    # Strip the leading dot and normalize
-    cmd = line[1:].strip().lower()
-
-    if cmd in ("continue", "c"):
-        return  # caller checks and returns from _debug_repl
-    elif cmd in ("abort", "q", "quit"):
-        raise SystemExit(1)
-    elif cmd == "help":
-        _write(_HELP_TEXT)
-    elif cmd == "vars all":
-        _print_all_vars(include_env=True)
-    elif cmd == "vars":
-        _print_all_vars()
-    elif cmd == "stack":
-        _print_stack()
-    elif cmd in ("next", "n"):
-        _enable_step_mode()
-    else:
-        _write(f"  Unknown command: {line!r}. Type '.help' for available commands.\n")
-
-
-# ---------------------------------------------------------------------------
-# REPL command implementations
-# ---------------------------------------------------------------------------
-
-
-def _write(text: str) -> None:
-    """Write *text* to the execsql output stream (falls back to stdout)."""
-    output = _state.output
-    if output is not None:
-        output.write(text)
-    else:
-        sys.stdout.write(text)
-        sys.stdout.flush()
-
-
-def _print_all_vars(*, include_env: bool = False) -> None:
-    """Print substitution variables grouped by type."""
-    subvars = _state.subvars
-    if subvars is None:
-        _write("  (no substitution variables defined)\n")
-        return
-    items = subvars.substitutions  # list of (name, value) tuples
-    if not items:
-        _write("  (no substitution variables defined)\n")
-        return
-
-    # Group by prefix.
-    user_vars: list[tuple[str, str]] = []
-    system_vars: list[tuple[str, str]] = []
-    counter_vars: list[tuple[str, str]] = []
-    local_vars: list[tuple[str, str]] = []
-    env_vars: list[tuple[str, str]] = []
-
-    for name, value in sorted(items):
-        if name.startswith("&"):
-            env_vars.append((name, value))
-        elif name.startswith("~"):
-            local_vars.append((name, value))
-        elif name.startswith("@"):
-            counter_vars.append((name, value))
-        elif name.startswith("$"):
-            system_vars.append((name, value))
-        else:
-            user_vars.append((name, value))
-
-    def _print_group(label: str, group: list[tuple[str, str]]) -> None:
-        if not group:
-            return
-        _write(f"  {label}:\n")
-        max_name = max(len(n) for n, _ in group)
-        for name, value in group:
-            _write(f"    {name:<{max_name}}  =  {value}\n")
-
-    _print_group("User variables", user_vars)
-    _print_group("System variables ($)", system_vars)
-    _print_group("Local variables (~)", local_vars)
-    _print_group("Counter variables (@)", counter_vars)
-    if include_env:
-        _print_group("Environment variables (&)", env_vars)
-
-    if not any([user_vars, system_vars, local_vars, counter_vars]):
-        if env_vars:
-            _write("  (no script variables defined — use '.vars all' to see environment variables)\n")
-        else:
-            _write("  (no variables defined)\n")
-
-
-def _print_var(varname: str) -> None:
-    """Print the value of a single substitution variable.
-
-    Tries the name as typed, then with the sigil prefix stripped.
-    """
-    subvars = _state.subvars
-    if subvars is None:
-        _write(f"  {varname}: (substitution variables not initialised)\n")
-        return
-    # Try the name as typed first, then without the sigil prefix ($, &, @, #, ~).
-    # SUB creates variables without a prefix (e.g., "logfile"), but users
-    # may type "$logfile" at the prompt.
-    value = subvars.varvalue(varname)
-    if value is None and len(varname) > 1 and varname[0] in "$&@#~":
-        value = subvars.varvalue(varname[1:])
-    if value is None:
-        _write(f"  {varname}: (undefined)\n")
-    else:
-        _write(f"  {varname} = {value}\n")
-
-
-def _print_stack() -> None:
-    """Print the current command-list stack (script name, line number, depth)."""
-    stack = _state.commandliststack
-    if not stack:
-        _write("  (command list stack is empty)\n")
-        return
-    _write(f"  Stack depth: {len(stack)}\n")
-    for depth, cmdlist in enumerate(stack):
-        listname = getattr(cmdlist, "listname", "<unknown>")
-        cmdptr = getattr(cmdlist, "cmdptr", 0)
-        _write(f"  [{depth}] {listname}  (cursor at index {cmdptr})\n")
-
-
-def _run_sql(sql: str) -> None:
-    """Execute ad-hoc SQL against the current database and pretty-print the results."""
-    dbs = _state.dbs
-    if dbs is None:
-        _write("  (no database connection is active)\n")
-        return
-    db = dbs.current()
-    if db is None:
-        _write("  (no database connection is active)\n")
-        return
-    try:
-        colnames, rows = db.select_data(sql)
-    except Exception as exc:
-        _write(f"  SQL error: {exc}\n")
-        return
-
-    if not colnames:
-        _write("  (query returned no columns)\n")
-        return
-
-    # Build a simple text table.
-    col_widths = [len(c) for c in colnames]
-    str_rows: list[list[str]] = []
-    for row in rows:
-        str_row = [str(v) if v is not None else "NULL" for v in row]
-        str_rows.append(str_row)
-        for i, cell in enumerate(str_row):
-            col_widths[i] = max(col_widths[i], len(cell))
-
-    sep = "+-" + "-+-".join("-" * w for w in col_widths) + "-+"
-    header = "| " + " | ".join(c.ljust(col_widths[i]) for i, c in enumerate(colnames)) + " |"
-    _write(sep + "\n")
-    _write(header + "\n")
-    _write(sep + "\n")
-    for str_row in str_rows:
-        data_line = "| " + " | ".join(cell.ljust(col_widths[i]) for i, cell in enumerate(str_row)) + " |"
-        _write(data_line + "\n")
-    _write(sep + "\n")
-    row_word = "row" if len(str_rows) == 1 else "rows"
-    _write(f"  ({len(str_rows)} {row_word})\n")
-
-
-def _enable_step_mode() -> None:
-    """Activate step mode so the engine re-enters the REPL after the next statement."""
-    _state.step_mode = True