execsql2 2.29.0__py3-none-any.whl → 2.31.1__py3-none-any.whl

execsql/utils/errors.py

@@ -6,8 +6,6 @@ Error handling and reporting utilities for execsql.
 Provides the functions that form the error-reporting pipeline used
 throughout the codebase:
 
-- :func:`exception_info` — extracts type, value, and source location
-  from the current exception.
 - :func:`exception_desc` — ``Type: message`` for the exception being
   handled, as shown on screen.
 - :func:`error_origin` / :func:`logged_error` — where in execsql an error
@@ -28,7 +26,6 @@ import execsql.state as _state
 from execsql.exceptions import ErrInfo
 
 __all__ = [
-    "exception_info",
     "error_origin",
     "exception_desc",
     "logged_error",
@@ -40,7 +37,7 @@ __all__ = [
     "install_hint",
 ]
 
-_ADDING_AN_EXTRA = "https://execsql2.readthedocs.io/en/latest/getting-started/installation/#adding-an-extra-later"
+_ADDING_AN_EXTRA = "https://execsql2.readthedocs.io/en/stable/getting-started/installation/#adding-an-extra-later"
 
 
 def install_hint(extra: str) -> str:
@@ -56,43 +53,29 @@ def install_hint(extra: str) -> str:
     )
 
 
-def exception_info() -> tuple:
-    # Returns the exception type, value, source file name, source line number, and source line text.
-    strace = traceback.extract_tb(sys.exc_info()[2])[-1:]
-    traces = traceback.extract_tb(sys.exc_info()[2])
-    xline = 0
-    for trace in traces:
-        if "execsql" in trace[0]:
-            xline = trace[1]
-    exc_message = ""
-    exc_param = sys.exc_info()[1]
-    if isinstance(exc_param, str):
-        exc_message = exc_param
-    elif exc_param is not None:
-        message = getattr(exc_param, "message", None)
-        value = getattr(exc_param, "value", None)
-        if isinstance(message, str) and len(message) > 0:
-            exc_message = message
-        elif isinstance(value, str) and len(value) > 0:
-            exc_message = value
-        else:
-            exc_message = str(exc_param)
-    try:
-        exc_message = str(exc_message)
-    except Exception:
-        exc_message = repr(exc_message)
-    xinfo = sys.exc_info()[0]
-    xname = getattr(xinfo, "__name__", "")
-    return xname, exc_message, strace[0][0], xline, strace[0][3]
-
-
 def exception_desc() -> str:
     """``Type: message`` for the exception being handled, as shown to the person running the script.
 
-    Where in execsql it was raised is for the log: see :func:`error_origin`.
+    The message is the exception's ``message`` or ``value`` attribute when it
+    has a non-empty string one (as some drivers' exceptions do), else its
+    ``str()``.  Where in execsql it was raised is for the log: see
+    :func:`error_origin`.
     """
-    exc_type, exc_strval, _filename, _lineno, _linetext = exception_info()
-    return f"{exc_type}: {exc_strval}"
+    exc_type, exc = sys.exc_info()[:2]
+    if isinstance(exc, str):
+        message = exc
+    elif exc is None:
+        message = ""
+    else:
+        attr = next(
+            (v for v in (getattr(exc, "message", None), getattr(exc, "value", None)) if isinstance(v, str) and v),
+            None,
+        )
+        try:
+            message = attr if attr is not None else str(exc)
+        except Exception:
+            message = repr(exc)
+    return f"{getattr(exc_type, '__name__', '')}: {message}"
 
 
 def error_origin(exc: BaseException) -> str | None:

execsql/utils/fileio.py

@@ -34,7 +34,6 @@ import threading
 import time
 import weakref
 from collections.abc import Callable
-from encodings.aliases import aliases as codec_dict
 from typing import Any, NamedTuple, cast
 
 from execsql.exceptions import ErrInfo
