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

execsql/db/base.py

@@ -226,6 +226,7 @@ class Database(ABC):
         try:
             curs.execute(sql)
         except Exception:
+            curs.close()
             self.rollback()
             raise
         try:
@@ -264,6 +265,7 @@ class Database(ABC):
         try:
             curs.execute(sql)
         except Exception:
+            curs.close()
             self.rollback()
             raise
         try:

execsql/format.py

@@ -148,22 +148,66 @@ def _is_comment_line(line: str, in_block: bool) -> tuple[bool, bool]:
     return False, False
 
 
-def _sqlglot_format(sql_lines: list[str]) -> list[str]:
+def _sqlglot_format(
+    sql_lines: list[str],
+    sql_indent: int = 4,
+    leading_comma: bool = False,
+) -> list[str]:
     """Format a list of SQL-only lines (no comment-only lines) via sqlglot."""
     text = "\n".join(sql_lines)
     protected, replacements = _protect_variables(text)
+
+    # Count semicolons in input as a rough statement count.
+    input_semis = protected.count(";")
+
     try:
         with contextlib.redirect_stderr(io.StringIO()):
             ast = sqlglot.parse(protected, read="postgres", error_level=sqlglot.errors.ErrorLevel.IGNORE)
-            statements = [
-                node.sql(dialect="postgres", pretty=True)
-                for node in ast
-                if node is not None and type(node).__name__ != "Command"
-            ]
+            statements: list[str] = []
+            for node in ast:
+                if node is None:
+                    continue
+                # For Command nodes (psql backslash commands, ERROR:, etc.)
+                # use unpretty output to avoid mangling.
+                if type(node).__name__ == "Command":
+                    statements.append(node.sql(dialect="postgres"))
+                else:
+                    statements.append(
+                        node.sql(
+                            dialect="postgres",
+                            pretty=True,
+                            pad=sql_indent,
+                            indent=sql_indent,
+                            max_text_width=120,
+                            leading_comma=leading_comma,
+                        ),
+                    )
         stmts = [s for s in statements if s]
         if not stmts:
             return sql_lines
+
+        # Safety: if sqlglot produced more statements than the input had
+        # semicolons, it likely split a fragment (e.g. a SELECT column list)
+        # into multiple pseudo-statements.  Fall back to the original text.
+        if len(stmts) > max(input_semis, 1):
+            return sql_lines
+
         joined = ";\n".join(stmts) + ";"
+
+        # Content-loss check: sqlglot with IGNORE error level can silently
+        # drop tokens it doesn't understand (e.g. ``ERROR: ...``).  If the
+        # formatted output lost a significant fraction of the alphanumeric
+        # content, the formatting is unreliable — fall back.
+        # Exclude comment markers from the comparison — they are injected by
+        # _format_preserving_comments and are expected to be dropped by sqlglot
+        # for certain AST positions (e.g. inside CASE WHEN).
+        _alnum = re.compile(r"[^a-zA-Z0-9]")
+        _marker_alnum = re.compile(rf"{re.escape(_CMT_MARKER)}\d+")
+        input_for_check = _marker_alnum.sub("", protected)
+        input_alnum_len = len(_alnum.sub("", input_for_check))
+        output_alnum_len = len(_alnum.sub("", joined))
+        if input_alnum_len and output_alnum_len < input_alnum_len * 0.7:
+            return sql_lines
         joined = re.sub(r"\bINTO TEMPORARY\b(?!\s+TABLE)", "INTO TEMPORARY TABLE", joined)
         return _restore_variables(joined, replacements).split("\n")
     except Exception:
@@ -175,7 +219,194 @@ def _sqlglot_format(sql_lines: list[str]) -> list[str]:
 # ---------------------------------------------------------------------------
 
 
