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

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

@@ -89,6 +89,7 @@
 -- AUTHORS
 --	Dreas Nielsen (RDN)
 --	Elizabeth Shea (ES)
+--	Caleb Grant (CG)
 --
 -- VERSION
 --	2.0.0
@@ -145,6 +146,14 @@
 --	2020-04-28	Explicitly rolled back the changes if 'do_commit' = "No".  RDN.
 --	2020-05-09	Moved the assignment of 'upsert_progress_denom' out of the
 --				'update_console_qa' script.  RDN.
+--	2026-10-15	execsql2: casts are CHAR (MySQL 8 rejects VARCHAR in CAST); the
+--				duplicate primary key check's view has its AS; LOAD_STAGING
+--				halts on do_commit=No, which MySQL/MariaDB cannot roll back
+--				because the load's CREATE and DROP statements commit; each
+--				script's notes are its docstring (SHOW SCRIPTS, the language
+--				server).  Comments inside SQL statements have a space after
+--				--, which MySQL and MariaDB require (UPDTPK_ONE failed).
+--				Tested in tests/templates of the execsql2 repository.  CG.
 -- ==================================================================
 
 
@@ -152,7 +161,7 @@
 -- ################################################################
 --			Script VALIDATE_ONE
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT VALIDATE_ONE with parameters (stage_pfx, table, script, script_line)
 -- Utility script to validate both base and staging versions of one table.
 -- Halts script processing if either of the tables are not present.
 --
@@ -164,8 +173,6 @@
 --							(for error reporting).
 --		script_line		: The script line in which they were referenced
 --							(for error reporting).
--- ===============================================================
--- !x! BEGIN SCRIPT VALIDATE_ONE with parameters (stage_pfx, table, script, script_line)
 
 -- Initialize the strings used to compile error information
 -- !x! sub_empty ~err_info
@@ -233,7 +240,7 @@ having count(*) > 0
 -- ################################################################
 --			Script VALIDATE_CONTROL
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT VALIDATE_CONTROL with parameters (stage_pfx, control_table, script, script_line)
 -- Utility script to validate contents of control table against about
 --	base and staging schema
 --
@@ -246,8 +253,6 @@ having count(*) > 0
 --							(for error reporting).
 --		script_line		: The script line in which they were referenced
 --							(for error reporting).
--- ===============================================================
--- !x! BEGIN SCRIPT VALIDATE_CONTROL with parameters (stage_pfx, control_table, script, script_line)
 
 -- Initialize the strings used to compile error information
 -- !x! sub_empty ~err_info
@@ -341,7 +346,7 @@ having count(*) > 0
 -- ################################################################
 --			Script STAGED_TO_LOAD
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT STAGED_TO_LOAD with parameters (control_table, table_list)
 -- Creates a table having the structure that is used to drive other
 -- scripts that perform QA checks and the upsert operation on multiple
 -- staging tables.
@@ -400,9 +405,6 @@ having count(*) > 0
 --
 -- Example:
 --		-- !x! execute script staged_to_load with (control_table=stagingtables, table_list="tbla, tblb, tblc")
--- ===============================================================
-
--- !x! BEGIN SCRIPT STAGED_TO_LOAD with parameters (control_table, table_list)
 
 drop table if exists !!#control_table!! cascade;
 
@@ -447,7 +449,7 @@ from itemtable;
 -- ################################################################
 --			Script LOAD_STAGING
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT LOAD_STAGING with parameters (stage_pfx, control_table, do_commit)
 -- Performs QA checks for nulls in non-null columns, for duplicated
 -- primary key values, and for invalid foreign keys in a set of staging
 -- tables to be loaded into base tables.  If there are failures in the
@@ -473,8 +475,10 @@ from itemtable;
 --							(e.g., "stg_").
 --		control_table	: The name of a table as created by the
 --							script STAGED_TO_LOAD.
---		do_commit		: Whether or not the script should commit
---							the changes; should be 'Yes' or 'No'.
+--		do_commit		: Must be 'Yes'.  MySQL and MariaDB commit at every
+--							CREATE and DROP, which the load runs, so a load
+--							cannot be rolled back; 'No' halts before anything
+--							changes.  Run QA_ALL to check without loading.
 -- Global variables:
 --		logfile			: The name of a log file to which error
 --							messages will be written.  Optional.