@@ -47,14 +46,11 @@ __all__ = [
     "EncodedFile",
     "Logger",
     "TempFileMgr",
-    "list_encodings",
     "filewriter_filestatus",
     "filewriter_write",
     "filewriter_open_as_new",
     "filewriter_close",
     "filewriter_close_all_after_write",
-    "filewriter_closeall",
-    "filewriter_shutdown",
     "filewriter_end",
     "redact",
     "register_secret",
@@ -216,9 +212,8 @@ class FileWriter(threading.Thread):
         CMD_OPEN_AS_NEW,
         CMD_CLOSE_ALL_AFTER_WRITE,
         CMD_CLOSED_STATUS,
-        CMD_PING,
         CMD_OPEN_FAILURES,
-    ) = range(10)
+    ) = range(9)
 
     class FileControl:
         STATUS_OPEN, STATUS_WAITING, STATUS_UNOPENED, STATUS_CLOSED, STATUS_OPENFAILURE, STATUS_WRITEFAILURE = range(6)
@@ -375,7 +370,6 @@ class FileWriter(threading.Thread):
             self.open_as_new,
             self.close_all_after_write,
             self.closed_status,
-            self.ping,
             self.open_failures,
         )
 
@@ -417,10 +411,6 @@ class FileWriter(threading.Thread):
             if fc.status != self.FileControl.STATUS_CLOSED and fc.status not in fc.FAILED:
                 self._on_file(fc, fc.clean_close)
 
-    def ping(self, token: object) -> None:
-        """Echo *token* back on the return queue — used to synchronize callers."""
-        self.return_msg_queue.put(token)
-
     def retry_waiting(self) -> None:
         """Re-attempt opening every file still waiting on a lock.
 
@@ -526,7 +516,7 @@ class FileWriter(threading.Thread):
         the rest, so one bad command cannot stop the thread (and with it
         every later write, to any file).
         """
-        filename = argtuple[0] if command != self.CMD_PING and argtuple and isinstance(argtuple[0], str) else ""
+        filename = argtuple[0] if argtuple and isinstance(argtuple[0], str) else ""
         lost = LostOutput(filename, 0, str(exc), "writer")
         if command == self.CMD_OPEN_FAILURES:
             self.return_msg_queue.put([lost])
@@ -535,7 +525,6 @@ class FileWriter(threading.Thread):
         replies: dict[int, Any] = {
             self.CMD_GET_STATUS: self.FileControl.STATUS_CLOSED,
             self.CMD_CLOSED_STATUS: self.FileControl.STATUS_CLOSED,
-            self.CMD_PING: argtuple[0] if argtuple else None,
         }
         if command in replies:
             self.return_msg_queue.put(replies[command])
@@ -745,20 +734,6 @@ def _lost_output_message(lost: LostOutput, open_timeout: int) -> str:
     return f"{cause}; {lost.dropped} line(s) of output to it were discarded" if lost.dropped else cause
 
 
-def filewriter_closeall() -> None:
-    fw = _active_writer()
-    if fw is None:
-        return
-    fw.input_queue.put((FileWriter.CMD_CLOSE_ALL, ()))
-
-
-def filewriter_shutdown() -> None:
-    fw = _active_writer()
-    if fw is None:
-        return
-    fw.input_queue.put((FileWriter.CMD_SHUTDOWN, ()))
-
-
 def filewriter_end(writer: FileWriter | None = None) -> None:
     """Close every file and stop *writer*, or the active run's writer if omitted.
 
@@ -894,6 +869,8 @@ class Logger:
         self.server_name = server_name
         self.cmdline_options = cmdline_options
         self._redaction_values: list[str] = []
+        # Of those, the -a / --var values: masked in the log, not in the manifest.
+        self._argument_values: set[str] = set()
         if log_file_name:
             self.log_file_name = log_file_name
         else:
@@ -956,9 +933,9 @@ class Logger:
         )
         self.writelog(self._redact(msg) or "")
         if server_name:
-            msg = f"run_db_server\t{self.run_id}\t{server_name}\t{db_name}\n"
+            msg = f"run_db_server\t{self.run_id}\t{self._redact(server_name)}\t{self._redact(db_name)}\n"
         else:
-            msg = f"run_db_file\t{self.run_id}\t{db_name}\n"
+            msg = f"run_db_file\t{self.run_id}\t{self._redact(db_name)}\n"
         self.writelog(msg)
         self.seq_no = 0
         atexit.register(self.close)
@@ -974,20 +951,41 @@ class Logger:
 
         return _datetime.datetime.now().isoformat(timespec="seconds")
 
-    def add_redaction_value(self, value: str | None) -> None:
+    def add_redaction_value(self, value: str | None, *, argument: bool = False) -> None:
+        """Mask *value* in every later log record.
+
+        *argument* marks an ``-a`` / ``--var`` value: it may be a secret, so
+        the log masks it, but it is just as often part of a path, so the
+        ``--manifest`` JSON (``redact(..., arguments=False)``) does not.  A
+        value registered both ways is a secret.
+        """
         if value is None:
             return
         value = str(value)
-        if not value or value in self._redaction_values:
+        if not value:
+            return
+        if not argument:
+            self._argument_values.discard(value)
+        if value in self._redaction_values:
             return
         self._redaction_values.append(value)
+        if argument:
+            self._argument_values.add(value)
+
+    def _redact(self, msg: str | None, *, arguments: bool = True) -> str | None:
+        """*msg* with registered secrets and common secret shapes replaced by ``***``.
 