-def format_sql_block(lines: list[str], depth: int, indent: int, use_sql: bool) -> list[str]:
+def _has_mid_statement_comments(lines: list[str]) -> bool:
+    """Return True if any comment-only line appears inside a SQL statement.
+
+    A comment is "mid-statement" if it occurs after a SQL line that does not
+    end with ``;`` (i.e. the statement is still open).  This is a lightweight
+    heuristic — it can be fooled by ``;`` inside string literals, but in that
+    case the block simply gets the benefit of sqlglot formatting rather than
+    being skipped (which is harmless because the SQL isn't fragmented).
+    """
+    in_block = False
+    in_statement = False
+    for line in lines:
+        is_comment, in_block = _is_comment_line(line, in_block)
+        stripped = line.strip()
+        if not stripped:
+            continue
+        if is_comment:
+            if in_statement:
+                return True
+        else:
+            in_statement = True
+            if stripped.endswith(";"):
+                in_statement = False
+    return False
+
+
+_CMT_MARKER = "EXECSQL_CMTMARKER_"
+_CMT_MARKER_RE = re.compile(rf"/\*\s*({re.escape(_CMT_MARKER)}\d+)\s*\*/")
+
+
+def _format_preserving_comments(
+    lines: list[str],
+    sql_indent: int = 4,
+    leading_comma: bool = False,
+) -> list[str]:
+    """Format SQL with interleaved comments via marker-based round-tripping.
+
+    Strategy
+    --------
+    1. Replace each comment-only line with a unique inline ``/* marker */``
+       prepended to the *next* SQL line.  This lets sqlglot see the full
+       statement without fragmentation while preserving comment anchors.
+    2. Format the marker-annotated SQL through ``_sqlglot_format``.
+    3. Walk the formatted output: wherever a marker appears, emit the
+       original comment on its own line **before** that SQL line, then
+       strip the marker from the SQL.
+    4. Any marker that sqlglot dropped (e.g. inside a CASE expression)
+       is re-inserted by matching key tokens from its anchor SQL line
+       against the formatted output.
+    """
+    # ---- Step 1: extract comments, replace with inline markers ----------
+    comment_store: dict[str, str] = {}  # marker → original comment line
+    # Track the SQL line that originally followed each comment, for fallback
+    anchor_sql: dict[str, str] = {}  # marker → next SQL line (stripped)
+    pending_markers: list[str] = []
+    processed: list[str] = []
+    in_block = False
+
+    for line in lines:
+        is_comment, in_block = _is_comment_line(line, in_block)
+        stripped = line.strip()
+        if not stripped:
+            # Blank lines: if we have pending markers, attach blanks as
+            # comment entries so they reappear in the right place.
+            if pending_markers:
+                mid = f"{_CMT_MARKER}{len(comment_store)}"
+                comment_store[mid] = line
+                pending_markers.append(mid)
+            else:
+                processed.append(line)
+        elif is_comment:
+            mid = f"{_CMT_MARKER}{len(comment_store)}"
+            comment_store[mid] = line
+            pending_markers.append(mid)
+        else:
+            # SQL line — prepend any pending markers as inline comments
+            prefix = " ".join(f"/* {m} */" for m in pending_markers)
+            processed.append(f"{prefix} {line}" if prefix else line)
+            for m in pending_markers:
+                anchor_sql[m] = stripped
+            pending_markers.clear()
+
+    # Trailing comments with no following SQL — preserve as-is
+    trailing: list[str] = [comment_store[m] for m in pending_markers]
+
+    # ---- Step 2: format through sqlglot ---------------------------------
+    formatted = _sqlglot_format(processed, sql_indent=sql_indent, leading_comma=leading_comma)
+
+    # ---- Step 3: restore surviving markers to comment lines -------------
+    found_markers: set[str] = set()
+    result: list[str] = []
+    for fline in formatted:
+        markers_here = _CMT_MARKER_RE.findall(fline)
+        if markers_here:
+            # Strip markers to get the underlying SQL line and its indent
+            cleaned = _CMT_MARKER_RE.sub("", fline).strip()
+            # Determine indent: use the SQL line's indent from sqlglot
+            sql_indent = ""
+            if cleaned:
+                raw_cleaned = _CMT_MARKER_RE.sub("", fline)
+                sql_indent = raw_cleaned[: len(raw_cleaned) - len(raw_cleaned.lstrip())]
+            for m in markers_here:
+                if m in comment_store:
+                    orig = comment_store[m]
+                    # Re-indent the comment to match the SQL line it precedes
+                    orig_stripped = orig.strip()
+                    if orig_stripped:
+                        result.append(sql_indent + orig_stripped)
+                    else:
+                        result.append("")
+                    found_markers.add(m)
+            if cleaned:
+                result.append(sql_indent + cleaned)
+        else:
+            result.append(fline)
+
+    # ---- Step 4: reinsert lost markers ----------------------------------
+    lost = [m for m in comment_store if m not in found_markers and m not in set(pending_markers)]
+    if lost:
+        _reinsert_lost_comments(result, lost, comment_store, anchor_sql)
+
+    result.extend(trailing)
+    return result
+
+
+def _reinsert_lost_comments(
+    result: list[str],
+    lost_markers: list[str],
+    comment_store: dict[str, str],
+    anchor_sql: dict[str, str],
+) -> None:
+    """Best-effort reinsertion of comments that sqlglot dropped.
+
+    For each lost comment, extract key tokens from its anchor SQL line and
+    find the output line that best matches, then insert the comment before
+    that line (indented to match).  Operates on *result* in place.
+    """
+    _word_re = re.compile(r"[a-zA-Z_]\w*")
+
+    # Process in reverse order so earlier inserts don't shift later indices.
+    insertions: list[tuple[int, str]] = []
+    for marker in lost_markers:
+        anchor = anchor_sql.get(marker, "")
+        orig = comment_store[marker]
+        orig_stripped = orig.strip()
+        if not anchor or not orig_stripped:
+            insertions.append((len(result), orig))
+            continue
+
+        anchor_words = [w.lower() for w in _word_re.findall(anchor)]
+        if not anchor_words:
+            insertions.append((len(result), orig))
+            continue
+
+        # Find the output line with the best token overlap
+        best_idx = len(result)
+        best_score = 0
+        for i, rline in enumerate(result):
+            rwords = {w.lower() for w in _word_re.findall(rline)}
+            score = sum(1 for w in anchor_words if w in rwords)
+            if score > best_score:
+                best_score = score
+                best_idx = i
+
+        # Re-indent comment to match the target line
+        if best_idx < len(result):
+            target = result[best_idx]
+            indent_str = target[: len(target) - len(target.lstrip())]
+        else:
+            indent_str = ""
+        insertions.append((best_idx, indent_str + orig_stripped))
+
+    # Sort descending by index; within the same index, reverse the
+    # original order so sequential result.insert() calls produce the
+    # correct final ordering (last inserted at a given index ends up first).
+    indexed = list(enumerate(insertions))
+    indexed.sort(key=lambda x: (x[1][0], x[0]), reverse=True)
+    for _, (idx, text) in indexed:
+        result.insert(idx, text)
+
+
+def format_sql_block(
+    lines: list[str],
+    depth: int,
+    indent: int,
+    use_sql: bool,
+    leading_comma: bool = False,
+) -> list[str]:
     """Re-indent a SQL block to the current depth, optionally formatting via sqlglot."""
     if not lines:
         return lines