@@ -491,9 +495,16 @@ from itemtable;
 --
 -- Tables and views created or modified:
 --		ups_qa_fails				: view
--- ===============================================================
 
--- !x! BEGIN SCRIPT LOAD_STAGING with parameters (stage_pfx, control_table, do_commit)
+-- MySQL and MariaDB commit at every CREATE and DROP, and the load creates and
+-- drops tables and views, so it cannot be rolled back: refuse a dry run rather
+-- than commit one.
+-- !x! if(not is_true(!!#do_commit!!))
+	-- !x! sub ~message LOAD_STAGING cannot run with do_commit=!!#do_commit!! on MySQL or MariaDB:
+	-- !x! sub_append ~message the load creates tables and views, which commit, so its changes cannot be rolled back.
+	-- !x! sub_append ~message Run QA_ALL to check the staging tables without loading them.
+	-- !x! halt message "!!~message!!"
+-- !x! endif
 
 -- Clear the columns of return values from the control table, in case this control
 -- table has been used previously.
@@ -555,7 +566,7 @@ drop view if exists ups_qa_fails cascade;
 -- ################################################################
 --			Script NULLQA_ONE
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT NULLQA_ONE with parameters (stage_pfx, table, error_list)
 -- Checks that non-nullable columns are fully populated in a
 -- staging table that is an image of the base table.
 -- Reports any non-conforming columns to the console and optionally
@@ -584,9 +595,6 @@ drop view if exists ups_qa_fails cascade;
 --		ups_next_column			: view
 --		ups_null_error_list		: view
 --		ups_qa_nonnull_col		: view
--- ===============================================================
-
--- !x! BEGIN SCRIPT NULLQA_ONE with parameters (stage_pfx, table, error_list)
 
 -- Write an initial header to the logfile.
 -- !x! if(sub_defined(logfile))
@@ -643,7 +651,7 @@ limit 1;
 -- Create the return value.
 create or replace view ups_null_error_list as
 select
-	group_concat(concat(column_name, ' (', cast(null_rows as varchar(100)), ')') separator ', ') as null_errors
+	group_concat(concat(column_name, ' (', cast(null_rows as char(100)), ')') separator ', ') as null_errors
 from
 	ups_nonnull_columns
 where
@@ -716,7 +724,8 @@ drop table if exists ups_nonnull_columns cascade;
 
 -- ################################################################
 --			Script PKQA_ONE
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT PKQA_ONE with parameters (stage_pfx, table, display_errors, error_list)
 -- Check data in a staging table for violations of the primary key
 -- of the corresponding base table.
 -- Reports any PK violations found to the console and optionally
@@ -748,9 +757,6 @@ drop table if exists ups_nonnull_columns cascade;
 --		ups_primary_key_columns		: table
 --		ups_pk_check				: table
 --		ups_ercnt					: view
--- ===============================================================
-
--- !x! BEGIN SCRIPT PKQA_ONE with parameters (stage_pfx, table, display_errors, error_list)
 
 -- Write an initial header to the logfile.
 -- !x! if(sub_defined(logfile))
@@ -831,7 +837,7 @@ order by k.ordinal_position
 		-- !x! if(view_exists(ups_ercnt))
 			drop view if exists ups_ercnt cascade;
 		-- !x! endif
-		create view ups_ercnt
+		create view ups_ercnt as
 		select count(*) as errcnt, sum(row_count) as total_rows
 		from ups_pk_check;
 		-- !x! select_sub ups_ercnt
@@ -866,7 +872,8 @@ drop table if exists ups_pk_check cascade;
 
 -- ################################################################
 --			Script FKQA_ONE
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT FKQA_ONE with parameters (stage_pfx, table, display_errors, error_list)
 -- Checks foreign keys from a staging table against a base table
 -- and, if it exists, another staging table that is an image of the
 -- base table.
@@ -905,9 +912,6 @@ drop table if exists ups_pk_check cascade;
 --		ups_fk_joins				: view
 --		ups_fk_check				: view
 --		ups_ercnt					: view
--- ===============================================================
-
--- !x! BEGIN SCRIPT FKQA_ONE with parameters (stage_pfx, table, display_errors, error_list)
 
 -- Write an initial header to the logfile.
 -- !x! if(sub_defined(logfile))
@@ -1168,7 +1172,8 @@ drop table if exists ups_sel_fks;
 
 -- ################################################################
 --			Script UPSERT_ONE
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT UPSERT_ONE with parameters (stage_pfx, table, exclude_cols, display_changes, display_final, updcntvar, inscntvar)
 -- Adds data from a staging table to a base table, using UPDATE
 -- and INSERT statements.  Displays data to be modified to the
 -- user before any modifications are done.  Reports the changes
@@ -1219,9 +1224,6 @@ drop table if exists ups_sel_fks;
 --		ups_stgmatches			: temporary view
 --		ups_assexpr				: temporary view
 --		ups_newrows				: temporary view
--- ===============================================================
-
--- !x! BEGIN SCRIPT UPSERT_ONE with parameters (stage_pfx, table, exclude_cols, display_changes, display_final, updcntvar, inscntvar)
 
 -- Remove substitution variables that will contain the generated
 -- update and insert statements so that the existence of valid
@@ -1508,7 +1510,8 @@ drop table if exists ups_cols cascade;
 
 -- ################################################################
 --			Script UPSERT_ALL
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT UPSERT_ALL with parameters (stage_pfx, control_table)
 -- Updates multiple base tables with new or revised data from
 -- staging tables, using the UPSERT_ONE script.
 --
@@ -1549,9 +1552,6 @@ drop table if exists ups_cols cascade;
 --		ups_proctables				: table
 --		ups_toprocess				: view
 --		ups_upsert_rows				: view
--- ===============================================================
-
--- !x! BEGIN SCRIPT UPSERT_ALL with parameters (stage_pfx, control_table)
 
 -- Validate contents of control table
 -- !x! execute script validate_control with (stage_pfx=!!#stage_pfx!!, control_table=!!#control_table!!, script=!!$CURRENT_SCRIPT_NAME!!, script_line=!!$SCRIPT_LINE!!)
@@ -1770,7 +1770,8 @@ drop table if exists ups_dependencies cascade;
 
 -- ################################################################
 --			Script QA_ALL
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT QA_ALL with parameters (stage_pfx, control_table)
 -- Conducts null, primary key, and foreign key checks on multiple
 -- staging tables containing new or revised data for staging tables,
 -- using the NULLQA_ONE, PKQA_ONE, and FKQA_ONE scripts.
@@ -1821,10 +1822,6 @@ drop table if exists ups_dependencies cascade;
 --
 -- Global variables modified:
 --		upsert_progress_denom		: Created or redefined.
---
--- ===============================================================
-
--- !x! BEGIN SCRIPT QA_ALL with parameters (stage_pfx, control_table)
 
 -- Get denominator for progress bar if console is on.
 -- !x! if(console_on)
@@ -2005,7 +2002,8 @@ drop view if exists ups_toprocess;
 
 -- ################################################################
 --			Script UPDTPK_ONE
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT UPDTPK_ONE with parameters (stage_pfx, table, display_errors, display_changes)
 -- Updates primary keys in the base table, based on new and existing
 -- values of PK columns in a staging table, using UPDATE
 -- statements.  Displays data to be modified to the
@@ -2038,9 +2036,6 @@ drop view if exists ups_toprocess;
 --		ups_pkupdates			: temporary table
 --		ups_pkupdate_strings	: temporary view
 --		ups_pkupdates			: temporary table
--- ===============================================================
-
--- !x! BEGIN SCRIPT UPDTPK_ONE with parameters (stage_pfx, table, display_errors, display_changes)
 
 -- !x! if(console_on)
 	-- !x! console status "Primary key updates"
@@ -2081,17 +2076,17 @@ select
 	k.table_schema,
 	k.table_name,
 	k.column_name,
-	cast(concat('b.', column_name) as varchar(2000)) as base_aliased,
-	cast(concat('s.', column_name) as varchar(2000)) as staging_aliased,
-	cast(concat('s.', column_name, ' as staging_', column_name) as varchar(2000)) as staging_aliased_prefix,
-	cast(concat('b.', column_name, ' = s.', column_name) as varchar(2000)) as join_expr,
-	cast(concat('new_', column_name) as varchar(2000)) as newpk_col,
-	cast(concat('s.new_', column_name) as varchar(2000)) as newpk_col_aliased,
-	cast(concat('new_', column_name, ' is null') as varchar(2000)) as newpk_col_empty,
-	cast(concat('new_', column_name, ' is not null') as varchar(2000)) as newpk_col_not_empty,
-	cast(concat('b.', column_name, ' = s.new_', column_name) as varchar(2000)) as assmt_expr,
-	cast(concat('b.', column_name, ' = s.new_', column_name) as varchar(2000)) as join_expr_oldnew,
-	cast(concat('s.new_', column_name, ' = b.new_', column_name) as varchar(2000)) as join_expr_new,
+	cast(concat('b.', column_name) as char(2000)) as base_aliased,
+	cast(concat('s.', column_name) as char(2000)) as staging_aliased,
+	cast(concat('s.', column_name, ' as staging_', column_name) as char(2000)) as staging_aliased_prefix,
+	cast(concat('b.', column_name, ' = s.', column_name) as char(2000)) as join_expr,
+	cast(concat('new_', column_name) as char(2000)) as newpk_col,
+	cast(concat('s.new_', column_name) as char(2000)) as newpk_col_aliased,
+	cast(concat('new_', column_name, ' is null') as char(2000)) as newpk_col_empty,
+	cast(concat('new_', column_name, ' is not null') as char(2000)) as newpk_col_not_empty,
+	cast(concat('b.', column_name, ' = s.new_', column_name) as char(2000)) as assmt_expr,
+	cast(concat('b.', column_name, ' = s.new_', column_name) as char(2000)) as join_expr_oldnew,
+	cast(concat('s.new_', column_name, ' = b.new_', column_name) as char(2000)) as join_expr_new,
 	k.ordinal_position
 from information_schema.table_constraints as tc
 inner join information_schema.key_column_usage as k
@@ -2225,7 +2220,8 @@ where
 
 -- ################################################################
 --			Script UPDTPKQA_ONE
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT UPDTPKQA_ONE with parameters (stage_pfx, table, pkinfo_table, qaerror_table, display_errors)
 -- Performs QA checks on requested primary key updates to a table,
 -- based on old and new values of the table's primary key columns
 -- in a staging table.
@@ -2274,9 +2270,6 @@ where
 --		ups_fkcol_refs				: temporary table
 --		ups_pkcol_deps				: temporary table
 --		ups_pkfk_ctrl				: temporary table
--- ===============================================================
-
--- !x! BEGIN SCRIPT UPDTPKQA_ONE with parameters (stage_pfx, table, pkinfo_table, qaerror_table, display_errors)
 
 -- Write an initial header to the logfile.
 -- !x! if(sub_defined(logfile))
@@ -2326,9 +2319,9 @@ where
 	select
 		group_concat(newpk_col order by ordinal_position separator ', ') as missing_newpk_cols
 	from
-		--Base table PK columns, with expected name in staging table ("new_" prepended to column name)
+		-- Base table PK columns, with expected name in staging table ("new_" prepended to column name)
 		!!#pkinfo_table!! as pk
-		--Staging table columns
+		-- Staging table columns
 		left join
 			(
 			select table_name, column_name
@@ -2748,7 +2741,7 @@ where
 			from
 				ups_fkcol_refs as refs
 				inner join
-				--Distinct list of FK constraints on the table that include ANY PK columns
+				-- Distinct list of FK constraints on the table that include ANY PK columns
 					(
 					select distinct
 						fk_constraint, r.table_schema, r.table_name
@@ -2789,7 +2782,7 @@ where
 			limit 1
 			;
 
-			--Process all constraints: check every foreign key
+			-- Process all constraints: check every foreign key
 			--!x! execute script updtpkqa_one_innerloop with (stage_pfx=!!#stage_pfx!!, qaerror_table=!!#qaerror_table!!, display_errors=!!#display_errors!!)
 		-- !x! endif
 	-- !x! endif
@@ -2970,7 +2963,7 @@ where
 		drop view if exists ups_pk_fk_qa_error cascade;
 	-- !x! endif
 
-	--LOOP
+	-- LOOP
 	-- !x! execute script updtpkqa_one_innerloop with (stage_pfx=!!#stage_pfx!!, qaerror_table=!!#qaerror_table!!, display_errors=!!#display_errors!!)
 
 -- !x! endif

{execsql2-2.30.0.data → execsql2-2.31.2.data}/data/execsql2_extras/pg_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
@@ -54,13 +55,17 @@
 --	2020-02-27	Added COMPARE_CHANGES and COMPARE_CHANGED. v. 1.1.0.  RDN.
 --	2020-02-29	Excluded PK columns from output of COMPARE_COMMON_VALS.
 --				v. 1.1.1.  RDN.
+--	2026-10-15	execsql2: each script's notes are its docstring (SHOW SCRIPTS, the
+--				language server); 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 (base_schema, staging, 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
@@ -101,8 +106,6 @@
 --
 -- Notes
 -- 	1. The generated SQL is not terminated with a semicolon.
--- ===============================================================
--- !x! BEGIN SCRIPT COMPARE_COMMON with parameters (base_schema, staging, table, sql_var)
 
 -- Create a table of primary key columns for the table
 drop table if exists cmp_primary_key_columns cascade;
@@ -129,9 +132,9 @@ 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;
@@ -201,7 +204,7 @@ from
 -- ################################################################
 --			Script COMPARE_COMMON_VALS
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT COMPARE_COMMON_VALS with parameters (base_schema, staging, 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
@@ -238,8 +241,6 @@ from
 --
 -- Notes
 -- 	1. The generated SQL is not terminated with a semicolon.
--- ===============================================================
--- !x! BEGIN SCRIPT COMPARE_COMMON_VALS with parameters (base_schema, staging, table, sql_var)
 
 -- Create a table of primary key columns for the table
 drop table if exists cmp_primary_key_columns cascade;
@@ -266,9 +267,9 @@ 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;
@@ -340,7 +341,7 @@ from
 -- ################################################################
 --			Script COMPARE_CHANGES
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT COMPARE_CHANGES with parameters (base_schema, staging, 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.
@@ -376,8 +377,6 @@ from
 --
 -- Notes
 -- 	1. The generated SQL is not terminated with a semicolon.
--- ===============================================================
--- !x! BEGIN SCRIPT COMPARE_CHANGES with parameters (base_schema, staging, table, sql_var)
 
 -- Create a table of primary key columns for the table
 drop table if exists cmp_primary_key_columns cascade;
@@ -404,9 +403,9 @@ 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;
@@ -486,7 +485,7 @@ from
 -- ################################################################
 --			Script COMPARE_CHANGED
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT COMPARE_CHANGED with parameters (base_schema, staging, 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
@@ -523,8 +522,6 @@ from
 --
 -- Notes
 -- 	1. The generated SQL is not terminated with a semicolon.
--- ===============================================================
--- !x! BEGIN SCRIPT COMPARE_CHANGED with parameters (base_schema, staging, table, sql_var)
 
 -- Create a table of primary key columns for the table
 drop table if exists cmp_primary_key_columns cascade;
@@ -551,9 +548,9 @@ 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;

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

@@ -36,9 +36,10 @@
 --
 -- AUTHORS
 --	Dreas Nielsen (RDN)
+--	Caleb Grant (CG)
 --
 -- VERSION
---	1.0.1
+--	1.1.0
 --
 -- HISTORY
 --	 Date		 Remarks
@@ -51,13 +52,17 @@
 --				summarization.  Modified item addition to do nothing on
 --				conflicts.  Modified to use subquery instead of CTE when
 --				appending a new item.  Version 1.0.1.  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.  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.
 --
@@ -74,14 +79,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,
@@ -121,13 +124,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
@@ -196,7 +197,7 @@ drop table gls_newglossary cascade;
 -- ################################################################
 --			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.
 --
@@ -208,14 +209,12 @@ drop table gls_newglossary cascade;
 -- 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
@@ -248,16 +247,13 @@ drop table gls_newglossary cascade;
 -- ################################################################
 --			Script ADD_GLOSSARY_TABLE
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT ADD_GLOSSARY_TABLE with parameters (schema, table)
 -- Add definitions of all columns in a specified table to the
 -- custom glossary.
 --
 -- Required input arguments:
 --		schema			: The schema of the table.
 --		table			: The table name.
---
--- ===============================================================
--- !x! BEGIN SCRIPT ADD_GLOSSARY_TABLE with parameters (schema, table)
 
 -- !x! sub ~entry_alias !!$current_alias!!