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

{execsql2-2.30.0.data → execsql2-2.31.1.data}/data/execsql2_extras/ss_compare.sql

@@ -30,8 +30,9 @@
 --		begin with "cmp_".
 --	4. This script requires SQL Server 2017 or later.
 --
--- AUTHOR
+-- AUTHORS
 --	Dreas Nielsen (RDN)
+--	Caleb Grant (CG)
 --
 -- COPYRIGHT AND LICENSE
 -- 	Copyright (c) 2020 R.Dreas Nielsen
@@ -46,20 +47,25 @@
 -- 	The GNU General Public License is available at <http://www.gnu.org/licenses/>
 --
 -- VERSION
---	1.1.1
+--	1.2.0
 --
 -- HISTORY
 --	 Date		 Remarks
 --	----------	-----------------------------------------------------
 --	2020-02-29	Created from v. 1.1.1 for Postgres.  RDN.
 --	2020-03-01	Modified for SQL Server.  RDN.
+--	2026-10-15	execsql2: text values compare case- and accent-sensitively (the
+--				default collation reported 'y' -> 'Y' as unchanged); 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 (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
@@ -100,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
 if object_id('tempdb..#cmp_primary_key_columns') is not null drop table #cmp_primary_key_columns;
@@ -128,13 +132,16 @@ 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
 if object_id('tempdb..#cmp_cols') is not null drop table #cmp_cols;
-select s.column_name
+select
+	s.column_name,
+	-- Text compares case- and accent-sensitively below; the default collation does not.
+	case when s.data_type in ('char', 'varchar', 'nchar', 'nvarchar', 'text', 'ntext') and b.data_type in ('char', 'varchar', 'nchar', 'nvarchar', 'text', 'ntext') then 1 else 0 end as is_text
 into #cmp_cols
 from information_schema.columns as s
 	inner join information_schema.columns as b on s.column_name=b.column_name
@@ -163,7 +170,7 @@ from
 alter table #cmp_cols add sqlcmd varchar(max);
 update #cmp_cols
 set sqlcmd =
-'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
+'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 + case when is_text = 1 then ' collate Latin1_General_BIN2' else '' end + ' then ''Same'' else ''Different'' end end end as ' + column_name
 ;
 
 -- Create the comparison expression for all columns.
@@ -203,7 +210,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
@@ -240,8 +247,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
 if object_id('tempdb..#cmp_primary_key_columns') is not null drop table #cmp_primary_key_columns;
@@ -268,13 +273,16 @@ 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
 if object_id('tempdb..#cmp_cols') is not null drop table #cmp_cols;
-select s.column_name
+select
+	s.column_name,
+	-- Text compares case- and accent-sensitively below; the default collation does not.
+	case when s.data_type in ('char', 'varchar', 'nchar', 'nvarchar', 'text', 'ntext') and b.data_type in ('char', 'varchar', 'nchar', 'nvarchar', 'text', 'ntext') then 1 else 0 end as is_text
 into #cmp_cols
 from information_schema.columns as s
 	inner join information_schema.columns as b on s.column_name=b.column_name
@@ -345,7 +353,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.
@@ -381,8 +389,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
 if object_id('tempdb..#cmp_primary_key_columns') is not null drop table #cmp_primary_key_columns;
@@ -409,13 +415,16 @@ 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
 if object_id('tempdb..#cmp_cols') is not null drop table #cmp_cols;
-select s.column_name
+select
+	s.column_name,
+	-- Text compares case- and accent-sensitively below; the default collation does not.
+	case when s.data_type in ('char', 'varchar', 'nchar', 'nvarchar', 'text', 'ntext') and b.data_type in ('char', 'varchar', 'nchar', 'nvarchar', 'text', 'ntext') then 1 else 0 end as is_text
 into #cmp_cols
 from information_schema.columns as s
 	inner join information_schema.columns as b on s.column_name=b.column_name
@@ -444,7 +453,7 @@ from
 alter table #cmp_cols add sqlcmd varchar(max);
 update #cmp_cols
 set sqlcmd =
-'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'
+'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 + case when is_text = 1 then ' collate Latin1_General_BIN2' else '' end + ' then 0 else 1 end end end'
 ;
 
 -- Create the expression to determine whether there is a difference for any column.
@@ -494,7 +503,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
@@ -531,8 +540,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
 if object_id('tempdb..#cmp_primary_key_columns') is not null drop table #cmp_primary_key_columns;
@@ -559,13 +566,16 @@ 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
 if object_id('tempdb..#cmp_cols') is not null drop table #cmp_cols;
-select s.column_name
+select
+	s.column_name,
+	-- Text compares case- and accent-sensitively below; the default collation does not.
+	case when s.data_type in ('char', 'varchar', 'nchar', 'nvarchar', 'text', 'ntext') and b.data_type in ('char', 'varchar', 'nchar', 'nvarchar', 'text', 'ntext') then 1 else 0 end as is_text
 into #cmp_cols
 from information_schema.columns as s
 	inner join information_schema.columns as b on s.column_name=b.column_name
@@ -594,7 +604,7 @@ from
 alter table #cmp_cols add sqlcmd varchar(max);
 update #cmp_cols
 set sqlcmd =
-'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'
+'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 + case when is_text = 1 then ' collate Latin1_General_BIN2' else '' end + ' 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.1.data}/data/execsql2_extras/ss_glossary.sql