@@ -191,6 +422,13 @@ def format_sql_block(lines: list[str], depth: int, indent: int, use_sql: bool) -
     if not use_sql:
         return [target_prefix + line if line.strip() else "" for line in rebased]
 
+    # When comments appear mid-statement, use the marker-based approach
+    # which preserves both comments AND sqlglot formatting.  When all
+    # comments are between statements, the simpler segmentation works.
+    if _has_mid_statement_comments(rebased):
+        result = _format_preserving_comments(rebased, sql_indent=indent, leading_comma=leading_comma)
+        return [target_prefix + line if line.strip() else "" for line in result]
+
     result: list[str] = []
     seg: list[str] = []
     seg_is_comment: bool | None = None
@@ -202,7 +440,7 @@ def format_sql_block(lines: list[str], depth: int, indent: int, use_sql: bool) -
         if seg_is_comment:
             result.extend(seg)
         else:
-            result.extend(_sqlglot_format(seg))
+            result.extend(_sqlglot_format(seg, sql_indent=indent, leading_comma=leading_comma))
         seg.clear()
 
     for line in rebased:
@@ -238,34 +476,58 @@ def format_metacommand(payload: str, depth: int, indent: int) -> str:
     return f"{prefix}-- !x! {keyword}"
 
 
-def format_file(source: str, indent: int = 4, use_sql: bool = True) -> str:
+def format_file(source: str, indent: int = 4, use_sql: bool = True, leading_comma: bool = False) -> str:
     """Format the source text of an execsql script and return the result."""
     depth = 0
     sql_acc: list[str] = []
     output: list[str] = []
 
     in_dollar_quote = False
