execsql2 2.16.14__py3-none-any.whl → 2.16.15__py3-none-any.whl

execsql/format.py

@@ -74,7 +74,6 @@ MULTIWORD_KEYWORDS = [
     "WITH TEMPLATE",
     "IN ZIPFILE",
     "SHOW SCRIPTS",
-    "SHOW SCRIPT",
 ]
 
 # Depth-tracking sets

execsql/metacommands/debug.py

@@ -7,8 +7,8 @@ Provides ``x_debug_write_metacommands``, which implements the
 ``WRITE METACOMMANDS`` debug metacommand that prints the full registered
 metacommand list to the log/console for troubleshooting.
 
-Also provides ``x_show_scripts`` and ``x_show_script`` for runtime
-introspection of registered SCRIPT blocks.
+Also provides ``x_show_scripts`` for runtime introspection of registered
+SCRIPT blocks.
 """
 
 from pathlib import Path
@@ -214,50 +214,54 @@ def _format_script_source(span: Any) -> str:
 
 
 # ---------------------------------------------------------------------------
-# SHOW SCRIPTS / SHOW SCRIPT metacommand handlers
+# SHOW SCRIPTS metacommand handler
 # ---------------------------------------------------------------------------
 
 
 def x_show_scripts(**kwargs: Any) -> None:
-    """List all registered SCRIPT definitions with parameters and source location."""
-    scripts = _state.ast_scripts
-    if not scripts:
-        _state.output.write("No scripts registered.\n")
-        return
-    _state.output.write(f"Registered scripts ({len(scripts)}):\n\n")
-    # Compute column width for alignment
-    sigs = {name: _format_script_signature(name, block.param_defs) for name, block in scripts.items()}
-    max_sig = max(len(s) for s in sigs.values())
-    for name, block in scripts.items():
-        sig = sigs[name]
-        src = _format_script_source(block.span)
-        _state.output.write(f"  {sig:<{max_sig}}  {src}\n")
-    _state.output.write("\n")
+    """List all registered scripts, or show detail for one script.
 