-    def _redact(self, msg: str | None) -> str | None:
+        Every record applies it to its free-text fields (messages, names,
+        paths), never to a whole line: a registered value can be as short as
+        a ``-a 2024`` argument, which would otherwise mask timestamps and
+        sequence numbers.
+        """
         if msg is None:
             return None
         redacted = str(msg)
         for value in sorted(self._redaction_values, key=len, reverse=True):
-            redacted = redacted.replace(value, "***")
+            if arguments or value not in self._argument_values:
+                redacted = redacted.replace(value, "***")
         for pattern in self._COMMON_SECRET_PATTERNS:
             if pattern.pattern.startswith("(?i)(://"):
                 redacted = pattern.sub(r"\1***\3", redacted)
@@ -1026,12 +1024,13 @@ class Logger:
 
     def log_db_connect(self, db: Any) -> None:
         self.seq_no += 1
-        msg = f"connect\t{self.run_id}\t{self.seq_no}\t{self._ts()}\t{db.name()}\n"
+        msg = f"connect\t{self.run_id}\t{self.seq_no}\t{self._ts()}\t{self._redact(db.name())}\n"
         self.writelog(msg)
 
     def log_action_export(self, line_no: int, query_name: str, export_file_name: str) -> None:
         self.seq_no += 1
-        msg = f"action\t{self.run_id}\t{self.seq_no}\t{self._ts()}\texport\t{line_no}\tQuery {query_name} exported to {export_file_name}\n"
+        description = self._redact(f"Query {query_name} exported to {export_file_name}")
+        msg = f"action\t{self.run_id}\t{self.seq_no}\t{self._ts()}\texport\t{line_no}\t{description}\n"
         self.writelog(msg)
 
     def log_status_exception(self, msg: str | None) -> None:
@@ -1087,7 +1086,7 @@ class Logger:
         self.exit_type = "halt"
         self.exit_scriptfile = script_file_name
         self.exit_lno = line_no
-        self.exit_description = msg
+        self.exit_description = None if not msg else msg.replace("\n", "")
 
     def log_exit_interrupted(self) -> None:
         # Save values to be used by exit() function triggered on program exit
@@ -1121,9 +1120,9 @@ class Logger:
         wmsg = "exit\t{}\t{}\t{}({})\t{}\t{:.1f}s\n".format(
             self.run_id,
             self.exit_type,
-            self.exit_scriptfile or "",
+            self._redact(self.exit_scriptfile) or "",
             str(self.exit_lno or ""),
-            self.exit_description or "",
+            self._redact(self.exit_description) or "",  # a HALT MESSAGE can hold any variable's value
             elapsed,
         )
         self.writelog(wmsg)
@@ -1144,12 +1143,16 @@ def register_secret(value: str | None) -> None:
         add(value)
 
 
-def redact(text: str) -> str:
-    """*text* with the active run's registered secrets and common secret shapes replaced by ``***``."""
+def redact(text: str, *, arguments: bool = True) -> str:
+    """*text* with the active run's registered secrets and common secret shapes replaced by ``***``.
+
+    With *arguments* false, ``-a`` / ``--var`` values are left as they are
+    (see :meth:`Logger.add_redaction_value`).
+    """
     import execsql.state as _state
 
     redactor = getattr(_state.exec_log, "_redact", None)