+    in_block_comment = False
+    # Track whether we are inside an open SQL statement (last SQL line
+    # did not end with ';').  Blank lines mid-statement should NOT flush
+    # the accumulator — doing so would split a single statement into
+    # fragments that sqlglot cannot parse.
+    in_sql_statement = False
 
     def flush_sql() -> None:
-        nonlocal in_dollar_quote
+        nonlocal in_dollar_quote, in_sql_statement
         if sql_acc:
             # If any line in the accumulated block is inside a $$-delimited
             # region, skip sqlglot formatting entirely.  PL/pgSQL function
             # bodies contain IF/END IF, LOOP, RETURN, etc. that sqlglot does
             # not understand and will corrupt (e.g., rewriting to COMMIT).
             safe_for_sqlglot = use_sql and not in_dollar_quote
-            output.extend(format_sql_block(sql_acc, depth, indent, safe_for_sqlglot))
+            output.extend(format_sql_block(sql_acc, depth, indent, safe_for_sqlglot, leading_comma=leading_comma))
             sql_acc.clear()
+        in_sql_statement = False
 
     for raw_line in source.expandtabs(4).splitlines():
+        stripped_line = raw_line.strip()
+
+        # Track /* */ block comment boundaries (but not inside $$ regions).
+        # Lines inside block comments must not be processed as metacommands.
+        if not in_dollar_quote:
+            if in_block_comment:
+                sql_acc.append(raw_line)
+                if "*/" in raw_line:
+                    in_block_comment = False
+                continue
+            if stripped_line.startswith("/*") and "*/" not in stripped_line[2:]:
+                in_block_comment = True
+                sql_acc.append(raw_line)
+                continue
+
         m = METACOMMAND_RE.match(raw_line)
 
-        if not raw_line.strip():
-            if not in_dollar_quote:
+        if not stripped_line:
+            if not in_dollar_quote and not in_sql_statement:
                 flush_sql()
+                output.append("")
             else:
+                # Mid-statement blank line stays in the accumulator and
+                # will appear in the output when the block is formatted.
                 sql_acc.append(raw_line)
-            output.append("")
 
         elif m:
             flush_sql()
@@ -296,6 +558,12 @@ def format_file(source: str, indent: int = 4, use_sql: bool = True) -> str:
             if "$$" in raw_line and raw_line.count("$$") % 2 == 1:
                 in_dollar_quote = not in_dollar_quote
             sql_acc.append(raw_line)
+            # Update statement tracking: if this SQL line ends with ';'
+            # (and isn't a comment), the statement is complete.
+            if stripped_line.endswith(";") and not stripped_line.startswith("--"):
+                in_sql_statement = False
+            elif not stripped_line.startswith("--"):
+                in_sql_statement = True
 
     flush_sql()
 
@@ -350,6 +618,11 @@ def main() -> None:
         in_place: bool = typer.Option(False, "-i", "--in-place", help="Modify files in place."),
         no_sql: bool = typer.Option(False, "--no-sql", help="Skip SQL formatting via sqlglot."),
         indent: int = typer.Option(4, "--indent", metavar="N", help="Spaces per indent level."),
+        leading_comma: bool = typer.Option(
+            False,
+            "--leading-comma",
+            help="Place commas at the start of lines instead of the end.",
+        ),
     ) -> None:
         use_sql = not no_sql
         paths = collect_paths(targets)