@@ -37,9 +37,10 @@
 -- AUTHORS
 --	Dreas Nielsen (RDN)
 --	Elizabeth Shea (ES)
+--	Caleb Grant (CG)
 --
 -- VERSION
---	1.0.0
+--	1.1.0
 --
 -- HISTORY
 --	 Date		 Remarks
@@ -47,6 +48,10 @@
 --	2019-05-01	Created SQL Server version from 2019-04-20 version for
 --				Postgres.  RDN.
 --	2019-05-11	Completed conversion to SQL Server.  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.
 -- ============================================================================
 
 
@@ -122,7 +127,7 @@ where row_num=(select max(row_num) from agg);
 -- ################################################################
 --			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.
 --
@@ -139,14 +144,12 @@ where row_num=(select max(row_num) from agg);
 -- 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,
@@ -187,13 +190,11 @@ from gls_glossary;
 -- ################################################################
 --			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
@@ -301,7 +302,7 @@ drop table gls_newentries;
 -- ################################################################
 --			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.
 --
@@ -313,14 +314,12 @@ drop table gls_newentries;
 -- 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
@@ -353,16 +352,13 @@ drop table gls_newentries;
 -- ################################################################
 --			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!!
 

{execsql2-2.30.0.data → execsql2-2.31.1.data}/data/execsql2_extras/ss_upsert.sql

@@ -90,6 +90,7 @@
 -- AUTHORS
 --  Elizabeth Shea (ES)
 --	Dreas Nielsen (RDN)
+--	Caleb Grant (CG)
 --
 -- VERSION
 --	2.0.0
@@ -128,12 +129,20 @@
 --	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: LOAD_STAGING with do_commit=No keeps the row counts it
+--				writes to the control table, which the rollback undid; each
+--				script's notes are its docstring (SHOW SCRIPTS, the language
+--				server).  UPSERT_ONE with exclude_cols no longer fails
+--				(ambiguous column_name); FKQA_ONE rebuilds its table of
+--				foreign keys on every call, so a copy left in the session
+--				from an earlier load cannot hide foreign key errors.  Tested
+--				in tests/templates of the execsql2 repository.  CG.
 -- ==================================================================
 
 -- ################################################################
 --			Script TEMPTABLE_ISVALID
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT TEMPTABLE_ISVALID with parameters (temptable_name)
 -- Utility script to validate SQL Server temp table name.
 -- Confirms that the name passed by the user is prefixed with a '#',
 -- and raises an error if not