-    return redactor(text) if redactor is not None else text
+    return (redactor(text, arguments=arguments) or "") if redactor is not None else text
 
 
 class TempFileMgr:
@@ -1188,10 +1191,3 @@ _live_tempfile_mgrs: weakref.WeakSet[TempFileMgr] = weakref.WeakSet()
 def _remove_all_temp_files() -> None:
     for mgr in list(_live_tempfile_mgrs):
         mgr.remove_all()
-
-
-def list_encodings() -> None:
-    enc = list(codec_dict.keys())
-    enc.sort()
-    msg = f"Encodings: {', '.join(enc)}\n"
-    print(msg)

execsql/utils/paths.py

@@ -0,0 +1,31 @@
+"""Telling a path on this machine from one that names another.
+
+On Windows, checking or opening a path written as ``\\\\host\\share\\...``
+(or ``//host/share/...``) makes the OS contact *host* and offer the logged-in
+user's credentials.  The static tools (``execsql lint``, ``execsql format``
+and the language server) read paths written in scripts and config files
+someone else may have written, so they never touch such a path.
+"""
+
+from __future__ import annotations
+
+import os
+
+__all__ = ["is_network_path"]
+
+# Read once; tests set it to check the Windows rules on any OS.
+_WINDOWS = os.name == "nt"
+
+
+def is_network_path(path: str | os.PathLike[str]) -> bool:
+    """Whether *path*, as written, names another machine or a device.
+
+    On Windows: a UNC path (``\\\\host\\share``, ``//host/share``, either slash)
+    or a ``\\\\?\\`` / ``\\\\.\\`` device path.  Elsewhere a leading double
+    slash is an ordinary local path, so nothing is.  A relative path is never
+    one: it stays on the machine of the file that names it.
+    """
+    if not _WINDOWS:
+        return False
+    text = os.fspath(path)
+    return len(text) >= 2 and text[0] in "\\/" and text[1] in "\\/"

execsql/utils/regex.py