@@ -365,7 +638,7 @@ def main() -> None:
                 _err_console.print(f"[bold red]Error:[/bold red] reading {path}: {exc}")
                 raise typer.Exit(code=1) from None
 
-            formatted = format_file(source, indent=indent, use_sql=use_sql)
+            formatted = format_file(source, indent=indent, use_sql=use_sql, leading_comma=leading_comma)
 
             if check:
                 if formatted != source:

execsql/metacommands/io_export.py

@@ -136,16 +136,20 @@ def _dispatch_format(
             raise
         except Exception as e:
             raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
-        if filefmt == "raw":
-            write_query_raw(outfile, rows, db.encoding, append, zipfile=zipfilename)
-        elif filefmt == "b64":
-            write_query_b64(outfile, rows, append, zipfile=zipfilename)
-        elif filefmt == "feather":
-            write_query_to_feather(outfile, hdrs, rows)
-        elif filefmt == "parquet":
-            write_query_to_parquet(outfile, hdrs, rows)
-        else:
-            write_delimited_file(outfile, filefmt, hdrs, rows, _state.conf.output_encoding, append, zipfilename)
+        try:
+            if filefmt == "raw":
+                write_query_raw(outfile, rows, db.encoding, append, zipfile=zipfilename)
+            elif filefmt == "b64":
+                write_query_b64(outfile, rows, append, zipfile=zipfilename)
+            elif filefmt == "feather":
+                write_query_to_feather(outfile, hdrs, rows)
+            elif filefmt == "parquet":
+                write_query_to_parquet(outfile, hdrs, rows)
+            else:
+                write_delimited_file(outfile, filefmt, hdrs, rows, _state.conf.output_encoding, append, zipfilename)
+        except BaseException:
+            rows.close()
+            raise
 
 
 # ---------------------------------------------------------------------------

execsql/metacommands/io_fileops.py

@@ -106,10 +106,9 @@ def x_copy(**kwargs: Any) -> None:
     try:
         db2.populate_table(schema2, table2, rows, hdrs, get_ts)
         db2.commit()
-    except ErrInfo:
+    except BaseException:
+        rows.close()
         raise
-    except Exception as e:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
 
 
 def x_copy_query(**kwargs: Any) -> None:
@@ -181,10 +180,9 @@ def x_copy_query(**kwargs: Any) -> None:
     try:
         db2.populate_table(schema2, table2, rows, hdrs, get_ts)
         db2.commit()
-    except ErrInfo:
+    except BaseException:
+        rows.close()
         raise
-    except Exception as e:
-        raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
 
 
 def x_zip(**kwargs: Any) -> None:

execsql/script/ast.py

@@ -209,11 +209,14 @@ class ElseIfClause:
     Attributes:
         condition: The condition expression text (e.g. ``"HAS_ROWS"``).
         span: Source location of the ELSEIF line itself.
+        condition_modifiers: ANDIF/ORIF modifiers that compound the ELSEIF
+            condition, evaluated left-to-right at runtime.
         body: Nodes executed when this condition is true.
     """
 
     condition: str
     span: SourceSpan
+    condition_modifiers: list[ConditionModifier] = field(default_factory=list)
     body: list[Node] = field(default_factory=list)
 
 

execsql/script/executor.py

@@ -384,6 +384,12 @@ def _execute_node(
         ctx.last_command = _FakeScriptCmd(node)
         _execute_include(ctx, node, localvars)
 
+    else:
+        raise ErrInfo(
+            type="error",
+            other_msg=f"Unhandled AST node type: {type(node).__name__} at {node.span}",
+        )
+
 
 # ---------------------------------------------------------------------------
 # Block executors
@@ -404,9 +410,7 @@ def _execute_if(
 
     # Try ELSEIF clauses
     for clause in node.elseif_clauses:
-        effective_locals = _stack_localvars(ctx)
-        expanded = substitute_vars(clause.condition, effective_locals, ctx=ctx)
-        if xcmd_test(expanded):
+        if _eval_condition(ctx, clause.condition, clause.condition_modifiers):
             _execute_nodes(ctx, clause.body, node.span.file, localvars, in_loop=in_loop)
             return
 

execsql/script/parser.py

@@ -580,14 +580,17 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                         command_text=line,
                         other_msg=f"ANDIF without matching IF on line {file_lineno} of {source_name}.",
                     )
-                if_node = block_stack[-1].node
-                if_node.condition_modifiers.append(  # type: ignore[union-attr]
-                    ConditionModifier(
-                        kind="AND",
-                        condition=m.group("cond").strip(),
-                        span=SourceSpan(source_name, file_lineno),
-                    ),
+                modifier = ConditionModifier(
+                    kind="AND",
+                    condition=m.group("cond").strip(),
+                    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]
+                else:
+                    if_node.condition_modifiers.append(modifier)  # type: ignore[union-attr]
                 continue
 
             # -- ORIF --
@@ -599,14 +602,17 @@ def _parse_lines(lines: Iterable[str], source_name: str) -> Script:
                         command_text=line,
                         other_msg=f"ORIF without matching IF on line {file_lineno} of {source_name}.",
                     )
-                if_node = block_stack[-1].node
-                if_node.condition_modifiers.append(  # type: ignore[union-attr]
-                    ConditionModifier(
-                        kind="OR",
-                        condition=m.group("cond").strip(),
-                        span=SourceSpan(source_name, file_lineno),
-                    ),
+                modifier = ConditionModifier(
+                    kind="OR",
+                    condition=m.group("cond").strip(),
+                    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]
+                else:
+                    if_node.condition_modifiers.append(modifier)  # type: ignore[union-attr]
                 continue
 
             # -- ELSE --

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.16.12
+Version: 2.16.14
 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.12.dist-info → execsql2-2.16.14.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=RZVxfIHduF6AU2c_O6k93I0kxTUa8gfUn6bRbcgxHYM,12762
+execsql/format.py,sha256=nftyFgzNuv9aGUsp07WD3SjfttZ_dPhY45zJ7ocObL4,24384
 execsql/models.py,sha256=kCTUQg9-vReM6WNFfB_ZrEppuOW5u1uMBQThSkfPC0o,13264
 execsql/parser.py,sha256=P3ea8k7T_XLMrbhpFNZXwytdShrY302MKnhosqza1lo,15493
 execsql/plugins.py,sha256=2voLwT6eFap6BCBoZYndNNC_bMEJO1f_aP6xQTVXwYI,12815
@@ -18,7 +18,7 @@ execsql/cli/lint_ast.py,sha256=c9UEFsZ7PZlFdrK0zJCe-WXfCqvS3WlOUWEycZozqB8,14688
 execsql/cli/run.py,sha256=QrJ5SqIGiRO5AXavmxyhlJCMGtgZydC8MtHHAieQ4II,34571
 execsql/db/__init__.py,sha256=jTbuafuKOqYtXFR1wvCOoKK5Lr3l1uErfaIbIr6UywI,1063
 execsql/db/access.py,sha256=dAFuP1YeL7e7sy13T-9wll2Av5cr_PcUdxHf1NlvRNY,18204
-execsql/db/base.py,sha256=-el1s7YrxHkdy0lFx86BKZ8mBXWD-1EvE44e5ZhD5KI,31322
+execsql/db/base.py,sha256=lUhS9yGNX4Nhxfu1wxjLdGbLoabcDYXZQB_5VUw5kqE,31372
 execsql/db/dsn.py,sha256=ZkKQrRgNr8VilOhE7jzLIZKVhrmEL0Bt3BppegQ03KM,5486
 execsql/db/duckdb.py,sha256=79lRzKRhw1Pjfqcrba27S4Oq8a8AbDO_d0XkaNKKPQo,3197
 execsql/db/factory.py,sha256=YHdgyqQYy16548O3fGyElLC5C7DdIgva4Z29OsDxXjs,5367
@@ -72,8 +72,8 @@ execsql/metacommands/data.py,sha256=tRQBGTAuW-eJ2tBNWaoZI9OjTyNNyHJISo7gOdL-sm8,
 execsql/metacommands/debug.py,sha256=3QVm0N5uc7mcZco36kqlDq8tiWW0sdo8E8BoQZkE_DI,11784
 execsql/metacommands/dispatch.py,sha256=Gao7rwiBFdghmYKcbWVm21Va30evobQuoghLY_FOZto,87602
 execsql/metacommands/io.py,sha256=vlGBje5sgnqeilooMdhJDgSRIhysHy5_7LrKtik9Xjs,3011
-execsql/metacommands/io_export.py,sha256=J2FnXA6452FIGStv6vbZXORmA-Ges70na0W7YwpMESA,13253
-execsql/metacommands/io_fileops.py,sha256=QKFj-94W32zxJiDcMpRsaohSCdtCRPIOG10K0WPigFk,9616
+execsql/metacommands/io_export.py,sha256=iX4L3lpZGT2P5ca2C3XJ3MYxXJ_loC7nWmfKcWv4UGQ,13379
+execsql/metacommands/io_fileops.py,sha256=K7eHMAuCUEVpNITYnJhWaSmXtAnnx1ZaNIFnOwKtXzc,9456
 execsql/metacommands/io_import.py,sha256=dXI4Bpar0i3Swm7xU-0naY8zLmV96Ie0hsrqBus22Nc,14176
 execsql/metacommands/io_write.py,sha256=eayUxsLnEDqp2R5iqlEjeOK8DxyoOFkG9hBe2JkVR0A,8243
 execsql/metacommands/prompt.py,sha256=E2e7q4pxbl_wEBrhco0B2gm5hO_HG3rNIF75PLdTgGg,36767
@@ -81,11 +81,11 @@ execsql/metacommands/script_ext.py,sha256=sw4YKUQl0SRlVlmhIoGbMokOo_hVqh1EcTuYCN
 execsql/metacommands/system.py,sha256=azRbv_P8l0t8BkDM9bmAUkhpnLSLHSCcmByqs-a3FxQ,7352
 execsql/metacommands/upsert.py,sha256=XE_P3mjaUkqT-LR4_28n2NbXwdjSgAGXJyZmKZC4Oy4,21136
 execsql/script/__init__.py,sha256=3WaBklMVIWjtCsYQ-BVo9UAVEIATOgeGsuyv21YKnxo,3969
-execsql/script/ast.py,sha256=SLn1fp0QDsqvJegNeIuyKV9f1BFnkEdzRota5EaNTfo,20053
+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=T-pGa3o5S0oX1ySB5zztzRoJHYRZI58CKw3qcFz_95Q,37602
-execsql/script/parser.py,sha256=huznh4RnW6Y_yJyIIoMG5McUS2T9o3kfOW37CXPR5dk,31689
+execsql/script/executor.py,sha256=RclV-uG33yEWs8p_sj9KbW5IpHbmkRyG2DO5L4UJK50,37678
+execsql/script/parser.py,sha256=a8ufVvyK6X-E6PbTiOpETscyi38XbiTypkgP8COHrQg,32171
 execsql/script/variables.py,sha256=ZSBGQUsoii6w3dLDVY9xxoPIV6wY0sAV_BNIQ6pgQAE,14328
 execsql/utils/__init__.py,sha256=0uR6JwVJQRX3vceByNBduCAf5dd5assKjeqJUWvpZoA,278
 execsql/utils/auth.py,sha256=onXzNkNZQZxGC5w7eey06sjvAIAX_Lf9g7nUJtcsel0,7009
@@ -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.12.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.16.12.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.16.12.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.16.12.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
-execsql2-2.16.12.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.16.12.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.16.12.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.16.12.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.16.12.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.16.12.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.16.12.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.16.12.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.16.12.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.16.12.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.16.12.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.16.12.dist-info/METADATA,sha256=Op2AjS7Au3YMFnJ8rX0eE3DJm4SZcRVCzoCIhE3cDEo,20921
-execsql2-2.16.12.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.16.12.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.16.12.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.16.12.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.16.12.dist-info/RECORD,,
+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,,