execsql2 2.30.0__py3-none-any.whl → 2.31.2__py3-none-any.whl

execsql/metacommands/reference.py

@@ -30,7 +30,7 @@ __all__ = [
     "to_snippet",
 ]
 
-DOCS_URL = "https://execsql2.readthedocs.io/en/latest/reference/"
+DOCS_URL = "https://execsql2.readthedocs.io/en/stable/reference/"
 
 
 @dataclass(frozen=True)

execsql/metacommands/upsert.py

@@ -421,7 +421,7 @@ def _export_failures_if_requested(
 
 def _handle_pg_upsert_errors(fn: Any, metacommandline: str | None) -> Any:
     """Run *fn*, translating pg-upsert exceptions to ErrInfo."""
-    from pg_upsert import UserCancelledError
+    from pg_upsert import PgUpsertError, UserCancelledError
 
     try:
         return fn()
@@ -433,6 +433,15 @@ def _handle_pg_upsert_errors(fn: Any, metacommandline: str | None) -> Any:
         ) from exc
     except ErrInfo:
         raise
+    except PgUpsertError as exc:
+        # The run was rolled back.  The variables describe this failed run,
+        # not whatever an earlier PG_UPSERT left in them.
+        _set_subvars(exc.result)
+        raise ErrInfo(
+            "cmd",
+            command_text=metacommandline,
+            other_msg=f"PG_UPSERT rolled back after a database error: {exc.original}",
+        ) from exc
     except Exception as exc:
         raise ErrInfo(
             "exception",

execsql/utils/auth.py

@@ -88,22 +88,30 @@ _DEFAULT_PORTS = {"PostgreSQL": 5432, "MySQL": 3306, "SQL Server": 1433, "Oracle
 _plaintext_warned: bool = False
 
 
+def _storing_backend(backend: Any) -> Any:
+    """The backend a password saved through *backend* lands in.
+
+    keyring's ``ChainerBackend`` saves to the first of its backends (highest
+    priority first) that accepts it, such as the macOS Keychain ahead of a
+    ``keyrings.alt`` file.
+    """
+    chained = getattr(backend, "backends", None)
+    return chained[0] if chained else backend
+
+
 def is_plaintext_keyring() -> bool:
-    """Return True if the active keyring backend stores secrets in cleartext.
-
-    B20/F040: on headless Linux without a real Secret Service, the
-    ``keyrings.alt.file.PlaintextKeyring`` (or
-    ``EncryptedKeyring`` with a hard-coded passphrase) backend is
-    used silently. Detect by inspecting the active backend's module
-    path so callers can warn the user instead of pretending secrets
-    are encrypted.
+    """Return True if a password stored now would be written in cleartext.
+
+    That is ``keyrings.alt``'s ``PlaintextKeyring``: on headless Linux with no
+    Secret Service, keyring falls back to it silently.  Its encrypted
+    sibling (a master password protects the file), the Windows backends and
+    keyring's ``fail`` placeholder (which stores nothing) are not.
     """
     try:
         import keyring
 
-        backend = keyring.get_keyring()
-        module = type(backend).__module__
-        return "keyrings.alt" in module or "fail" in module.lower()
+        cls = type(_storing_backend(keyring.get_keyring()))
+        return cls.__module__.startswith("keyrings.alt") and cls.__name__ == "PlaintextKeyring"
     except Exception:
         return False
 
@@ -118,11 +126,10 @@ def _warn_if_plaintext_keyring() -> None:
         import keyring
         import sys
 
-        backend_name = type(keyring.get_keyring()).__name__
+        backend_name = type(_storing_backend(keyring.get_keyring())).__name__
         print(
             f"WARNING: active keyring backend ({backend_name}) stores secrets in "
-            f"cleartext or with a hard-coded key. Stored passwords are not "
-            f"meaningfully protected.",
+            f"cleartext. Stored passwords are not meaningfully protected.",
             file=sys.stderr,
         )
     except Exception:

execsql/utils/errors.py

@@ -37,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:

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 "\\/"

{execsql2-2.30.0.data → execsql2-2.31.2.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.30.0.data → execsql2-2.31.2.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.

{execsql2-2.30.0.data → execsql2-2.31.2.data}/data/execsql2_extras/md_glossary.sql

@@ -38,9 +38,10 @@
 --
 -- AUTHORS
 --	Dreas Nielsen (RDN)
+--	Caleb Grant (CG)
 --
 -- VERSION
---	1.0.0
+--	1.1.0
 --
 -- HISTORY
 --	 Date		 Remarks
@@ -50,13 +51,17 @@
 --				existence, to eliminate spurious messages from the DBMS.
 --				Made the 'gls_glossary' table and 'glossary' view non-temporary
 --				because the 'glossary' view can't reference a temporary table. RDN.
+--	2026-10-15	execsql2: each script's notes are its docstring (SHOW SCRIPTS, the
+--				language server); def_url is a declared optional parameter;
+--				ADD_GLOSSARY_ITEM keeps def_url; MySQL 8 casts (CHAR, not VARCHAR or ::text).  Version 1.1.0.  Tested in
+--				tests/templates of the execsql2 repository.  CG.
 -- ============================================================================
 
 
 -- ################################################################
 --			Script INIT_GLOSSARY
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT INIT_GLOSSARY with parameters (glossary_db_alias, glossary_table, name_col, def_col, def_url="")
 -- Initialize the custom glossary and describe the master glossary
 -- that will provide descriptions to include in the custom glossary.
 --
@@ -73,14 +78,12 @@
 -- Optional input argument:
 --		def_url				: The URL of a page that provides additional
 --								information about the column (or other object).
--- ===============================================================
--- !x! BEGIN SCRIPT INIT_GLOSSARY with parameters (glossary_db_alias, glossary_table, name_col, def_col)
 
 -- !x! sub gls_alias   !!#glossary_db_alias!!
 -- !x! sub gls_table   !!#glossary_table!!
 -- !x! sub gls_name    !!#name_col!!
 -- !x! sub gls_def     !!#def_col!!
--- !x! if(sub_defined(#def_url))
+-- !x! if(not is_null("!!#def_url!!"))
 	-- !x! sub gls_has_url Yes
 	-- !x! sub gls_url !!#def_url!!
 	-- !x! sub ~url_colspec !!gls_url!! text,
@@ -122,13 +125,11 @@ from gls_glossary order by !!gls_name!!;
 -- ################################################################
 --			Script ADD_GLOSSARY_LIST
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT ADD_GLOSSARY_LIST with parameters (column_list)
 -- Add a specific list of columns to the glossary.
 --
 -- Required input arguments:
 --		column_list		: A string of comma-separated column names.
--- ===============================================================
--- !x! BEGIN SCRIPT ADD_GLOSSARY_LIST with parameters (column_list)
 
 -- !x! sub ~entry_alias !!$current_alias!!
 -- !x! use initial
@@ -230,7 +231,7 @@ select !!gls_collist!! from gls_newglossary;
 -- ################################################################
 --			Script ADD_GLOSSARY_ITEM
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT ADD_GLOSSARY_ITEM with parameters (item, definition, def_url="")
 -- Add an object name and definition to the custom glossary.
 -- This does not use the master glossary.
 --
@@ -242,19 +243,21 @@ select !!gls_collist!! from gls_newglossary;
 -- Optional input argument:
 --		def_url				: The URL of a page that provides additional
 --								information about the item.
--- ===============================================================
--- !x! BEGIN SCRIPT ADD_GLOSSARY_ITEM with parameters (item, definition)
 
 -- !x! sub ~entry_alias !!$current_alias!!
 -- !x! use initial
 
--- !x! if(is_true(gls_has_url))
--- !x! andif(sub_defined(#def_url))
+-- !x! if(is_true(!!gls_has_url!!))
+-- !x! andif(not is_null("!!#def_url!!"))
 	insert into gls_glossary (!!gls_name!!, !!gls_def!!, !!gls_url!!)
 	select
 		inp.item, inp.definition, inp.url
 	from
-		(select !'!#item!'!::text as item, !'!#definition!'!::text as definition, !'!#def_url!'!::text as url) as inp
+		(select
+			cast(!'!#item!'! as char(255)) as item,
+			cast(!'!#definition!'! as char(255)) as definition,
+			cast(!'!#def_url!'! as char(255)) as url
+		) as inp
 		left join gls_glossary as g on g.!!gls_name!! = inp.item
 	where
 		g.!!gls_name!! is null;
@@ -264,8 +267,8 @@ select !!gls_collist!! from gls_newglossary;
 		inp.item, inp.definition
 	from
 		(select
-			cast(!'!#item!'! as varchar(255)) as item,
-			cast(!'!#definition!'! as varchar(255)) as definition
+			cast(!'!#item!'! as char(255)) as item,
+			cast(!'!#definition!'! as char(255)) as definition
 		) as inp
 		left join gls_glossary as g on g.!!gls_name!! = inp.item
 	where
@@ -285,15 +288,12 @@ select !!gls_collist!! from gls_newglossary;
 -- ################################################################
 --			Script ADD_GLOSSARY_TABLE
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT ADD_GLOSSARY_TABLE with parameters (table)
 -- Add definitions of all columns in a specified table to the
 -- custom glossary.
 --
 -- Required input arguments:
 --		table			: The table name.
---
--- ===============================================================
--- !x! BEGIN SCRIPT ADD_GLOSSARY_TABLE with parameters (table)
 
 -- !x! sub ~entry_alias !!$current_alias!!