@@ -16,7 +16,6 @@ import os
 
 __all__ = [
     "ins_rxs",
-    "ins_quoted_rx",
     "ins_schema_rxs",
     "ins_table_rxs",
     "ins_table_list_rxs",
@@ -42,10 +41,6 @@ def ins_rxs(rx_list: tuple[str, ...], fragment1: object, fragment2: object) -> t
     return tuple(rv)
 
 
-def ins_quoted_rx(fragment1: object, fragment2: object, rx: str) -> tuple[str, ...]:
-    return ins_rxs((rx, rf'"{rx}"'), fragment1, fragment2)
-
-
 def ins_schema_rxs(fragment1: object, fragment2: object, suffix: str | None = None) -> tuple[str, ...]:
     schema_exprs: tuple[str, ...] = (
         r'"(?P<schema>[A-Za-z0-9_\- ]+)"',

{execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/README.md

@@ -1,12 +1,14 @@
 # Templates for execsql
 
+The [Templates section](https://execsql2.readthedocs.io/en/stable/templates/) of the execsql2 documentation describes how to use these files.
+
 Several types of templates are provided that may be useful in conjunction with execsql. These are:
 
 - **execsql.conf** — An annotated reference of every configuration setting with notes on its usage. Generate a fresh copy in any directory with `execsql config --init > execsql.conf`; the canonical content ships inside the installed package and is loaded via `importlib.resources` (no need to find or copy a source file).
 
 - **script_template.sql** — A framework for SQL scripts that make use of several execsql features. It includes sections for custom configuration settings, custom logfile creation, and reporting of unexpected script exits (through user cancellation or errors).
 
-- **config_settings.sqlite** and **example_config_prompt.sql** — A SQLite database containing specifications for all settings configurable with the CONFIG metacommand, in the form used by the PROMPT ENTRY_FORM metacommand, and a SQL script illustrating how this database can be used to prompt the user for some or all of the configuration settings. *execsql* version 1.63.0 or later is needed to use this script.
+- **config_settings.sqlite** and **example_config_prompt.sql** — A SQLite database containing specifications for all settings configurable with the CONFIG metacommand, in the form used by the PROMPT ENTRY_FORM metacommand, and a SQL script illustrating how this database can be used to prompt the user for some or all of the configuration settings.
 
 ## Functional Scripts for execsql
 
@@ -16,7 +18,7 @@ These script files provide useful functionality that should be accessed by inclu
 
 These scripts perform automated upsert operations on any tables of any database in a DBMS that supports the standard *information_schema* views. Currently that includes:
 
-- **PostgreSQL:** `pg_upsert.sql`
+- **PostgreSQL:** use the [`PG_UPSERT`](https://execsql2.readthedocs.io/en/stable/reference/metacommands/#pg_upsert) metacommand, which does the same with the [pg-upsert](https://pg-upsert.readthedocs.io/) package; it replaced `pg_upsert.sql`.
 - **MySQL/MariaDB:** `md_upsert.sql`
 - **SQL Server:** `ss_upsert.sql`
 
@@ -35,7 +37,7 @@ Features of these upsert scripts include:
 - Optionally, they will record all operations carried out in a custom log file; this log may include the SQL statements executed and the data values that were added or changed.
 - If an execsql console is active, they will use the console's status bar and progress bar to indicate the activity underway.
 
-Complete documentation is available at [Read The Docs (execsql-upsert)](https://execsql-upsert.readthedocs.io/en/latest/).
+Complete documentation is in the [Upsert Scripts](https://execsql2.readthedocs.io/en/stable/templates/upsert/) page of the execsql2 documentation.
 
 ### Table Comparison Scripts
 
@@ -47,7 +49,7 @@ These scripts work with any tables of any database in a DBMS that supports the s
 - **MySQL/MariaDB:** `md_compare.sql`
 - **SQL Server:** `ss_compare.sql`
 
-Complete documentation is available at [Read The Docs (execsql-compare)](https://execsql-compare.readthedocs.io/en/latest/).
+Complete documentation is in the [Compare Scripts](https://execsql2.readthedocs.io/en/stable/templates/compare/) page of the execsql2 documentation.
 
 ### Glossary Creation Scripts
 
@@ -57,9 +59,8 @@ These scripts create a glossary of column names or other terms that can be expor
 - **MySQL/MariaDB:** `md_glossary.sql`
 - **SQL Server:** `ss_glossary.sql`
 
-Complete documentation is available at [Read The Docs (execsql-glossary)](https://execsql-compare.readthedocs.io/en/latest/).
+Complete documentation is in the [Glossary Scripts](https://execsql2.readthedocs.io/en/stable/templates/glossary/) page of the execsql2 documentation.
 
-## Roadmap
+## Tests
 
-- [ ] Integrate documentation for [execsql-compare](https://execsql-compare.readthedocs.io/en/latest/) into the main execsql2 documentation site.
-- [ ] Integrate documentation for [execsql-upsert](https://execsql-upsert.readthedocs.io/en/latest/) into the main execsql2 documentation site.
+`tests/templates/` runs these scripts against live databases: the glossary, compare and upsert scripts on PostgreSQL, MySQL, MariaDB and SQL Server (`md_` scripts on both MySQL and MariaDB), plus lint and INCLUDE checks for every file. Run them with `just test-templates`; see `CONTRIBUTING.md`.

{execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/md_compare.sql

@@ -29,8 +29,9 @@
 --	3. Temporary tables and views created by these scripts all
 --		begin with "cmp_".
 --
--- AUTHOR
+-- AUTHORS
 --	Dreas Nielsen (RDN)
+--	Caleb Grant (CG)
 --
 -- COPYRIGHT AND LICENSE
 -- 	Copyright (c) 2020 R.Dreas Nielsen
@@ -45,7 +46,7 @@
 -- 	The GNU General Public License is available at <http://www.gnu.org/licenses/>
 --
 -- VERSION
---	1.1.1
+--	1.2.0
 --
 -- HISTORY
 --	 Date		 Remarks
@@ -53,13 +54,20 @@
 --	2020-02-27	Created from v. 1.1.0 of pg_compare.sql RDN.
 --	2020-02-29	Excluded PK columns from output of COMPARE_COMMON_VALS.
 --				Completed conversion to md.  v. 1.1.1.  RDN.
+--	2026-10-15	execsql2: text values compare case- and accent-sensitively (the
+--				default collation reported 'y' -> 'Y' as unchanged); columns
+--				are read from the current database only (a same-named table in
+--				another database was mixed in); each script's notes are its
+--				docstring; include_cols and exclude_cols are declared optional
+--				parameters.  v. 1.2.0.  Tested in tests/templates of the
+--				execsql2 repository.  CG.
 -- ==================================================================
 
 
 -- ################################################################
 --			Script COMPARE_COMMON
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT COMPARE_COMMON with parameters (stage_pfx, table, sql_var, include_cols="", exclude_cols="")
 -- Generate SQL to compare the attributes of base and staging
 -- tables for only those primary keys in common.  This uses an
 -- inner join between the tables, and does not include any rows
@@ -97,8 +105,6 @@
 --
 -- Notes
 -- 	1. The generated SQL is not terminated with a semicolon.
--- ===============================================================
--- !x! BEGIN SCRIPT COMPARE_COMMON with parameters (stage_pfx, table, sql_var)
 
 -- Create a table of primary key columns for the table
 drop table if exists cmp_primary_key_columns cascade;
@@ -125,20 +131,26 @@ order by k.ordinal_position
 -- that are to be compared.
 -- Include only those columns from the staging table that are also in the base table.
 -- !x! sub_empty ~col_sel
--- !x! if(sub_defined(#include_cols))
+-- !x! if(not is_null("!!#include_cols!!"))
 	-- !x! sub ~col_sel and s.column_name in (!!#include_cols!!)
--- !x! elseif(sub_defined(#exclude_cols))
+-- !x! elseif(not is_null("!!#exclude_cols!!"))
 	-- !x! sub ~col_sel and s.column_name not in (!!#exclude_cols!!)
 -- !x! endif
 drop table if exists cmp_cols cascade;
 create table cmp_cols as
-select s.column_name
+select
+	s.column_name,
+	-- Text compares case- and accent-sensitively below; the default collation does not.
+	(s.data_type in ('char', 'varchar', 'tinytext', 'text', 'mediumtext', 'longtext', 'enum', 'set') and b.data_type in ('char', 'varchar', 'tinytext', 'text', 'mediumtext', 'longtext', 'enum', 'set')) as is_text
 from information_schema.columns as s
 	inner join information_schema.columns as b on s.column_name=b.column_name
 	left join cmp_primary_key_columns as pk on pk.column_name = s.column_name
 where
 	s.table_name = concat(!'!#stage_pfx!'!, !'!#table!'!)
 	and b.table_name = !'!#table!'!
+	-- information_schema covers every database on the server.
+	and s.table_schema = database()
+	and b.table_schema = database()
 	and pk.column_name is null
 	!!~col_sel!!
 order by s.ordinal_position;
@@ -157,7 +169,7 @@ from
 alter table cmp_cols add column sqlcmd character varying(500);
 update cmp_cols
 set sqlcmd =
-concat('case when b.', column_name, ' is null then case when s.', column_name, ' is null then ''Same'' else ''New'' end else case when s.', column_name, ' is null then ''Old'' else case when b.', column_name, ' = s.', column_name, ' then ''Same'' else ''Different'' end end end as ', column_name)
+concat('case when b.', column_name, ' is null then case when s.', column_name, ' is null then ''Same'' else ''New'' end else case when s.', column_name, ' is null then ''Old'' else case when ', if(is_text, concat('cast(b.', column_name, ' as binary) = cast(s.', column_name, ' as binary)'), concat('b.', column_name, ' = s.', column_name)), ' then ''Same'' else ''Different'' end end end as ', column_name)
 ;
 
 -- Create the comparison expression for all columns.
@@ -200,7 +212,7 @@ drop table if exists cmp_primary_key_columns cascade;
 -- ################################################################
 --			Script COMPARE_COMMON_VALS
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT COMPARE_COMMON_VALS with parameters (stage_pfx, table, sql_var, include_cols="", exclude_cols="")
 -- Generate SQL to compare the attributes of base and staging
 -- tables for only those primary keys in common.  This uses an
 -- inner join between the tables, and does not include any rows
@@ -234,8 +246,6 @@ drop table if exists cmp_primary_key_columns cascade;
 --
 -- Notes
 -- 	1. The generated SQL is not terminated with a semicolon.
--- ===============================================================
--- !x! BEGIN SCRIPT COMPARE_COMMON_VALS with parameters (stage_pfx, table, sql_var)
 
 -- Create a table of primary key columns for the table
 drop table if exists cmp_primary_key_columns cascade;
@@ -262,20 +272,26 @@ order by k.ordinal_position
 -- that are to be compared.
 -- Include only those columns from the staging table that are also in the base table.
 -- !x! sub_empty ~col_sel
--- !x! if(sub_defined(#include_cols))
+-- !x! if(not is_null("!!#include_cols!!"))
 	-- !x! sub ~col_sel and s.column_name in (!!#include_cols!!)
--- !x! elseif(sub_defined(#exclude_cols))
+-- !x! elseif(not is_null("!!#exclude_cols!!"))
 	-- !x! sub ~col_sel and s.column_name not in (!!#exclude_cols!!)
 -- !x! endif
 drop table if exists cmp_cols cascade;
 create table cmp_cols as
-select s.column_name
+select
+	s.column_name,
+	-- Text compares case- and accent-sensitively below; the default collation does not.
+	(s.data_type in ('char', 'varchar', 'tinytext', 'text', 'mediumtext', 'longtext', 'enum', 'set') and b.data_type in ('char', 'varchar', 'tinytext', 'text', 'mediumtext', 'longtext', 'enum', 'set')) as is_text
 from information_schema.columns as s
 	inner join information_schema.columns as b on s.column_name=b.column_name
 	left join cmp_primary_key_columns as pk on pk.column_name = s.column_name
 where
 	s.table_name = concat(!'!#stage_pfx!'!, !'!#table!'!)
 	and b.table_name = !'!#table!'!
+	-- information_schema covers every database on the server.
+	and s.table_schema = database()
+	and b.table_schema = database()
 	and pk.column_name is null
 	!!~col_sel!!
 order by s.ordinal_position;
@@ -341,7 +357,7 @@ drop table if exists cmp_primary_key_columns cascade;
 -- ################################################################
 --			Script COMPARE_CHANGES
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT COMPARE_CHANGES with parameters (stage_pfx, table, sql_var, include_cols="", exclude_cols="")
 -- Generate SQL to characterize every row of the staging table
 -- data as either a new row, a row with changed data, or a row
 -- with data that are unchanged relative to the base table.
@@ -374,8 +390,6 @@ drop table if exists cmp_primary_key_columns cascade;
 --
 -- Notes
 -- 	1. The generated SQL is not terminated with a semicolon.
--- ===============================================================
--- !x! BEGIN SCRIPT COMPARE_CHANGES with parameters (stage_pfx, table, sql_var)
 
 -- Create a table of primary key columns for the table
 drop table if exists cmp_primary_key_columns cascade;
@@ -403,20 +417,26 @@ order by k.ordinal_position
 -- that are to be compared.
 -- Include only those columns from the staging table that are also in the base table.
 -- !x! sub_empty ~col_sel
--- !x! if(sub_defined(#include_cols))
+-- !x! if(not is_null("!!#include_cols!!"))
 	-- !x! sub ~col_sel and s.column_name in (!!#include_cols!!)
--- !x! elseif(sub_defined(#exclude_cols))
+-- !x! elseif(not is_null("!!#exclude_cols!!"))
 	-- !x! sub ~col_sel and s.column_name not in (!!#exclude_cols!!)
 -- !x! endif
 drop table if exists cmp_cols cascade;
 create table cmp_cols as
-select s.column_name
+select
+	s.column_name,
+	-- Text compares case- and accent-sensitively below; the default collation does not.
+	(s.data_type in ('char', 'varchar', 'tinytext', 'text', 'mediumtext', 'longtext', 'enum', 'set') and b.data_type in ('char', 'varchar', 'tinytext', 'text', 'mediumtext', 'longtext', 'enum', 'set')) as is_text
 from information_schema.columns as s
 	inner join information_schema.columns as b on s.column_name=b.column_name
 	left join cmp_primary_key_columns as pk on pk.column_name = s.column_name
 where
 	s.table_name = concat(!'!#stage_pfx!'!, !'!#table!'!)
 	and b.table_name = !'!#table!'!
+	-- information_schema covers every database on the server.
+	and s.table_schema = database()
+	and b.table_schema = database()
 	and pk.column_name is null
 	!!~col_sel!!
 order by s.ordinal_position;
@@ -436,7 +456,7 @@ from
 alter table cmp_cols add column sqlcmd character varying(500);
 update cmp_cols
 set sqlcmd =
-concat('case when b.', column_name, ' is null then case when s.', column_name, ' is null then 0 else 1 end else case when s.', column_name, ' is null then 1 else case when b.', column_name, ' = s.', column_name, ' then 0 else 1 end end end')
+concat('case when b.', column_name, ' is null then case when s.', column_name, ' is null then 0 else 1 end else case when s.', column_name, ' is null then 1 else case when ', if(is_text, concat('cast(b.', column_name, ' as binary) = cast(s.', column_name, ' as binary)'), concat('b.', column_name, ' = s.', column_name)), ' then 0 else 1 end end end')
 ;
 
 -- Create the expression to determine whether there is a difference for any column.
@@ -491,7 +511,7 @@ drop table if exists cmp_primary_key_columns cascade;
 -- ################################################################
 --			Script COMPARE_CHANGED
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT COMPARE_CHANGED with parameters (stage_pfx, table, sql_var, include_cols="", exclude_cols="")
 -- Generate SQL to characterize every row of the base table
 -- depending on whether there is a matching row in the staging
 -- table, whether a matching row has new data, or whether a
@@ -525,8 +545,6 @@ drop table if exists cmp_primary_key_columns cascade;
 --
 -- Notes
 -- 	1. The generated SQL is not terminated with a semicolon.
--- ===============================================================
--- !x! BEGIN SCRIPT COMPARE_CHANGED with parameters (stage_pfx, table, sql_var)
 
 -- Create a table of primary key columns for the table
 drop table if exists cmp_primary_key_columns cascade;
@@ -553,20 +571,26 @@ order by k.ordinal_position
 -- that are to be compared.
 -- Include only those columns from the staging table that are also in the base table.
 -- !x! sub_empty ~col_sel
--- !x! if(sub_defined(#include_cols))
+-- !x! if(not is_null("!!#include_cols!!"))
 	-- !x! sub ~col_sel and s.column_name in (!!#include_cols!!)
--- !x! elseif(sub_defined(#exclude_cols))
+-- !x! elseif(not is_null("!!#exclude_cols!!"))
 	-- !x! sub ~col_sel and s.column_name not in (!!#exclude_cols!!)
 -- !x! endif
 drop table if exists cmp_cols cascade;
 create table cmp_cols as
-select s.column_name
+select
+	s.column_name,
+	-- Text compares case- and accent-sensitively below; the default collation does not.
+	(s.data_type in ('char', 'varchar', 'tinytext', 'text', 'mediumtext', 'longtext', 'enum', 'set') and b.data_type in ('char', 'varchar', 'tinytext', 'text', 'mediumtext', 'longtext', 'enum', 'set')) as is_text
 from information_schema.columns as s
 	inner join information_schema.columns as b on s.column_name=b.column_name
 	left join cmp_primary_key_columns as pk on pk.column_name = s.column_name
 where
 	s.table_name = concat(!'!#stage_pfx!'!, !'!#table!'!)
 	and b.table_name = !'!#table!'!
+	-- information_schema covers every database on the server.
+	and s.table_schema = database()
+	and b.table_schema = database()
 	and pk.column_name is null
 	!!~col_sel!!
 order by s.ordinal_position;
@@ -586,7 +610,7 @@ from
 alter table cmp_cols add column sqlcmd character varying(500);
 update cmp_cols
 set sqlcmd =
-concat('case when b.', column_name, ' is null then case when s.', column_name, ' is null then 0 else 1 end else case when s.', column_name, ' is null then 1 else case when b.', column_name, ' = s.', column_name, ' then 0 else 1 end end end')
+concat('case when b.', column_name, ' is null then case when s.', column_name, ' is null then 0 else 1 end else case when s.', column_name, ' is null then 1 else case when ', if(is_text, concat('cast(b.', column_name, ' as binary) = cast(s.', column_name, ' as binary)'), concat('b.', column_name, ' = s.', column_name)), ' then 0 else 1 end end end')
 ;
 
 -- Create the expression to determine whether there is a difference for any column.