execsql2 2.16.17__py3-none-any.whl → 2.17.0__py3-none-any.whl

execsql/debug/repl.py

@@ -546,7 +546,7 @@ def _print_script_detail(name: str) -> None:
         return
     block = scripts[script_name]
     sig = _format_script_signature(block.name, block.param_defs)
-    src = _format_script_source(block.span)
+    src = _format_script_source(block.span, full_path=True)
     _write_rule(f" {_c(_BOLD + _YELLOW, 'Script')} {_c(_DIM, '──')} {_c(_CYAN, sig)} ")
     _write(f"  {_c(_BOLD, 'Source:')}     {src}\n")
     if block.param_defs:

execsql/metacommands/debug.py

@@ -203,9 +203,19 @@ def _format_script_signature(name: str, param_defs: Any) -> str:
     return f"{name}({', '.join(parts)})"
 
 
-def _format_script_source(span: Any) -> str:
-    """Return ``file:start-end`` from a SourceSpan."""
-    filename = Path(span.file).name if span and span.file else "<unknown>"
+def _format_script_source(span: Any, *, full_path: bool = False) -> str:
+    """Return ``file:start-end`` from a SourceSpan.
+
+    By default the filename is the basename, suitable for compact list-view
+    output.  Pass ``full_path=True`` to retain the full source path (used by
+    detail views like ``SHOW SCRIPTS <name>`` and ``.scripts <name>``).
+    """
+    if not span or not span.file:
+        filename = "<unknown>"
+    elif full_path:
+        filename = span.file
+    else:
+        filename = Path(span.file).name
     if span and span.start_line is not None:
         if span.end_line is not None and span.end_line != span.start_line:
             return f"{filename}:{span.start_line}-{span.end_line}"
@@ -235,7 +245,7 @@ def x_show_scripts(**kwargs: Any) -> None:
             return
         block = scripts[script_name]
         sig = _format_script_signature(block.name, block.param_defs)
-        src = _format_script_source(block.span)
+        src = _format_script_source(block.span, full_path=True)
         _state.output.write(f"Script: {sig}\n")
         _state.output.write(f"Source: {src}\n")
         if block.param_defs:

execsql/metacommands/upsert.py

@@ -201,14 +201,6 @@ def _set_subvars(result: Any) -> None:
     sv("$PG_UPSERT_EXPORT_PATH", "")
 
 
-def _qa_failure_msg(result: Any) -> str:
-    """Build a concise QA failure message listing which tables failed."""
-    failed = [t.table_name for t in result.tables if not t.qa_passed]
-    if failed:
-        return f"PG_UPSERT QA failed for: {', '.join(failed)}"
-    return "PG_UPSERT QA checks failed."
-
-
 # ---------------------------------------------------------------------------
 # Import guard + helpers
 # ---------------------------------------------------------------------------
@@ -484,13 +476,6 @@ def x_pg_upsert(**kwargs: Any) -> None:
     if opts.get("cleanup"):
         ups.cleanup()
 
-    if not result.qa_passed:
-        raise ErrInfo(
-            "cmd",
-            command_text=metacommandline,
-            other_msg=_qa_failure_msg(result),
-        )
-
 
 def x_pg_upsert_qa(**kwargs: Any) -> None:
     """PG_UPSERT QA FROM <staging> TO <base> TABLES <t1>, <t2> [options]
@@ -524,13 +509,6 @@ def x_pg_upsert_qa(**kwargs: Any) -> None:
     if opts.get("cleanup"):
         ups.cleanup()
 
-    if not result.qa_passed:
-        raise ErrInfo(
-            "cmd",
-            command_text=metacommandline,
-            other_msg=_qa_failure_msg(result),
-        )
-
 
 def x_pg_upsert_check(**kwargs: Any) -> None:
     """PG_UPSERT CHECK FROM <staging> TO <base> TABLES <t1>, <t2>
@@ -567,13 +545,6 @@ def x_pg_upsert_check(**kwargs: Any) -> None:
     if opts.get("cleanup"):
         ups.cleanup()
 