-
-def x_show_script(**kwargs: Any) -> None:
-    """Show detail for a single registered SCRIPT definition."""
-    script_name = kwargs.get("script_id", "").lower()
+    Without a name argument, lists all registered SCRIPT definitions with
+    their parameter signatures and source locations.  With a name, shows
+    detail for that script including parameters, source, and docstring.
+    """
+    script_name = (kwargs.get("script_id") or "").strip().lower()
     scripts = _state.ast_scripts
-    if script_name not in scripts:
-        _state.output.write(f"No script named '{script_name}' is registered.\n")
-        return
-    block = scripts[script_name]
-    sig = _format_script_signature(block.name, block.param_defs)
-    src = _format_script_source(block.span)
-    _state.output.write(f"Script: {sig}\n")
-    _state.output.write(f"Source: {src}\n")
-    if block.param_defs:
-        _state.output.write("Parameters:\n")
-        max_name = max(len(p.name) for p in block.param_defs)
-        for p in block.param_defs:
-            if p.default is not None:
-                _state.output.write(f"  {p.name:<{max_name}}  (optional, default: {p.default})\n")
-            else:
-                _state.output.write(f"  {p.name:<{max_name}}  (required)\n")
+
+    if script_name:
+        # ---------- detail for one script ----------
+        if script_name not in scripts:
+            _state.output.write(f"No script named '{script_name}' is registered.\n")
+            return
+        block = scripts[script_name]
+        sig = _format_script_signature(block.name, block.param_defs)
+        src = _format_script_source(block.span)
+        _state.output.write(f"Script: {sig}\n")
+        _state.output.write(f"Source: {src}\n")
+        if block.param_defs:
+            _state.output.write("Parameters:\n")
+            max_name = max(len(p.name) for p in block.param_defs)
+            for p in block.param_defs:
+                if p.default is not None:
+                    _state.output.write(f"  {p.name:<{max_name}}  (optional, default: {p.default})\n")
+                else:
+                    _state.output.write(f"  {p.name:<{max_name}}  (required)\n")
+        else:
+            _state.output.write("Parameters: (none)\n")
+        if block.doc:
+            _state.output.write("\n")
+            for doc_line in block.doc.split("\n"):
+                _state.output.write(f"  {doc_line}\n")
     else:
-        _state.output.write("Parameters: (none)\n")
-    if block.doc:
+        # ---------- list all scripts ----------
+        if not scripts:
+            _state.output.write("No scripts registered.\n")
+            return
+        _state.output.write(f"Registered scripts ({len(scripts)}):\n\n")
+        sigs = {name: _format_script_signature(name, block.param_defs) for name, block in scripts.items()}
+        max_sig = max(len(s) for s in sigs.values())
+        for name, block in scripts.items():
+            sig = sigs[name]
+            src = _format_script_source(block.span)
+            _state.output.write(f"  {sig:<{max_sig}}  {src}\n")
         _state.output.write("\n")
-        for doc_line in block.doc.split("\n"):
-            _state.output.write(f"  {doc_line}\n")

execsql/metacommands/dispatch.py

@@ -99,7 +99,6 @@ from execsql.metacommands.debug import (
     x_debug_write_metacommands,
     x_debug_write_odbc_drivers,
     x_debug_write_subvars,
-    x_show_script,
     x_show_scripts,
 )
 from execsql.debug.repl import x_breakpoint
@@ -1750,20 +1749,14 @@ def build_dispatch_table() -> MetaCommandList:
     )
 
     # ------------------------------------------------------------------
-    # SHOW SCRIPTS / SHOW SCRIPT
+    # SHOW SCRIPTS [<name>]
     # ------------------------------------------------------------------
     mcl.add(
-        r"^\s*SHOW\s+SCRIPTS\s*$",
+        r"^\s*SHOW\s+SCRIPTS\s*(?P<script_id>\w+)?\s*$",
         x_show_scripts,
         description="SHOW SCRIPTS",
         category="action",
     )
-    mcl.add(
-        r"^\s*SHOW\s+SCRIPT\s+(?P<script_id>\w+)\s*$",
-        x_show_script,
-        description="SHOW SCRIPT",
-        category="action",
-    )
 
     # ------------------------------------------------------------------
     # IF / ORIF / ANDIF / ELSEIF / ELSE / ENDIF

{execsql2-2.16.14.dist-info → execsql2-2.16.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.16.14
+Version: 2.16.15
 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: Homepage, https://execsql2.readthedocs.io
 Project-URL: Repository, https://github.com/geocoug/execsql

{execsql2-2.16.14.dist-info → execsql2-2.16.15.dist-info}/RECORD

@@ -3,7 +3,7 @@ execsql/__main__.py,sha256=HdbK-SAhyUmfB6xINY5AzxdMSxGzWSGEG_2dv42Jn64,315
 execsql/api.py,sha256=0D2Rl329fvDXERNrJBUzoWEt_VxqCHwRgaGzrq04rVs,19709
 execsql/config.py,sha256=6icjr8PKenUGfFF6lciSclvejjDzY8GTW1OZ1-IZt-Y,29480
 execsql/exceptions.py,sha256=j8hykBiof9H3Za9hwLIbDcVB2Xn65ODXXplp1jkvdgM,8453
-execsql/format.py,sha256=nftyFgzNuv9aGUsp07WD3SjfttZ_dPhY45zJ7ocObL4,24384
+execsql/format.py,sha256=Nvkvi1nWw1iTcLDPAlXwdnZfifJib2_kszojMSdZtBA,24365
 execsql/models.py,sha256=kCTUQg9-vReM6WNFfB_ZrEppuOW5u1uMBQThSkfPC0o,13264
 execsql/parser.py,sha256=P3ea8k7T_XLMrbhpFNZXwytdShrY302MKnhosqza1lo,15493
 execsql/plugins.py,sha256=2voLwT6eFap6BCBoZYndNNC_bMEJO1f_aP6xQTVXwYI,12815
@@ -69,8 +69,8 @@ execsql/metacommands/conditions.py,sha256=B6fBumkqoPO4wcQbw_ypYITaSnzPemAA1g5GrN
 execsql/metacommands/connect.py,sha256=Wnlp5PeeaNDaVlaWjCetvarTgQIwIeMPYe8cyslPYeA,14969
 execsql/metacommands/control.py,sha256=PlTAq34OkcmnOsPm3bZxF4mg1MaNBpENa8wzIKVEY10,8302
 execsql/metacommands/data.py,sha256=tRQBGTAuW-eJ2tBNWaoZI9OjTyNNyHJISo7gOdL-sm8,11370
-execsql/metacommands/debug.py,sha256=3QVm0N5uc7mcZco36kqlDq8tiWW0sdo8E8BoQZkE_DI,11784
-execsql/metacommands/dispatch.py,sha256=Gao7rwiBFdghmYKcbWVm21Va30evobQuoghLY_FOZto,87602
+execsql/metacommands/debug.py,sha256=bFEQhNnKjIJHfc7FuZXIhUwWA-D8bMX7b3Anm5BWJT0,12051
+execsql/metacommands/dispatch.py,sha256=DvpgpkX1yMWnJrVW8ir_o1xKgfZgXzlTt6IwP0Lwoek,87441
 execsql/metacommands/io.py,sha256=vlGBje5sgnqeilooMdhJDgSRIhysHy5_7LrKtik9Xjs,3011
 execsql/metacommands/io_export.py,sha256=iX4L3lpZGT2P5ca2C3XJ3MYxXJ_loC7nWmfKcWv4UGQ,13379
 execsql/metacommands/io_fileops.py,sha256=K7eHMAuCUEVpNITYnJhWaSmXtAnnx1ZaNIFnOwKtXzc,9456
@@ -99,24 +99,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.16.14.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.16.14.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.16.14.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.16.14.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
-execsql2-2.16.14.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.16.14.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.16.14.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.16.14.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.16.14.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.16.14.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.16.14.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.16.14.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.16.14.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.16.14.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.16.14.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.16.14.dist-info/METADATA,sha256=APNebYdwunkij8RDQOlTNkFS-BKMASdRLhNJefPx75o,20921
-execsql2-2.16.14.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.16.14.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.16.14.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.16.14.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.16.14.dist-info/RECORD,,
+execsql2-2.16.15.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.16.15.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.16.15.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.16.15.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
+execsql2-2.16.15.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.16.15.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
+execsql2-2.16.15.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
+execsql2-2.16.15.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
+execsql2-2.16.15.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
+execsql2-2.16.15.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
+execsql2-2.16.15.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
+execsql2-2.16.15.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
+execsql2-2.16.15.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
+execsql2-2.16.15.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
+execsql2-2.16.15.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
+execsql2-2.16.15.dist-info/METADATA,sha256=6QX4McX0vs9ywf8U7SeURBDnDsKMA4yOdLoQ7ke5uTQ,20921
+execsql2-2.16.15.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.16.15.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.16.15.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.16.15.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
+execsql2-2.16.15.dist-info/RECORD,,