@@ -148,8 +157,6 @@
 --
 -- Example:
 --		-- !x! execute script temp_table_isvalid with (temptable_name=#stagingtables)
--- ===============================================================
--- !x! BEGIN SCRIPT TEMPTABLE_ISVALID with parameters (temptable_name)
 
 -- Take the user-provided temp_table argument and validate syntax
 if object_id('tempdb..#tmptbl_name') is not null drop table #tmptbl_name;
@@ -176,7 +183,7 @@ into #tmptbl_name
 -- ################################################################
 --			Script STRING_AGG
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT STRING_AGG with parameters (table_name, string_col, order_col, delimiter, string_var)
 -- Utility script to perform string aggregation
 -- Beginning with 2017 edition, SQL Server *does* include the string_agg()
 -- function, but earlier versions do not.
@@ -195,8 +202,6 @@ into #tmptbl_name
 --
 -- Example:
 --		-- !x! execute script string_agg with (table_name=#nonnulcols, string_col=null_errors, order_col=null_errors, delimiter=", ", string_var=+nullcols)
--- ===============================================================
--- !x! BEGIN SCRIPT STRING_AGG with parameters (table_name, string_col, order_col, delimiter, string_var)
 
 if object_id('tempdb..#agg_string') is not null drop table #agg_string;
 with enum as
@@ -242,7 +247,7 @@ where row_num=(select max(row_num) from agg);
 -- ################################################################
 --			Script VALIDATE_SCHEMAS
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT VALIDATE_SCHEMAS with parameters (base_schema, staging, error_list)
 -- Utility script to validate base and staging schema
 --
 -- Required input arguments:
@@ -253,8 +258,6 @@ where row_num=(select max(row_num) from agg);
 --		error_list		: The name of the variable to receive a comma-
 --							delimited list of the names of invalid
 --							schema names.
--- ===============================================================
--- !x! BEGIN SCRIPT VALIDATE_SCHEMAS with parameters (base_schema, staging, error_list)
 
 if object_id('tempdb..#ups_ctrl_invl_schema') is not null drop table #ups_ctrl_invl_schema;
 select
@@ -290,7 +293,7 @@ where
 -- ################################################################
 --			Script VALIDATE_ONE
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT VALIDATE_ONE with parameters (base_schema, staging, table, script, script_line)
 -- Utility script to validate one table in both base and staging schema
 -- Halts script processing if any either of the schemas are non-existent,
 --  or if either of the tables are not present within those schemas.
@@ -304,8 +307,6 @@ where
 --							(for error reporting).
 --		script_line		: The script line in which they were referenced
 --							(for error reporting).
--- ===============================================================
--- !x! BEGIN SCRIPT VALIDATE_ONE with parameters (base_schema, staging, table, script, script_line)
 
 -- Initialize the strings used to compile error information
 -- !x! sub_empty ~err_info
@@ -381,7 +382,7 @@ where
 -- ################################################################
 --			Script VALIDATE_CONTROL
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT VALIDATE_CONTROL with parameters (base_schema, staging, control_table, script, script_line)
 -- Utility script to validate contents of control table against about
 --	base and staging schema
 --
@@ -395,8 +396,6 @@ where
 --							(for error reporting).
 --		script_line		: The script line in which they were referenced
 --							(for error reporting).
--- ===============================================================
--- !x! BEGIN SCRIPT VALIDATE_CONTROL with parameters (base_schema, staging, control_table, script, script_line)
 
 -- Initialize the strings used to compile error information
 -- !x! sub_empty ~err_info
@@ -484,7 +483,7 @@ where
 -- ################################################################
 --			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.
@@ -544,9 +543,6 @@ where
 --
 -- 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)
 
 -- Run script to validate that control table name is valid temp table name
 -- !x! execute script temptable_isvalid with args (temptable_name=!!#control_table!!)
@@ -617,7 +613,7 @@ from itemtable;
 -- ################################################################
 --			Script LOAD_STAGING
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT LOAD_STAGING with parameters (base_schema, staging, 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
@@ -660,9 +656,6 @@ from itemtable;
 --
 -- Tables and views created or modified:
 --		#ups_qa_fails			: temporary table
--- ===============================================================
-
--- !x! BEGIN SCRIPT LOAD_STAGING with parameters (base_schema, staging, control_table, do_commit)
 
 
 -- Clear the columns of return values from the control table, in case this control
@@ -699,7 +692,26 @@ where null_errors is not null or pk_errors is not null or fk_errors is not null;
 			-- !x! write "!!$current_time!! -- CHANGES COMMITTED." to !!logfile!!
 		-- !x! endif
 	-- !x! else
+		-- The rollback also undoes the counts UPSERT_ALL wrote to the control
+		-- table.  Keep them, so that a dry run reports what it would change.
+		if object_id('tempdb..#ups_counts') is not null drop table #ups_counts;
+		select
+			string_agg(
+				'(' + quotename(table_name, '''') + ', '
+				+ coalesce(cast(rows_updated as varchar(20)), 'null') + ', '
+				+ coalesce(cast(rows_inserted as varchar(20)), 'null') + ')',
+				', '
+			) as counts
+		into #ups_counts
+		from !!#control_table!!;
+		-- !x! subdata ~ups_counts #ups_counts
 		-- !x! autocommit on with rollback
+		update c
+		set rows_updated = v.rows_updated, rows_inserted = v.rows_inserted
+		from
+			!!#control_table!! as c
+			inner join (values !!~ups_counts!!) as v (table_name, rows_updated, rows_inserted)
+				on v.table_name = c.table_name;
 		-- !x! write "CHANGES NOT COMMITTED ('do_commit' argument = !!#do_commit!!)"
 		-- !x! if(sub_defined(log_changes))
 		-- !x! andif(is_true(!!log_changes!!))
@@ -721,7 +733,7 @@ where null_errors is not null or pk_errors is not null or fk_errors is not null;
 -- ################################################################
 --			Script NULLQA_ONE
 -- ===============================================================
---
+-- !x! BEGIN SCRIPT NULLQA_ONE with parameters (base_schema, staging, 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
@@ -751,9 +763,6 @@ where null_errors is not null or pk_errors is not null or fk_errors is not null;
 --		#ups_next_column		: temporary table
 --		#ups_null_error_list	: temporary table
 --		#ups_qa_nonnull_col		: temporary table
--- ===============================================================
-
--- !x! BEGIN SCRIPT NULLQA_ONE with parameters (base_schema, staging, table, error_list)
 
 -- Write an initial header to the logfile.
 -- !x! if(sub_defined(logfile))
@@ -879,7 +888,8 @@ where
 
 -- ################################################################
 --			Script PKQA_ONE
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT PKQA_ONE with parameters (base_schema, staging, table, display_errors, error_list)
 -- Check data a staging table for violations of the primary key
 -- of the corresponding base table.
 -- Reports any PK violations found to the console and optionally
@@ -912,9 +922,6 @@ where
 --		#ups_primary_key_columns		: temporary table
 --		#ups_pk_check					: temporary table
 --		#ups_ercnt						: temporary table
--- ===============================================================
-
--- !x! BEGIN SCRIPT PKQA_ONE with parameters (base_schema, staging, table, display_errors, error_list)
 
 -- Write an initial header to the logfile.
 -- !x! if(sub_defined(logfile))
@@ -1009,7 +1016,8 @@ order by k.ordinal_position
 
 -- ################################################################
 --			Script FKQA_ONE
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT FKQA_ONE with parameters (base_schema, staging, 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.
@@ -1048,9 +1056,6 @@ order by k.ordinal_position
 --		ups_fk_joins				: temporary table
 --		ups_fk_check				: temporary table
 --		ups_ercnt					: temporary table
--- ===============================================================
-
--- !x! BEGIN SCRIPT FKQA_ONE with parameters (base_schema, staging, table, display_errors, error_list)
 
 -- Write an initial header to the logfile.
 -- !x! if(sub_defined(logfile))
@@ -1069,14 +1074,11 @@ order by k.ordinal_position
 
 
 -- Create a table of *all* foreign key dependencies in this database.
--- Because this may be an expensive operation (in terms of time), the
--- table is not re-created if it already exists.  "Already exists"
--- means that a table with the expected name exists.  No check is
--- done to ensure that this table has the correct structure.  The
--- goal is to create the table of all foreign keys only once to
--- minimize the time required if QA checks are to be run on multiple
--- staging tables.
-if object_id('tempdb..#ups_foreign_key_columns') is null
+-- It is rebuilt on every call: a copy left in the session from an
+-- earlier load (a second load in the same script, or a pooled
+-- connection that keeps its temporary tables) described other tables
+-- and let foreign key errors through.
+if object_id('tempdb..#ups_foreign_key_columns') is not null drop table #ups_foreign_key_columns;
 select
 	rc.constraint_name,
 	cu.table_schema,
@@ -1297,7 +1299,8 @@ where coalesce(fkerror_rows, 0) > 0;
 
 -- ################################################################
 --			Script UPSERT_ONE
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT UPSERT_ONE with parameters (base_schema, staging, 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
@@ -1347,9 +1350,6 @@ where coalesce(fkerror_rows, 0) > 0;
 --		ups_nk					: temporary table
 --		ups_assexpr				: temporary table
 --		ups_newrows				: temporary table
--- ===============================================================
-
--- !x! BEGIN SCRIPT UPSERT_ONE with parameters (base_schema, staging, 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
@@ -1380,7 +1380,7 @@ where coalesce(fkerror_rows, 0) > 0;
 -- !x! if(is_null("!!#exclude_cols!!"))
 	-- !x! sub_empty ~col_excl
 -- !x! else
-	-- !x! sub ~col_excl and column_name not in (!!#exclude_cols!!)
+	-- !x! sub ~col_excl and s.column_name not in (!!#exclude_cols!!)
 -- !x! endif
 if object_id('tempdb..#ups_cols') is not null drop table #ups_cols;
 select s.column_name, s.ordinal_position
@@ -1623,7 +1623,8 @@ from
 
 -- ################################################################
 --			Script UPSERT_ALL
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT UPSERT_ALL with parameters (base_schema, staging, control_table)
 -- Updates multiple base tables with new or revised data from
 -- staging tables, using the UPSERT_ONE script.
 --
@@ -1667,10 +1668,6 @@ from
 --
 -- Counter variables:
 --		221585944		: Progress indicator.
---
--- ===============================================================
-
--- !x! BEGIN SCRIPT UPSERT_ALL with parameters (base_schema, staging, control_table)
 
 
 -- Validate contents of control table
@@ -1865,7 +1862,8 @@ on pt.table_name = ct.table_name;
 
 -- ################################################################
 --			Script QA_ALL
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT QA_ALL with parameters (base_schema, staging, control_table)
 -- Conducts null 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.
@@ -1916,10 +1914,6 @@ on pt.table_name = ct.table_name;
 --
 -- Global variables modified:
 --		upsert_progress_denom		: Created or redefined.
---
--- ===============================================================
-
--- !x! BEGIN SCRIPT QA_ALL with parameters (base_schema, staging, control_table)
 
 -- Get denominator for progress bar if console is on.
 -- !x! if(console_on)
@@ -2092,7 +2086,8 @@ update #ups_proctables set processed = 0;
 
 -- ################################################################
 --			Script UPDTPK_ONE
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT UPDTPK_ONE with parameters (base_schema, staging, table, display_errors, display_changes)
 -- Updates primary keys in base table, based on new and older
 -- values of PK columns in a staging table, using UPDATE
 -- statements.  Displays data to be modified to the
@@ -2123,9 +2118,6 @@ update #ups_proctables set processed = 0;
 --		ups_pkqa_errors			: temporary table
 --		ups_pkcollinfo			: temporary table
 --		ups_pkupdates			: temporary table
--- ===============================================================
-
--- !x! BEGIN SCRIPT UPDTPK_ONE with parameters (base_schema, staging, table, display_errors, display_changes)
 
 -- !x! if(console_on)
 	-- !x! console status "Primary key updates"
@@ -2294,7 +2286,8 @@ where
 
 -- ################################################################
 --			Script UPDTPKQA_ONE
---
+-- ===============================================================
+-- !x! BEGIN SCRIPT UPDTPKQA_ONE with parameters (base_schema, staging, 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.
@@ -2328,9 +2321,6 @@ where
 -- Tables and views created or modified:
 --		ups_missing_pk_cols			: temporary table
 --		ups_any_pk_cols				: temporary table
--- ===============================================================
-
--- !x! BEGIN SCRIPT UPDTPKQA_ONE with parameters (base_schema, staging, table, pkinfo_table, qaerror_table, display_errors)
 
 
 -- Write an initial header to the logfile.