execsql2 2.25.0__py3-none-any.whl → 2.25.1__py3-none-any.whl

execsql/cli/lint.py

@@ -243,6 +243,12 @@ _RX_PROMPT_CREDENTIALS = re.compile(
 )
 
 _RX_VAR_REF = re.compile(r"!!([$@&~#+]?\w+)!!", re.I)
+# Every candidate reference, including one nested in another's name
+# (``!!N_!!GROUP!!_CHECKS!!``), which _RX_VAR_REF's left-to-right scan skips.
+_RX_VAR_REF_ANY = re.compile(r"(?=!!([$@&~#+]?\w+)!!)")
+# Stands for a substituted value in _unresolved_var_refs: a word character
+# (so an enclosing name still matches) that no script name contains.
+_SUBSTITUTED = "ª"
 
 
 # ---------------------------------------------------------------------------
@@ -424,54 +430,108 @@ def _extract_var_definition(
             _read_ini_vars(ini_file, ini_section, script_dir, defined)
 
 
+# Larger than any real SUB_INI file; lint reads no more than this.
+_MAX_INI_BYTES = 1024 * 1024
+
+
 def _read_ini_vars(
     ini_file: str,
     section: str,
     script_dir: Path | None,
     defined_vars: set[str],
 ) -> None:
-    """Read an INI file and register its section keys as defined variables."""
+    """Read an INI file and register its section keys as defined variables.
+
+    Only a regular file up to :data:`_MAX_INI_BYTES` is read, so a script
+    naming a FIFO or a device (``/dev/zero``) cannot hang lint or the
+    language server; a file that is unreadable or not valid INI defines
+    nothing.
+    """
     from configparser import ConfigParser
+    from configparser import Error as ConfigError
 
     p = Path(ini_file)
     if not p.is_absolute() and script_dir is not None:
         p = script_dir / p
 
-    if not p.exists():
-        return
-
     cp = ConfigParser()
-    cp.read(p)
+    try:
+        if not p.is_file() or p.stat().st_size > _MAX_INI_BYTES:
+            return
+        cp.read_string(p.read_text(encoding="utf-8"), source=str(p))
+    except (OSError, UnicodeDecodeError, ConfigError):
+        return
     if cp.has_section(section):
         for key, _value in cp.items(section):
             defined_vars.add(key.upper())
 
 
-def _check_var_ref(
-    raw_name: str,
-    source: str,
-    line_no: int,
-    defined_vars: set[str],
-    issues: list[_Issue],
-) -> None:
-    """Emit a warning if *raw_name* looks like an undefined user variable."""
-    if not raw_name:
-        return
-
+def _is_known_var(raw_name: str, defined_vars: set[str]) -> bool:
+    """Whether execsql may substitute *raw_name* (as written, with its sigil) at run time."""
     sigil = raw_name[0] if raw_name[0] in ("$", "@", "&", "~", "#", "+") else ""
     name = raw_name[len(sigil) :]
 
     # Skip non-$ sigil prefixes — resolved at runtime
     if sigil in ("@", "&", "~", "#", "+"):
-        return
+        return True
 
     if sigil == "$":
         # System variables: $ARG_N is set with -a/--assign-arg, $COUNTER_N by
         # CounterVars, the rest by execsql itself.  A SUB cannot define one.
-        if re.match(r"^(?:ARG|COUNTER)_\d+$", name, re.I) or name.upper() in _get_builtin_vars():
-            return
-    elif name.upper() in defined_vars:
-        # User variables, defined by a SUB-family metacommand or a prompt.
+        return bool(re.match(r"^(?:ARG|COUNTER)_\d+$", name, re.I)) or name.upper() in _get_builtin_vars()
+    # User variables, defined by a SUB-family metacommand or a prompt.
+    return name.upper() in defined_vars
+
+
+def _unresolved_var_refs(text: str, defined_vars: set[str]) -> list[str]:
+    """The variable names in *text* that execsql would leave unsubstituted, as written.
+
+    execsql substitutes a known variable wherever ``!!name!!`` appears and
+    repeats until nothing changes, so a variable written inside another's
+    name (``!!N_!!GROUP!!_CHECKS!!``) is replaced first, and the outer name
+    is only known at run time: it is not checked.  Here each known variable
+    is replaced by a placeholder character, a name holding one counts as
+    known, and that repeats until nothing is replaced.
+
+    In a run of unknown candidates that share delimiters, the inner ones
+    (every second, from the second) are reported: with ``GROUP`` undefined,
+    ``!!N_!!GROUP!!_CHECKS!!`` reports ``GROUP``, not the fragments ``N_``
+    and ``_CHECKS``.
+    """
+    while True:
+        parts: list[str] = []
+        end = 0
+        for m in _RX_VAR_REF_ANY.finditer(text):
+            name = m.group(1)
+            if m.start() >= end and (_SUBSTITUTED in name or _is_known_var(name, defined_vars)):
+                parts += [text[end : m.start()], _SUBSTITUTED]
+                end = m.start() + len(name) + 4
+        if not parts:
+            break
+        text = "".join([*parts, text[end:]])
+
+    unresolved: list[str] = []
+    run: list[str] = []
+    end = -1
+    for m in _RX_VAR_REF_ANY.finditer(text):
+        if run and m.start() != end - 2:  # not sharing the previous candidate's closing !!
+            unresolved.extend(run if len(run) == 1 else run[1::2])
+            run = []
+        run.append(m.group(1))
+        end = m.start() + len(m.group(1)) + 4
+    unresolved.extend(run if len(run) == 1 else run[1::2])
+    return unresolved
+
+
+def _check_var_ref(
+    raw_name: str,
+    source: str,
+    line_no: int,
+    defined_vars: set[str],
+    issues: list[_Issue],
+) -> None:
+    """Emit a warning if *raw_name* looks like an undefined user variable."""
+    if not raw_name or _is_known_var(raw_name, defined_vars):
         return
 
     issues.append(
@@ -735,7 +795,7 @@ def _collect_var_references(nodes: list[Node], seen: set[str]) -> None:
     """Record every variable read anywhere beneath *nodes*: ``!!var!!``, or ``sub_defined(var)`` / ``sub_empty(var)``."""
     for node in nodes:
         for text in _referencing_text(node):
-            for m in _RX_VAR_REF.finditer(text):
+            for m in _RX_VAR_REF_ANY.finditer(text):
                 seen.add(m.group(1).lstrip("$@&~#+").upper())
             for m in _RX_VAR_TEST.finditer(text):
                 seen.add(m.group(1).lstrip("$@&~#+").upper())
@@ -826,14 +886,14 @@ def _lint_nodes(
 
         # -- Variable references in SQL --
         if isinstance(node, SqlStatement):
-            for m in _RX_VAR_REF.finditer(node.text):
-                _check_var_ref(m.group(1), src, lno, defined_vars, issues)
+            for name in _unresolved_var_refs(node.text, defined_vars):
+                _check_var_ref(name, src, lno, defined_vars, issues)
 
         # -- Metacommand checks --
         elif isinstance(node, MetaCommandStatement):
             _check_metacommand(node, issues)
-            for m in _RX_VAR_REF.finditer(node.command):
-                _check_var_ref(m.group(1), src, lno, defined_vars, issues)
+            for name in _unresolved_var_refs(node.command, defined_vars):
+                _check_var_ref(name, src, lno, defined_vars, issues)
 
         # -- IncludeDirective checks --
         elif isinstance(node, IncludeDirective):

{execsql2-2.25.0.dist-info → execsql2-2.25.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: execsql2
-Version: 2.25.0
+Version: 2.25.1
 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
@@ -451,7 +451,7 @@ execsql format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.25.0
+    rev: v2.25.1
     hooks:
       - id: execsql-format
       - id: execsql-lint

{execsql2-2.25.0.dist-info → execsql2-2.25.1.dist-info}/RECORD

@@ -19,7 +19,7 @@ execsql/cli/application.py,sha256=qKjkhDMWB7fEjEbqOLZ3pNFw80piBnRSeW_DfZg-9MA,12
 execsql/cli/dispatch.py,sha256=ew10mZNXsFHwiNd_etvpSQYD3T8CiexXkjC3Ja94C4w,2697
 execsql/cli/dsn.py,sha256=uBspf8DXCn2pXmT1Ug1c4IG7IgR5IFGKp9138puaubo,3289
 execsql/cli/help.py,sha256=Edr3d2ahKv387a6WGgyJi5vKIFe39tGPgTv1GKp3itE,10848
-execsql/cli/lint.py,sha256=7t4HXMqPCxHR6PoRxna0X3myu9hlxuK1rbPn5h2tX1Y,43390
+execsql/cli/lint.py,sha256=ZW-FhAjLSuqVNndfP_LX0YfZNswUCkyFAvk3aNPjHpU,46256
 execsql/cli/options.py,sha256=Srhf1gEOB5yy_7PxkTKBv07xK8Qzw8H-z7PUUnItpwE,2916
 execsql/cli/run.py,sha256=5f0SX6QyNl8Ur2MwuW2GaN1OqVpWbEI8CQV3k-hBwH8,41987
 execsql/cli/commands/__init__.py,sha256=wN5sbhKs11S8EZOTBd_GPP6TPjhYfiQkrI48Sy8n6U0,521
@@ -118,23 +118,23 @@ execsql/utils/numeric.py,sha256=_7bi5R6pHjMCkOPne_Sh5nUj-B8e9g6WFmjptFHaunA,1573
 execsql/utils/regex.py,sha256=B3mSBhRRx_DpUnX_t9IoYd05KvWAebiLMCZqQAmEwcw,3885
 execsql/utils/strings.py,sha256=UQNjpRCEFa1UO6feU-M-9e24wWAvizs_iu_4fFusLxo,8516
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.25.0.data/data/execsql2_extras/README.md,sha256=7SG9FbBpdqkgQTTt1aBTbCgymBZyV0rLrQMQrendzxs,5032
-execsql2-2.25.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.25.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
-execsql2-2.25.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.25.0.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
-execsql2-2.25.0.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
-execsql2-2.25.0.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
-execsql2-2.25.0.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
-execsql2-2.25.0.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
-execsql2-2.25.0.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
-execsql2-2.25.0.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
-execsql2-2.25.0.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
-execsql2-2.25.0.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
-execsql2-2.25.0.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
-execsql2-2.25.0.dist-info/METADATA,sha256=8-U51LILehuLSC5E0zYP_tYCuJEtff0DkTsMSQ4RvHg,25703
-execsql2-2.25.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-execsql2-2.25.0.dist-info/entry_points.txt,sha256=jOf53-4IVGjEZeNYUOF1GGaiPNfVZcNKxP3vDFKEyMA,58
-execsql2-2.25.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.25.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
-execsql2-2.25.0.dist-info/RECORD,,
+execsql2-2.25.1.data/data/execsql2_extras/README.md,sha256=7SG9FbBpdqkgQTTt1aBTbCgymBZyV0rLrQMQrendzxs,5032
+execsql2-2.25.1.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.25.1.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
+execsql2-2.25.1.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.25.1.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
+execsql2-2.25.1.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
+execsql2-2.25.1.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
+execsql2-2.25.1.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
+execsql2-2.25.1.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
+execsql2-2.25.1.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
+execsql2-2.25.1.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
+execsql2-2.25.1.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
+execsql2-2.25.1.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
+execsql2-2.25.1.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
+execsql2-2.25.1.dist-info/METADATA,sha256=vA1V2t6wNC3-PP3Jx3rj-Nmwc6rVT90Df2T02OehzBQ,25703
+execsql2-2.25.1.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+execsql2-2.25.1.dist-info/entry_points.txt,sha256=jOf53-4IVGjEZeNYUOF1GGaiPNfVZcNKxP3vDFKEyMA,58
+execsql2-2.25.1.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.25.1.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
+execsql2-2.25.1.dist-info/RECORD,,