-    if not result.qa_passed:
-        raise ErrInfo(
-            "cmd",
-            command_text=metacommandline,
-            other_msg=_qa_failure_msg(result),
-        )
-
 
 # ---------------------------------------------------------------------------
 # Plugin registration

execsql/script/executor.py

@@ -243,15 +243,17 @@ def _exec_sql(
 
 def _exec_metacommand(
     ctx: RuntimeContext,
-    command: str,
+    cmd: str,
     source: str,
     line_no: int,
-    localvars: SubVarSet | None = None,
 ) -> Any:
-    """Dispatch a metacommand through the dispatch table."""
-    # Build localvars from the command-list stack frame (see _exec_sql comment).
-    effective_locals = _stack_localvars(ctx) or localvars
-    cmd = substitute_vars(command, effective_locals, ctx=ctx)
+    """Dispatch a metacommand through the dispatch table.
+
+    *cmd* must already have ``!!$VAR!!`` substitution applied.  The caller is
+    responsible for expansion so that side-effecting substitutions (counter
+    increments, ``$RANDOM``, ``$UUID``) are evaluated exactly once per
+    metacommand reference.
+    """
     if _VARLIKE.search(cmd):
         ctx.output.write(
             f"Warning: There is a potential un-substituted variable in the command\n     {cmd}\n",
@@ -355,13 +357,15 @@ def _execute_node(
         command = node.command
         if in_loop:
             command = _convert_deferred_vars(command)
-        # Intercept BREAK before dispatch — it controls loop flow
+        # Substitute once: the same expanded text is used for BREAK detection
+        # and dispatch.  Calling substitute_vars twice would double-increment
+        # !!$COUNTER_N!! and re-roll !!$RANDOM!!/!!$UUID!! references.
         effective_locals = _stack_localvars(ctx) or localvars
         expanded = substitute_vars(command, effective_locals, ctx=ctx)
         if _BREAK_RX.match(expanded):
             raise _BreakLoop
         ctx.last_command = _FakeScriptCmd(node)
-        _exec_metacommand(ctx, command, node.span.file, node.span.start_line, localvars)
+        _exec_metacommand(ctx, expanded, node.span.file, node.span.start_line)
 
     elif isinstance(node, IfBlock):
         ctx.last_command = _FakeScriptCmd(node)

execsql/script/parser.py

@@ -114,14 +114,48 @@ _EXEC_SCRIPT_RX = re.compile(
     re.I,
 )
 
+# A parameter default value is either a double-quoted string, a single-quoted
+# string (both may contain spaces, commas, and other special characters), or
+# a bare run of non-whitespace characters.  Unquoted values must not begin
+# with a quote — that catches mismatched / unterminated quoted values
+# (e.g. ``name="value``) instead of silently treating them as literals.
+_PARAM_VALUE = r'(?:"[^"]*"|\'[^\']*\'|[^\s\'"]\S*)'
+
 _WITH_PARAMS_RX = re.compile(
     r"(?:\s+WITH)?(?:\s+PARAM(?:ETER)?S)?\s*\(\s*(?P<params>"
-    r"\w+(?:\s*=\s*\S+)?(?:\s*,\s*\w+(?:\s*=\s*\S+)?)*"
+    rf"\w+(?:\s*=\s*{_PARAM_VALUE})?(?:\s*,\s*\w+(?:\s*=\s*{_PARAM_VALUE})?)*"
     r")\s*\)\s*$",
     re.I,
 )
 
-_PARAM_TOKEN_RX = re.compile(r"(\w+)(?:\s*=\s*(\S+))?")
+_PARAM_TOKEN_RX = re.compile(rf"(\w+)(?:\s*=\s*({_PARAM_VALUE}))?\s*\Z")
+
+
+def _split_param_tokens(params_str: str) -> list[str]:
+    """Split a parameter list on commas, respecting quoted values.
+
+    Quoted segments (``"..."`` or ``'...'``) are kept intact so that commas
+    inside quotes do not split the token.  Each returned token is stripped
+    of surrounding whitespace.
+    """
+    tokens: list[str] = []
+    current: list[str] = []
+    in_quote: str | None = None
+    for ch in params_str:
+        if in_quote is not None:
+            current.append(ch)
+            if ch == in_quote:
+                in_quote = None
+        elif ch in ('"', "'"):
+            current.append(ch)
+            in_quote = ch
+        elif ch == ",":
+            tokens.append("".join(current))
+            current = []
+        else:
+            current.append(ch)
+    tokens.append("".join(current))
+    return [t.strip() for t in tokens]
 
 
 def _parse_param_defs(
@@ -129,16 +163,21 @@ def _parse_param_defs(
     lineno: int,
     source: str,
 ) -> list[ParamDef]:
-    """Parse ``'a, b, c=100, d=false'`` into a list of :class:`ParamDef`.
+    """Parse ``'a, b, c=100, d="hello world"'`` into a list of :class:`ParamDef`.
+
+    Defaults may be unquoted (``key=value``), double-quoted (``key="v a l"``),
+    or single-quoted (``key='v,a,l'``).  Surrounding quotes are stripped so
+    that ``ParamDef.default`` always holds the resolved value, mirroring the
+    quote-handling done at the call site for passed arguments.
 
     Required parameters (no default) must precede optional parameters
     (with default).  Raises :class:`ErrInfo` if ordering is violated.
     """
-    tokens = [t.strip() for t in params_str.split(",")]
+    tokens = _split_param_tokens(params_str)
     defs: list[ParamDef] = []
     seen_optional: str | None = None  # name of first optional param
     for token in tokens:
-        m = _PARAM_TOKEN_RX.match(token.strip())
+        m = _PARAM_TOKEN_RX.match(token)
         if not m:
             raise ErrInfo(
                 type="cmd",
@@ -146,6 +185,7 @@ def _parse_param_defs(
             )
         name, default = m.group(1), m.group(2)
         if default is not None:
+            default = _strip_quotes(default)
             if seen_optional is None:
                 seen_optional = name
         elif seen_optional is not None:

{execsql2-2.16.17.dist-info → execsql2-2.17.0.dist-info}/METADATA

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

{execsql2-2.16.17.dist-info → execsql2-2.17.0.dist-info}/RECORD

@@ -31,7 +31,7 @@ execsql/db/postgres.py,sha256=-GpaA9fi6_vdIDTGyRGxNRaPYAAkEB_aCb-EyLFShsM,21120
 execsql/db/sqlite.py,sha256=n44ldZ-afQFSnUuYJ1phcvWFnxp3SwgrD2YQcyr7zLM,10664
 execsql/db/sqlserver.py,sha256=d8PwfNumt-Spit_0llafqQ900suv3CZMbrRsHLU1iB4,7683
 execsql/debug/__init__.py,sha256=j6EGUR0dHzUhWN1mHHtf1-Lhjq3Sb1V-vmnq2Ztgj1M,178
-execsql/debug/repl.py,sha256=TlIw6XrxwP3QUxuOaQZKp9vbJI55kEfiMtRNMxQRZo8,20747
+execsql/debug/repl.py,sha256=snR_ErOOXyWBHeGdE_PaP8dwnysxaue5T-C6mGNFgeI,20763
 execsql/exporters/__init__.py,sha256=-Cnji-OgodJV8ftcDcOyTof0kQMy9J5kKVC8GVFpc3o,670
 execsql/exporters/base.py,sha256=Uhq0PBz8N_pJ7WlIN9225wY-HyxfzWSb9YabHXicBA8,6387
 execsql/exporters/delimited.py,sha256=Po9RV4UwBLOuRZmPFJk5CErpFvTdLCy--nFJJffZgxM,32383
@@ -71,7 +71,7 @@ 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=bFEQhNnKjIJHfc7FuZXIhUwWA-D8bMX7b3Anm5BWJT0,12051
+execsql/metacommands/debug.py,sha256=aTTI5yg7JTUYWBDve8QeLHtufMPnaWg8XG8M-rKwtw4,12415
 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
@@ -81,13 +81,13 @@ execsql/metacommands/io_write.py,sha256=eayUxsLnEDqp2R5iqlEjeOK8DxyoOFkG9hBe2JkV
 execsql/metacommands/prompt.py,sha256=E2e7q4pxbl_wEBrhco0B2gm5hO_HG3rNIF75PLdTgGg,36767
 execsql/metacommands/script_ext.py,sha256=sw4YKUQl0SRlVlmhIoGbMokOo_hVqh1EcTuYCN7c4kM,2396
 execsql/metacommands/system.py,sha256=cuyGebDR-ysVWjZRVYJLSGWhxfQWcFHroutCPySiad0,7375
-execsql/metacommands/upsert.py,sha256=XE_P3mjaUkqT-LR4_28n2NbXwdjSgAGXJyZmKZC4Oy4,21136
+execsql/metacommands/upsert.py,sha256=wzoMpM8g49pEvU9GkHZ62fPvqV3w1UIUfxVA7HAsS_o,20317
 execsql/script/__init__.py,sha256=3WaBklMVIWjtCsYQ-BVo9UAVEIATOgeGsuyv21YKnxo,3969
 execsql/script/ast.py,sha256=AviMXseSpZtaPpJtJEs3olaXuk23kN_dU5raHbymy6s,20266
 execsql/script/control.py,sha256=s-1eZdGARM6H1FwZ6VDdO_f50j7bvvRtTHesfUm9tbc,6144
 execsql/script/engine.py,sha256=EhuVBniOrFkzAW4I3NIZLt3INHTZJvlYoF7B99rZBLI,29391
-execsql/script/executor.py,sha256=RclV-uG33yEWs8p_sj9KbW5IpHbmkRyG2DO5L4UJK50,37678
-execsql/script/parser.py,sha256=a8ufVvyK6X-E6PbTiOpETscyi38XbiTypkgP8COHrQg,32171
+execsql/script/executor.py,sha256=0YW8G_pZqa-S1a8hEoRUMVAbsJF8PSXSwdctKG17tuU,37840
+execsql/script/parser.py,sha256=-7v6yJIYgTHyYzE57fy-xEoLy--NWFnQsbAvGh17cqY,33825
 execsql/script/variables.py,sha256=ZSBGQUsoii6w3dLDVY9xxoPIV6wY0sAV_BNIQ6pgQAE,14328
 execsql/utils/__init__.py,sha256=0uR6JwVJQRX3vceByNBduCAf5dd5assKjeqJUWvpZoA,278
 execsql/utils/auth.py,sha256=onXzNkNZQZxGC5w7eey06sjvAIAX_Lf9g7nUJtcsel0,7009
@@ -101,24 +101,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.17.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.16.17.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.16.17.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.16.17.data/data/execsql2_extras/execsql.conf,sha256=1a2g2Vga7s128wcu3ftIFRkHlKKtuvkuOHSD1XuNT7o,9404
-execsql2-2.16.17.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.16.17.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.16.17.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.16.17.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.16.17.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.16.17.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.16.17.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.16.17.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.16.17.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.16.17.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.16.17.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.16.17.dist-info/METADATA,sha256=7pPGd_axbrqgbRC0tkMvO81O93KMUB_GaVlki6wIzOY,20921
-execsql2-2.16.17.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.16.17.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.16.17.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.16.17.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.16.17.dist-info/RECORD,,
+execsql2-2.17.0.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.17.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.17.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.17.0.data/data/execsql2_extras/execsql.conf,sha256=1a2g2Vga7s128wcu3ftIFRkHlKKtuvkuOHSD1XuNT7o,9404
+execsql2-2.17.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.17.0.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
+execsql2-2.17.0.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
+execsql2-2.17.0.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
+execsql2-2.17.0.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
+execsql2-2.17.0.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
+execsql2-2.17.0.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
+execsql2-2.17.0.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
+execsql2-2.17.0.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
+execsql2-2.17.0.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
+execsql2-2.17.0.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
+execsql2-2.17.0.dist-info/METADATA,sha256=KHC9DTyU7haKukUTn6bHYgwkpXDNLq_lffErzmLCajo,20920
+execsql2-2.17.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.17.0.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.17.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.17.0.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
+execsql2-2.17.0.dist-info/RECORD,,