From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Tue, 4 Sep 2018 22:35:28 +0000 (-0400)
Subject: LP#1514085: stamp schema update
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c68550260497e050307b49b0743e339f96417b53;p=evergreen%2Fpines.git

LP#1514085: stamp schema update

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index c6aab8ec9e..c7771c0c1b 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1125', :eg_version); -- khuckins/kmlussier/dbwells
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1126', :eg_version); -- berick/gmcharlt
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1126.schema.vandelay-state-tracking.sql b/Open-ILS/src/sql/Pg/upgrade/1126.schema.vandelay-state-tracking.sql
new file mode 100644
index 0000000000..10e658f99e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1126.schema.vandelay-state-tracking.sql
@@ -0,0 +1,737 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1126', :eg_version);
+
+CREATE TABLE vandelay.session_tracker (
+    id          BIGSERIAL PRIMARY KEY,
+
+    -- string of characters (e.g. md5) used for linking trackers
+    -- of different actions into a series.  There can be multiple
+    -- session_keys of each action type, creating the opportunity
+    -- to link multiple action trackers into a single session.
+    session_key TEXT NOT NULL,
+
+    -- optional user-supplied name
+    name        TEXT NOT NULL, 
+
+    usr         INTEGER NOT NULL REFERENCES actor.usr(id)
+                DEFERRABLE INITIALLY DEFERRED,
+
+    -- org unit can be derived from WS
+    workstation INTEGER NOT NULL REFERENCES actor.workstation(id)
+                ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+
+    -- bib/auth
+    record_type vandelay.bib_queue_queue_type NOT NULL DEFAULT 'bib',
+
+    -- Queue defines the source of the data, it does not necessarily
+    -- mean that an action is being performed against an entire queue.
+    -- E.g. some imports are misc. lists of record IDs, but they always 
+    -- come from one queue.
+    -- No foreign key -- could be auth or bib queue.
+    queue       BIGINT NOT NULL,
+
+    create_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+    update_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+
+    state       TEXT NOT NULL DEFAULT 'active',
+
+    action_type TEXT NOT NULL DEFAULT 'enqueue', -- import
+
+    -- total number of tasks to perform / loosely defined
+    -- could be # of recs to import or # of recs + # of copies 
+    -- depending on the import context
+    total_actions INTEGER NOT NULL DEFAULT 0,
+
+    -- total number of tasked performed so far
+    actions_performed INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT vand_tracker_valid_state 
+        CHECK (state IN ('active','error','complete')),
+
+    CONSTRAINT vand_tracker_valid_action_type
+        CHECK (action_type IN ('upload', 'enqueue', 'import'))
+);
+
+
+CREATE OR REPLACE FUNCTION actor.usr_merge( src_usr INT, dest_usr INT, del_addrs BOOLEAN, del_cards BOOLEAN, deactivate_cards BOOLEAN ) RETURNS VOID AS $$
+DECLARE
+	suffix TEXT;
+	bucket_row RECORD;
+	picklist_row RECORD;
+	queue_row RECORD;
+	folder_row RECORD;
+BEGIN
+
+    -- do some initial cleanup 
+    UPDATE actor.usr SET card = NULL WHERE id = src_usr;
+    UPDATE actor.usr SET mailing_address = NULL WHERE id = src_usr;
+    UPDATE actor.usr SET billing_address = NULL WHERE id = src_usr;
+
+    -- actor.*
+    IF del_cards THEN
+        DELETE FROM actor.card where usr = src_usr;
+    ELSE
+        IF deactivate_cards THEN
+            UPDATE actor.card SET active = 'f' WHERE usr = src_usr;
+        END IF;
+        UPDATE actor.card SET usr = dest_usr WHERE usr = src_usr;
+    END IF;
+
+
+    IF del_addrs THEN
+        DELETE FROM actor.usr_address WHERE usr = src_usr;
+    ELSE
+        UPDATE actor.usr_address SET usr = dest_usr WHERE usr = src_usr;
+    END IF;
+
+    UPDATE actor.usr_note SET usr = dest_usr WHERE usr = src_usr;
+    -- dupes are technically OK in actor.usr_standing_penalty, should manually delete them...
+    UPDATE actor.usr_standing_penalty SET usr = dest_usr WHERE usr = src_usr;
+    PERFORM actor.usr_merge_rows('actor.usr_org_unit_opt_in', 'usr', src_usr, dest_usr);
+    PERFORM actor.usr_merge_rows('actor.usr_setting', 'usr', src_usr, dest_usr);
+
+    -- permission.*
+    PERFORM actor.usr_merge_rows('permission.usr_perm_map', 'usr', src_usr, dest_usr);
+    PERFORM actor.usr_merge_rows('permission.usr_object_perm_map', 'usr', src_usr, dest_usr);
+    PERFORM actor.usr_merge_rows('permission.usr_grp_map', 'usr', src_usr, dest_usr);
+    PERFORM actor.usr_merge_rows('permission.usr_work_ou_map', 'usr', src_usr, dest_usr);
+
+
+    -- container.*
+	
+	-- For each *_bucket table: transfer every bucket belonging to src_usr
+	-- into the custody of dest_usr.
+	--
+	-- In order to avoid colliding with an existing bucket owned by
+	-- the destination user, append the source user's id (in parenthesese)
+	-- to the name.  If you still get a collision, add successive
+	-- spaces to the name and keep trying until you succeed.
+	--
+	FOR bucket_row in
+		SELECT id, name
+		FROM   container.biblio_record_entry_bucket
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  container.biblio_record_entry_bucket
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = bucket_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+	FOR bucket_row in
+		SELECT id, name
+		FROM   container.call_number_bucket
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  container.call_number_bucket
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = bucket_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+	FOR bucket_row in
+		SELECT id, name
+		FROM   container.copy_bucket
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  container.copy_bucket
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = bucket_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+	FOR bucket_row in
+		SELECT id, name
+		FROM   container.user_bucket
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  container.user_bucket
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = bucket_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+	UPDATE container.user_bucket_item SET target_user = dest_usr WHERE target_user = src_usr;
+
+    -- vandelay.*
+	-- transfer queues the same way we transfer buckets (see above)
+	FOR queue_row in
+		SELECT id, name
+		FROM   vandelay.queue
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  vandelay.queue
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = queue_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+    UPDATE vandelay.session_tracker SET usr = dest_usr WHERE usr = src_usr;
+
+    -- money.*
+    PERFORM actor.usr_merge_rows('money.collections_tracker', 'usr', src_usr, dest_usr);
+    PERFORM actor.usr_merge_rows('money.collections_tracker', 'collector', src_usr, dest_usr);
+    UPDATE money.billable_xact SET usr = dest_usr WHERE usr = src_usr;
+    UPDATE money.billing SET voider = dest_usr WHERE voider = src_usr;
+    UPDATE money.bnm_payment SET accepting_usr = dest_usr WHERE accepting_usr = src_usr;
+
+    -- action.*
+    UPDATE action.circulation SET usr = dest_usr WHERE usr = src_usr;
+    UPDATE action.circulation SET circ_staff = dest_usr WHERE circ_staff = src_usr;
+    UPDATE action.circulation SET checkin_staff = dest_usr WHERE checkin_staff = src_usr;
+    UPDATE action.usr_circ_history SET usr = dest_usr WHERE usr = src_usr;
+
+    UPDATE action.hold_request SET usr = dest_usr WHERE usr = src_usr;
+    UPDATE action.hold_request SET fulfillment_staff = dest_usr WHERE fulfillment_staff = src_usr;
+    UPDATE action.hold_request SET requestor = dest_usr WHERE requestor = src_usr;
+    UPDATE action.hold_notification SET notify_staff = dest_usr WHERE notify_staff = src_usr;
+
+    UPDATE action.in_house_use SET staff = dest_usr WHERE staff = src_usr;
+    UPDATE action.non_cataloged_circulation SET staff = dest_usr WHERE staff = src_usr;
+    UPDATE action.non_cataloged_circulation SET patron = dest_usr WHERE patron = src_usr;
+    UPDATE action.non_cat_in_house_use SET staff = dest_usr WHERE staff = src_usr;
+    UPDATE action.survey_response SET usr = dest_usr WHERE usr = src_usr;
+
+    -- acq.*
+    UPDATE acq.fund_allocation SET allocator = dest_usr WHERE allocator = src_usr;
+	UPDATE acq.fund_transfer SET transfer_user = dest_usr WHERE transfer_user = src_usr;
+
+	-- transfer picklists the same way we transfer buckets (see above)
+	FOR picklist_row in
+		SELECT id, name
+		FROM   acq.picklist
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  acq.picklist
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = picklist_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+    UPDATE acq.purchase_order SET owner = dest_usr WHERE owner = src_usr;
+    UPDATE acq.po_note SET creator = dest_usr WHERE creator = src_usr;
+    UPDATE acq.po_note SET editor = dest_usr WHERE editor = src_usr;
+    UPDATE acq.provider_note SET creator = dest_usr WHERE creator = src_usr;
+    UPDATE acq.provider_note SET editor = dest_usr WHERE editor = src_usr;
+    UPDATE acq.lineitem_note SET creator = dest_usr WHERE creator = src_usr;
+    UPDATE acq.lineitem_note SET editor = dest_usr WHERE editor = src_usr;
+    UPDATE acq.lineitem_usr_attr_definition SET usr = dest_usr WHERE usr = src_usr;
+
+    -- asset.*
+    UPDATE asset.copy SET creator = dest_usr WHERE creator = src_usr;
+    UPDATE asset.copy SET editor = dest_usr WHERE editor = src_usr;
+    UPDATE asset.copy_note SET creator = dest_usr WHERE creator = src_usr;
+    UPDATE asset.call_number SET creator = dest_usr WHERE creator = src_usr;
+    UPDATE asset.call_number SET editor = dest_usr WHERE editor = src_usr;
+    UPDATE asset.call_number_note SET creator = dest_usr WHERE creator = src_usr;
+
+    -- serial.*
+    UPDATE serial.record_entry SET creator = dest_usr WHERE creator = src_usr;
+    UPDATE serial.record_entry SET editor = dest_usr WHERE editor = src_usr;
+
+    -- reporter.*
+    -- It's not uncommon to define the reporter schema in a replica 
+    -- DB only, so don't assume these tables exist in the write DB.
+    BEGIN
+    	UPDATE reporter.template SET owner = dest_usr WHERE owner = src_usr;
+    EXCEPTION WHEN undefined_table THEN
+        -- do nothing
+    END;
+    BEGIN
+    	UPDATE reporter.report SET owner = dest_usr WHERE owner = src_usr;
+    EXCEPTION WHEN undefined_table THEN
+        -- do nothing
+    END;
+    BEGIN
+    	UPDATE reporter.schedule SET runner = dest_usr WHERE runner = src_usr;
+    EXCEPTION WHEN undefined_table THEN
+        -- do nothing
+    END;
+    BEGIN
+		-- transfer folders the same way we transfer buckets (see above)
+		FOR folder_row in
+			SELECT id, name
+			FROM   reporter.template_folder
+			WHERE  owner = src_usr
+		LOOP
+			suffix := ' (' || src_usr || ')';
+			LOOP
+				BEGIN
+					UPDATE  reporter.template_folder
+					SET     owner = dest_usr, name = name || suffix
+					WHERE   id = folder_row.id;
+				EXCEPTION WHEN unique_violation THEN
+					suffix := suffix || ' ';
+					CONTINUE;
+				END;
+				EXIT;
+			END LOOP;
+		END LOOP;
+    EXCEPTION WHEN undefined_table THEN
+        -- do nothing
+    END;
+    BEGIN
+		-- transfer folders the same way we transfer buckets (see above)
+		FOR folder_row in
+			SELECT id, name
+			FROM   reporter.report_folder
+			WHERE  owner = src_usr
+		LOOP
+			suffix := ' (' || src_usr || ')';
+			LOOP
+				BEGIN
+					UPDATE  reporter.report_folder
+					SET     owner = dest_usr, name = name || suffix
+					WHERE   id = folder_row.id;
+				EXCEPTION WHEN unique_violation THEN
+					suffix := suffix || ' ';
+					CONTINUE;
+				END;
+				EXIT;
+			END LOOP;
+		END LOOP;
+    EXCEPTION WHEN undefined_table THEN
+        -- do nothing
+    END;
+    BEGIN
+		-- transfer folders the same way we transfer buckets (see above)
+		FOR folder_row in
+			SELECT id, name
+			FROM   reporter.output_folder
+			WHERE  owner = src_usr
+		LOOP
+			suffix := ' (' || src_usr || ')';
+			LOOP
+				BEGIN
+					UPDATE  reporter.output_folder
+					SET     owner = dest_usr, name = name || suffix
+					WHERE   id = folder_row.id;
+				EXCEPTION WHEN unique_violation THEN
+					suffix := suffix || ' ';
+					CONTINUE;
+				END;
+				EXIT;
+			END LOOP;
+		END LOOP;
+    EXCEPTION WHEN undefined_table THEN
+        -- do nothing
+    END;
+
+    -- propagate preferred name values from the source user to the
+    -- destination user, but only when values are not being replaced.
+    WITH susr AS (SELECT * FROM actor.usr WHERE id = src_usr)
+    UPDATE actor.usr SET 
+        pref_prefix = 
+            COALESCE(pref_prefix, (SELECT pref_prefix FROM susr)),
+        pref_first_given_name = 
+            COALESCE(pref_first_given_name, (SELECT pref_first_given_name FROM susr)),
+        pref_second_given_name = 
+            COALESCE(pref_second_given_name, (SELECT pref_second_given_name FROM susr)),
+        pref_family_name = 
+            COALESCE(pref_family_name, (SELECT pref_family_name FROM susr)),
+        pref_suffix = 
+            COALESCE(pref_suffix, (SELECT pref_suffix FROM susr))
+    WHERE id = dest_usr;
+
+    -- Copy and deduplicate name keywords
+    -- String -> array -> rows -> DISTINCT -> array -> string
+    WITH susr AS (SELECT * FROM actor.usr WHERE id = src_usr),
+         dusr AS (SELECT * FROM actor.usr WHERE id = dest_usr)
+    UPDATE actor.usr SET name_keywords = (
+        WITH keywords AS (
+            SELECT DISTINCT UNNEST(
+                REGEXP_SPLIT_TO_ARRAY(
+                    COALESCE((SELECT name_keywords FROM susr), '') || ' ' ||
+                    COALESCE((SELECT name_keywords FROM dusr), ''),  E'\\s+'
+                )
+            ) AS parts
+        ) SELECT ARRAY_TO_STRING(ARRAY_AGG(kw.parts), ' ') FROM keywords kw
+    ) WHERE id = dest_usr;
+
+    -- Finally, delete the source user
+    DELETE FROM actor.usr WHERE id = src_usr;
+
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION actor.usr_purge_data(
+	src_usr  IN INTEGER,
+	specified_dest_usr IN INTEGER
+) RETURNS VOID AS $$
+DECLARE
+	suffix TEXT;
+	renamable_row RECORD;
+	dest_usr INTEGER;
+BEGIN
+
+	IF specified_dest_usr IS NULL THEN
+		dest_usr := 1; -- Admin user on stock installs
+	ELSE
+		dest_usr := specified_dest_usr;
+	END IF;
+
+	-- acq.*
+	UPDATE acq.fund_allocation SET allocator = dest_usr WHERE allocator = src_usr;
+	UPDATE acq.lineitem SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE acq.lineitem SET editor = dest_usr WHERE editor = src_usr;
+	UPDATE acq.lineitem SET selector = dest_usr WHERE selector = src_usr;
+	UPDATE acq.lineitem_note SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE acq.lineitem_note SET editor = dest_usr WHERE editor = src_usr;
+	DELETE FROM acq.lineitem_usr_attr_definition WHERE usr = src_usr;
+
+	-- Update with a rename to avoid collisions
+	FOR renamable_row in
+		SELECT id, name
+		FROM   acq.picklist
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  acq.picklist
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = renamable_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+	UPDATE acq.picklist SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE acq.picklist SET editor = dest_usr WHERE editor = src_usr;
+	UPDATE acq.po_note SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE acq.po_note SET editor = dest_usr WHERE editor = src_usr;
+	UPDATE acq.purchase_order SET owner = dest_usr WHERE owner = src_usr;
+	UPDATE acq.purchase_order SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE acq.purchase_order SET editor = dest_usr WHERE editor = src_usr;
+	UPDATE acq.claim_event SET creator = dest_usr WHERE creator = src_usr;
+
+	-- action.*
+	DELETE FROM action.circulation WHERE usr = src_usr;
+	UPDATE action.circulation SET circ_staff = dest_usr WHERE circ_staff = src_usr;
+	UPDATE action.circulation SET checkin_staff = dest_usr WHERE checkin_staff = src_usr;
+	UPDATE action.hold_notification SET notify_staff = dest_usr WHERE notify_staff = src_usr;
+	UPDATE action.hold_request SET fulfillment_staff = dest_usr WHERE fulfillment_staff = src_usr;
+	UPDATE action.hold_request SET requestor = dest_usr WHERE requestor = src_usr;
+	DELETE FROM action.hold_request WHERE usr = src_usr;
+	UPDATE action.in_house_use SET staff = dest_usr WHERE staff = src_usr;
+	UPDATE action.non_cat_in_house_use SET staff = dest_usr WHERE staff = src_usr;
+	DELETE FROM action.non_cataloged_circulation WHERE patron = src_usr;
+	UPDATE action.non_cataloged_circulation SET staff = dest_usr WHERE staff = src_usr;
+	DELETE FROM action.survey_response WHERE usr = src_usr;
+	UPDATE action.fieldset SET owner = dest_usr WHERE owner = src_usr;
+	DELETE FROM action.usr_circ_history WHERE usr = src_usr;
+
+	-- actor.*
+	DELETE FROM actor.card WHERE usr = src_usr;
+	DELETE FROM actor.stat_cat_entry_usr_map WHERE target_usr = src_usr;
+
+	-- The following update is intended to avoid transient violations of a foreign
+	-- key constraint, whereby actor.usr_address references itself.  It may not be
+	-- necessary, but it does no harm.
+	UPDATE actor.usr_address SET replaces = NULL
+		WHERE usr = src_usr AND replaces IS NOT NULL;
+	DELETE FROM actor.usr_address WHERE usr = src_usr;
+	DELETE FROM actor.usr_note WHERE usr = src_usr;
+	UPDATE actor.usr_note SET creator = dest_usr WHERE creator = src_usr;
+	DELETE FROM actor.usr_org_unit_opt_in WHERE usr = src_usr;
+	UPDATE actor.usr_org_unit_opt_in SET staff = dest_usr WHERE staff = src_usr;
+	DELETE FROM actor.usr_setting WHERE usr = src_usr;
+	DELETE FROM actor.usr_standing_penalty WHERE usr = src_usr;
+	UPDATE actor.usr_standing_penalty SET staff = dest_usr WHERE staff = src_usr;
+
+	-- asset.*
+	UPDATE asset.call_number SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE asset.call_number SET editor = dest_usr WHERE editor = src_usr;
+	UPDATE asset.call_number_note SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE asset.copy SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE asset.copy SET editor = dest_usr WHERE editor = src_usr;
+	UPDATE asset.copy_note SET creator = dest_usr WHERE creator = src_usr;
+
+	-- auditor.*
+	DELETE FROM auditor.actor_usr_address_history WHERE id = src_usr;
+	DELETE FROM auditor.actor_usr_history WHERE id = src_usr;
+	UPDATE auditor.asset_call_number_history SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE auditor.asset_call_number_history SET editor  = dest_usr WHERE editor  = src_usr;
+	UPDATE auditor.asset_copy_history SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE auditor.asset_copy_history SET editor  = dest_usr WHERE editor  = src_usr;
+	UPDATE auditor.biblio_record_entry_history SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE auditor.biblio_record_entry_history SET editor  = dest_usr WHERE editor  = src_usr;
+
+	-- biblio.*
+	UPDATE biblio.record_entry SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE biblio.record_entry SET editor = dest_usr WHERE editor = src_usr;
+	UPDATE biblio.record_note SET creator = dest_usr WHERE creator = src_usr;
+	UPDATE biblio.record_note SET editor = dest_usr WHERE editor = src_usr;
+
+	-- container.*
+	-- Update buckets with a rename to avoid collisions
+	FOR renamable_row in
+		SELECT id, name
+		FROM   container.biblio_record_entry_bucket
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  container.biblio_record_entry_bucket
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = renamable_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+	FOR renamable_row in
+		SELECT id, name
+		FROM   container.call_number_bucket
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  container.call_number_bucket
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = renamable_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+	FOR renamable_row in
+		SELECT id, name
+		FROM   container.copy_bucket
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  container.copy_bucket
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = renamable_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+	FOR renamable_row in
+		SELECT id, name
+		FROM   container.user_bucket
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  container.user_bucket
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = renamable_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+	DELETE FROM container.user_bucket_item WHERE target_user = src_usr;
+
+	-- money.*
+	DELETE FROM money.billable_xact WHERE usr = src_usr;
+	DELETE FROM money.collections_tracker WHERE usr = src_usr;
+	UPDATE money.collections_tracker SET collector = dest_usr WHERE collector = src_usr;
+
+	-- permission.*
+	DELETE FROM permission.usr_grp_map WHERE usr = src_usr;
+	DELETE FROM permission.usr_object_perm_map WHERE usr = src_usr;
+	DELETE FROM permission.usr_perm_map WHERE usr = src_usr;
+	DELETE FROM permission.usr_work_ou_map WHERE usr = src_usr;
+
+	-- reporter.*
+	-- Update with a rename to avoid collisions
+	BEGIN
+		FOR renamable_row in
+			SELECT id, name
+			FROM   reporter.output_folder
+			WHERE  owner = src_usr
+		LOOP
+			suffix := ' (' || src_usr || ')';
+			LOOP
+				BEGIN
+					UPDATE  reporter.output_folder
+					SET     owner = dest_usr, name = name || suffix
+					WHERE   id = renamable_row.id;
+				EXCEPTION WHEN unique_violation THEN
+					suffix := suffix || ' ';
+					CONTINUE;
+				END;
+				EXIT;
+			END LOOP;
+		END LOOP;
+	EXCEPTION WHEN undefined_table THEN
+		-- do nothing
+	END;
+
+	BEGIN
+		UPDATE reporter.report SET owner = dest_usr WHERE owner = src_usr;
+	EXCEPTION WHEN undefined_table THEN
+		-- do nothing
+	END;
+
+	-- Update with a rename to avoid collisions
+	BEGIN
+		FOR renamable_row in
+			SELECT id, name
+			FROM   reporter.report_folder
+			WHERE  owner = src_usr
+		LOOP
+			suffix := ' (' || src_usr || ')';
+			LOOP
+				BEGIN
+					UPDATE  reporter.report_folder
+					SET     owner = dest_usr, name = name || suffix
+					WHERE   id = renamable_row.id;
+				EXCEPTION WHEN unique_violation THEN
+					suffix := suffix || ' ';
+					CONTINUE;
+				END;
+				EXIT;
+			END LOOP;
+		END LOOP;
+	EXCEPTION WHEN undefined_table THEN
+		-- do nothing
+	END;
+
+	BEGIN
+		UPDATE reporter.schedule SET runner = dest_usr WHERE runner = src_usr;
+	EXCEPTION WHEN undefined_table THEN
+		-- do nothing
+	END;
+
+	BEGIN
+		UPDATE reporter.template SET owner = dest_usr WHERE owner = src_usr;
+	EXCEPTION WHEN undefined_table THEN
+		-- do nothing
+	END;
+
+	-- Update with a rename to avoid collisions
+	BEGIN
+		FOR renamable_row in
+			SELECT id, name
+			FROM   reporter.template_folder
+			WHERE  owner = src_usr
+		LOOP
+			suffix := ' (' || src_usr || ')';
+			LOOP
+				BEGIN
+					UPDATE  reporter.template_folder
+					SET     owner = dest_usr, name = name || suffix
+					WHERE   id = renamable_row.id;
+				EXCEPTION WHEN unique_violation THEN
+					suffix := suffix || ' ';
+					CONTINUE;
+				END;
+				EXIT;
+			END LOOP;
+		END LOOP;
+	EXCEPTION WHEN undefined_table THEN
+	-- do nothing
+	END;
+
+	-- vandelay.*
+	-- Update with a rename to avoid collisions
+	FOR renamable_row in
+		SELECT id, name
+		FROM   vandelay.queue
+		WHERE  owner = src_usr
+	LOOP
+		suffix := ' (' || src_usr || ')';
+		LOOP
+			BEGIN
+				UPDATE  vandelay.queue
+				SET     owner = dest_usr, name = name || suffix
+				WHERE   id = renamable_row.id;
+			EXCEPTION WHEN unique_violation THEN
+				suffix := suffix || ' ';
+				CONTINUE;
+			END;
+			EXIT;
+		END LOOP;
+	END LOOP;
+
+    UPDATE vandelay.session_tracker SET usr = dest_usr WHERE usr = src_usr;
+
+    -- NULL-ify addresses last so other cleanup (e.g. circ anonymization)
+    -- can access the information before deletion.
+	UPDATE actor.usr SET
+		active = FALSE,
+		card = NULL,
+		mailing_address = NULL,
+		billing_address = NULL
+	WHERE id = src_usr;
+
+END;
+$$ LANGUAGE plpgsql;
+
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-state-tracking.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-state-tracking.sql
deleted file mode 100644
index bce64d0c7d..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-state-tracking.sql
+++ /dev/null
@@ -1,738 +0,0 @@
-
-BEGIN;
-
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-CREATE TABLE vandelay.session_tracker (
-    id          BIGSERIAL PRIMARY KEY,
-
-    -- string of characters (e.g. md5) used for linking trackers
-    -- of different actions into a series.  There can be multiple
-    -- session_keys of each action type, creating the opportunity
-    -- to link multiple action trackers into a single session.
-    session_key TEXT NOT NULL,
-
-    -- optional user-supplied name
-    name        TEXT NOT NULL, 
-
-    usr         INTEGER NOT NULL REFERENCES actor.usr(id)
-                DEFERRABLE INITIALLY DEFERRED,
-
-    -- org unit can be derived from WS
-    workstation INTEGER NOT NULL REFERENCES actor.workstation(id)
-                ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-
-    -- bib/auth
-    record_type vandelay.bib_queue_queue_type NOT NULL DEFAULT 'bib',
-
-    -- Queue defines the source of the data, it does not necessarily
-    -- mean that an action is being performed against an entire queue.
-    -- E.g. some imports are misc. lists of record IDs, but they always 
-    -- come from one queue.
-    -- No foreign key -- could be auth or bib queue.
-    queue       BIGINT NOT NULL,
-
-    create_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-    update_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-
-    state       TEXT NOT NULL DEFAULT 'active',
-
-    action_type TEXT NOT NULL DEFAULT 'enqueue', -- import
-
-    -- total number of tasks to perform / loosely defined
-    -- could be # of recs to import or # of recs + # of copies 
-    -- depending on the import context
-    total_actions INTEGER NOT NULL DEFAULT 0,
-
-    -- total number of tasked performed so far
-    actions_performed INTEGER NOT NULL DEFAULT 0,
-
-    CONSTRAINT vand_tracker_valid_state 
-        CHECK (state IN ('active','error','complete')),
-
-    CONSTRAINT vand_tracker_valid_action_type
-        CHECK (action_type IN ('upload', 'enqueue', 'import'))
-);
-
-
-CREATE OR REPLACE FUNCTION actor.usr_merge( src_usr INT, dest_usr INT, del_addrs BOOLEAN, del_cards BOOLEAN, deactivate_cards BOOLEAN ) RETURNS VOID AS $$
-DECLARE
-	suffix TEXT;
-	bucket_row RECORD;
-	picklist_row RECORD;
-	queue_row RECORD;
-	folder_row RECORD;
-BEGIN
-
-    -- do some initial cleanup 
-    UPDATE actor.usr SET card = NULL WHERE id = src_usr;
-    UPDATE actor.usr SET mailing_address = NULL WHERE id = src_usr;
-    UPDATE actor.usr SET billing_address = NULL WHERE id = src_usr;
-
-    -- actor.*
-    IF del_cards THEN
-        DELETE FROM actor.card where usr = src_usr;
-    ELSE
-        IF deactivate_cards THEN
-            UPDATE actor.card SET active = 'f' WHERE usr = src_usr;
-        END IF;
-        UPDATE actor.card SET usr = dest_usr WHERE usr = src_usr;
-    END IF;
-
-
-    IF del_addrs THEN
-        DELETE FROM actor.usr_address WHERE usr = src_usr;
-    ELSE
-        UPDATE actor.usr_address SET usr = dest_usr WHERE usr = src_usr;
-    END IF;
-
-    UPDATE actor.usr_note SET usr = dest_usr WHERE usr = src_usr;
-    -- dupes are technically OK in actor.usr_standing_penalty, should manually delete them...
-    UPDATE actor.usr_standing_penalty SET usr = dest_usr WHERE usr = src_usr;
-    PERFORM actor.usr_merge_rows('actor.usr_org_unit_opt_in', 'usr', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('actor.usr_setting', 'usr', src_usr, dest_usr);
-
-    -- permission.*
-    PERFORM actor.usr_merge_rows('permission.usr_perm_map', 'usr', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('permission.usr_object_perm_map', 'usr', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('permission.usr_grp_map', 'usr', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('permission.usr_work_ou_map', 'usr', src_usr, dest_usr);
-
-
-    -- container.*
-	
-	-- For each *_bucket table: transfer every bucket belonging to src_usr
-	-- into the custody of dest_usr.
-	--
-	-- In order to avoid colliding with an existing bucket owned by
-	-- the destination user, append the source user's id (in parenthesese)
-	-- to the name.  If you still get a collision, add successive
-	-- spaces to the name and keep trying until you succeed.
-	--
-	FOR bucket_row in
-		SELECT id, name
-		FROM   container.biblio_record_entry_bucket
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  container.biblio_record_entry_bucket
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = bucket_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-	FOR bucket_row in
-		SELECT id, name
-		FROM   container.call_number_bucket
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  container.call_number_bucket
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = bucket_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-	FOR bucket_row in
-		SELECT id, name
-		FROM   container.copy_bucket
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  container.copy_bucket
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = bucket_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-	FOR bucket_row in
-		SELECT id, name
-		FROM   container.user_bucket
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  container.user_bucket
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = bucket_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-	UPDATE container.user_bucket_item SET target_user = dest_usr WHERE target_user = src_usr;
-
-    -- vandelay.*
-	-- transfer queues the same way we transfer buckets (see above)
-	FOR queue_row in
-		SELECT id, name
-		FROM   vandelay.queue
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  vandelay.queue
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = queue_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-    UPDATE vandelay.session_tracker SET usr = dest_usr WHERE usr = src_usr;
-
-    -- money.*
-    PERFORM actor.usr_merge_rows('money.collections_tracker', 'usr', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('money.collections_tracker', 'collector', src_usr, dest_usr);
-    UPDATE money.billable_xact SET usr = dest_usr WHERE usr = src_usr;
-    UPDATE money.billing SET voider = dest_usr WHERE voider = src_usr;
-    UPDATE money.bnm_payment SET accepting_usr = dest_usr WHERE accepting_usr = src_usr;
-
-    -- action.*
-    UPDATE action.circulation SET usr = dest_usr WHERE usr = src_usr;
-    UPDATE action.circulation SET circ_staff = dest_usr WHERE circ_staff = src_usr;
-    UPDATE action.circulation SET checkin_staff = dest_usr WHERE checkin_staff = src_usr;
-    UPDATE action.usr_circ_history SET usr = dest_usr WHERE usr = src_usr;
-
-    UPDATE action.hold_request SET usr = dest_usr WHERE usr = src_usr;
-    UPDATE action.hold_request SET fulfillment_staff = dest_usr WHERE fulfillment_staff = src_usr;
-    UPDATE action.hold_request SET requestor = dest_usr WHERE requestor = src_usr;
-    UPDATE action.hold_notification SET notify_staff = dest_usr WHERE notify_staff = src_usr;
-
-    UPDATE action.in_house_use SET staff = dest_usr WHERE staff = src_usr;
-    UPDATE action.non_cataloged_circulation SET staff = dest_usr WHERE staff = src_usr;
-    UPDATE action.non_cataloged_circulation SET patron = dest_usr WHERE patron = src_usr;
-    UPDATE action.non_cat_in_house_use SET staff = dest_usr WHERE staff = src_usr;
-    UPDATE action.survey_response SET usr = dest_usr WHERE usr = src_usr;
-
-    -- acq.*
-    UPDATE acq.fund_allocation SET allocator = dest_usr WHERE allocator = src_usr;
-	UPDATE acq.fund_transfer SET transfer_user = dest_usr WHERE transfer_user = src_usr;
-
-	-- transfer picklists the same way we transfer buckets (see above)
-	FOR picklist_row in
-		SELECT id, name
-		FROM   acq.picklist
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  acq.picklist
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = picklist_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-    UPDATE acq.purchase_order SET owner = dest_usr WHERE owner = src_usr;
-    UPDATE acq.po_note SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE acq.po_note SET editor = dest_usr WHERE editor = src_usr;
-    UPDATE acq.provider_note SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE acq.provider_note SET editor = dest_usr WHERE editor = src_usr;
-    UPDATE acq.lineitem_note SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE acq.lineitem_note SET editor = dest_usr WHERE editor = src_usr;
-    UPDATE acq.lineitem_usr_attr_definition SET usr = dest_usr WHERE usr = src_usr;
-
-    -- asset.*
-    UPDATE asset.copy SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE asset.copy SET editor = dest_usr WHERE editor = src_usr;
-    UPDATE asset.copy_note SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE asset.call_number SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE asset.call_number SET editor = dest_usr WHERE editor = src_usr;
-    UPDATE asset.call_number_note SET creator = dest_usr WHERE creator = src_usr;
-
-    -- serial.*
-    UPDATE serial.record_entry SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE serial.record_entry SET editor = dest_usr WHERE editor = src_usr;
-
-    -- reporter.*
-    -- It's not uncommon to define the reporter schema in a replica 
-    -- DB only, so don't assume these tables exist in the write DB.
-    BEGIN
-    	UPDATE reporter.template SET owner = dest_usr WHERE owner = src_usr;
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-    BEGIN
-    	UPDATE reporter.report SET owner = dest_usr WHERE owner = src_usr;
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-    BEGIN
-    	UPDATE reporter.schedule SET runner = dest_usr WHERE runner = src_usr;
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-    BEGIN
-		-- transfer folders the same way we transfer buckets (see above)
-		FOR folder_row in
-			SELECT id, name
-			FROM   reporter.template_folder
-			WHERE  owner = src_usr
-		LOOP
-			suffix := ' (' || src_usr || ')';
-			LOOP
-				BEGIN
-					UPDATE  reporter.template_folder
-					SET     owner = dest_usr, name = name || suffix
-					WHERE   id = folder_row.id;
-				EXCEPTION WHEN unique_violation THEN
-					suffix := suffix || ' ';
-					CONTINUE;
-				END;
-				EXIT;
-			END LOOP;
-		END LOOP;
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-    BEGIN
-		-- transfer folders the same way we transfer buckets (see above)
-		FOR folder_row in
-			SELECT id, name
-			FROM   reporter.report_folder
-			WHERE  owner = src_usr
-		LOOP
-			suffix := ' (' || src_usr || ')';
-			LOOP
-				BEGIN
-					UPDATE  reporter.report_folder
-					SET     owner = dest_usr, name = name || suffix
-					WHERE   id = folder_row.id;
-				EXCEPTION WHEN unique_violation THEN
-					suffix := suffix || ' ';
-					CONTINUE;
-				END;
-				EXIT;
-			END LOOP;
-		END LOOP;
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-    BEGIN
-		-- transfer folders the same way we transfer buckets (see above)
-		FOR folder_row in
-			SELECT id, name
-			FROM   reporter.output_folder
-			WHERE  owner = src_usr
-		LOOP
-			suffix := ' (' || src_usr || ')';
-			LOOP
-				BEGIN
-					UPDATE  reporter.output_folder
-					SET     owner = dest_usr, name = name || suffix
-					WHERE   id = folder_row.id;
-				EXCEPTION WHEN unique_violation THEN
-					suffix := suffix || ' ';
-					CONTINUE;
-				END;
-				EXIT;
-			END LOOP;
-		END LOOP;
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-
-    -- propagate preferred name values from the source user to the
-    -- destination user, but only when values are not being replaced.
-    WITH susr AS (SELECT * FROM actor.usr WHERE id = src_usr)
-    UPDATE actor.usr SET 
-        pref_prefix = 
-            COALESCE(pref_prefix, (SELECT pref_prefix FROM susr)),
-        pref_first_given_name = 
-            COALESCE(pref_first_given_name, (SELECT pref_first_given_name FROM susr)),
-        pref_second_given_name = 
-            COALESCE(pref_second_given_name, (SELECT pref_second_given_name FROM susr)),
-        pref_family_name = 
-            COALESCE(pref_family_name, (SELECT pref_family_name FROM susr)),
-        pref_suffix = 
-            COALESCE(pref_suffix, (SELECT pref_suffix FROM susr))
-    WHERE id = dest_usr;
-
-    -- Copy and deduplicate name keywords
-    -- String -> array -> rows -> DISTINCT -> array -> string
-    WITH susr AS (SELECT * FROM actor.usr WHERE id = src_usr),
-         dusr AS (SELECT * FROM actor.usr WHERE id = dest_usr)
-    UPDATE actor.usr SET name_keywords = (
-        WITH keywords AS (
-            SELECT DISTINCT UNNEST(
-                REGEXP_SPLIT_TO_ARRAY(
-                    COALESCE((SELECT name_keywords FROM susr), '') || ' ' ||
-                    COALESCE((SELECT name_keywords FROM dusr), ''),  E'\\s+'
-                )
-            ) AS parts
-        ) SELECT ARRAY_TO_STRING(ARRAY_AGG(kw.parts), ' ') FROM keywords kw
-    ) WHERE id = dest_usr;
-
-    -- Finally, delete the source user
-    DELETE FROM actor.usr WHERE id = src_usr;
-
-END;
-$$ LANGUAGE plpgsql;
-
-
-CREATE OR REPLACE FUNCTION actor.usr_purge_data(
-	src_usr  IN INTEGER,
-	specified_dest_usr IN INTEGER
-) RETURNS VOID AS $$
-DECLARE
-	suffix TEXT;
-	renamable_row RECORD;
-	dest_usr INTEGER;
-BEGIN
-
-	IF specified_dest_usr IS NULL THEN
-		dest_usr := 1; -- Admin user on stock installs
-	ELSE
-		dest_usr := specified_dest_usr;
-	END IF;
-
-	-- acq.*
-	UPDATE acq.fund_allocation SET allocator = dest_usr WHERE allocator = src_usr;
-	UPDATE acq.lineitem SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE acq.lineitem SET editor = dest_usr WHERE editor = src_usr;
-	UPDATE acq.lineitem SET selector = dest_usr WHERE selector = src_usr;
-	UPDATE acq.lineitem_note SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE acq.lineitem_note SET editor = dest_usr WHERE editor = src_usr;
-	DELETE FROM acq.lineitem_usr_attr_definition WHERE usr = src_usr;
-
-	-- Update with a rename to avoid collisions
-	FOR renamable_row in
-		SELECT id, name
-		FROM   acq.picklist
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  acq.picklist
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = renamable_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-	UPDATE acq.picklist SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE acq.picklist SET editor = dest_usr WHERE editor = src_usr;
-	UPDATE acq.po_note SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE acq.po_note SET editor = dest_usr WHERE editor = src_usr;
-	UPDATE acq.purchase_order SET owner = dest_usr WHERE owner = src_usr;
-	UPDATE acq.purchase_order SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE acq.purchase_order SET editor = dest_usr WHERE editor = src_usr;
-	UPDATE acq.claim_event SET creator = dest_usr WHERE creator = src_usr;
-
-	-- action.*
-	DELETE FROM action.circulation WHERE usr = src_usr;
-	UPDATE action.circulation SET circ_staff = dest_usr WHERE circ_staff = src_usr;
-	UPDATE action.circulation SET checkin_staff = dest_usr WHERE checkin_staff = src_usr;
-	UPDATE action.hold_notification SET notify_staff = dest_usr WHERE notify_staff = src_usr;
-	UPDATE action.hold_request SET fulfillment_staff = dest_usr WHERE fulfillment_staff = src_usr;
-	UPDATE action.hold_request SET requestor = dest_usr WHERE requestor = src_usr;
-	DELETE FROM action.hold_request WHERE usr = src_usr;
-	UPDATE action.in_house_use SET staff = dest_usr WHERE staff = src_usr;
-	UPDATE action.non_cat_in_house_use SET staff = dest_usr WHERE staff = src_usr;
-	DELETE FROM action.non_cataloged_circulation WHERE patron = src_usr;
-	UPDATE action.non_cataloged_circulation SET staff = dest_usr WHERE staff = src_usr;
-	DELETE FROM action.survey_response WHERE usr = src_usr;
-	UPDATE action.fieldset SET owner = dest_usr WHERE owner = src_usr;
-	DELETE FROM action.usr_circ_history WHERE usr = src_usr;
-
-	-- actor.*
-	DELETE FROM actor.card WHERE usr = src_usr;
-	DELETE FROM actor.stat_cat_entry_usr_map WHERE target_usr = src_usr;
-
-	-- The following update is intended to avoid transient violations of a foreign
-	-- key constraint, whereby actor.usr_address references itself.  It may not be
-	-- necessary, but it does no harm.
-	UPDATE actor.usr_address SET replaces = NULL
-		WHERE usr = src_usr AND replaces IS NOT NULL;
-	DELETE FROM actor.usr_address WHERE usr = src_usr;
-	DELETE FROM actor.usr_note WHERE usr = src_usr;
-	UPDATE actor.usr_note SET creator = dest_usr WHERE creator = src_usr;
-	DELETE FROM actor.usr_org_unit_opt_in WHERE usr = src_usr;
-	UPDATE actor.usr_org_unit_opt_in SET staff = dest_usr WHERE staff = src_usr;
-	DELETE FROM actor.usr_setting WHERE usr = src_usr;
-	DELETE FROM actor.usr_standing_penalty WHERE usr = src_usr;
-	UPDATE actor.usr_standing_penalty SET staff = dest_usr WHERE staff = src_usr;
-
-	-- asset.*
-	UPDATE asset.call_number SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE asset.call_number SET editor = dest_usr WHERE editor = src_usr;
-	UPDATE asset.call_number_note SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE asset.copy SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE asset.copy SET editor = dest_usr WHERE editor = src_usr;
-	UPDATE asset.copy_note SET creator = dest_usr WHERE creator = src_usr;
-
-	-- auditor.*
-	DELETE FROM auditor.actor_usr_address_history WHERE id = src_usr;
-	DELETE FROM auditor.actor_usr_history WHERE id = src_usr;
-	UPDATE auditor.asset_call_number_history SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE auditor.asset_call_number_history SET editor  = dest_usr WHERE editor  = src_usr;
-	UPDATE auditor.asset_copy_history SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE auditor.asset_copy_history SET editor  = dest_usr WHERE editor  = src_usr;
-	UPDATE auditor.biblio_record_entry_history SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE auditor.biblio_record_entry_history SET editor  = dest_usr WHERE editor  = src_usr;
-
-	-- biblio.*
-	UPDATE biblio.record_entry SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE biblio.record_entry SET editor = dest_usr WHERE editor = src_usr;
-	UPDATE biblio.record_note SET creator = dest_usr WHERE creator = src_usr;
-	UPDATE biblio.record_note SET editor = dest_usr WHERE editor = src_usr;
-
-	-- container.*
-	-- Update buckets with a rename to avoid collisions
-	FOR renamable_row in
-		SELECT id, name
-		FROM   container.biblio_record_entry_bucket
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  container.biblio_record_entry_bucket
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = renamable_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-	FOR renamable_row in
-		SELECT id, name
-		FROM   container.call_number_bucket
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  container.call_number_bucket
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = renamable_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-	FOR renamable_row in
-		SELECT id, name
-		FROM   container.copy_bucket
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  container.copy_bucket
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = renamable_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-	FOR renamable_row in
-		SELECT id, name
-		FROM   container.user_bucket
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  container.user_bucket
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = renamable_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-	DELETE FROM container.user_bucket_item WHERE target_user = src_usr;
-
-	-- money.*
-	DELETE FROM money.billable_xact WHERE usr = src_usr;
-	DELETE FROM money.collections_tracker WHERE usr = src_usr;
-	UPDATE money.collections_tracker SET collector = dest_usr WHERE collector = src_usr;
-
-	-- permission.*
-	DELETE FROM permission.usr_grp_map WHERE usr = src_usr;
-	DELETE FROM permission.usr_object_perm_map WHERE usr = src_usr;
-	DELETE FROM permission.usr_perm_map WHERE usr = src_usr;
-	DELETE FROM permission.usr_work_ou_map WHERE usr = src_usr;
-
-	-- reporter.*
-	-- Update with a rename to avoid collisions
-	BEGIN
-		FOR renamable_row in
-			SELECT id, name
-			FROM   reporter.output_folder
-			WHERE  owner = src_usr
-		LOOP
-			suffix := ' (' || src_usr || ')';
-			LOOP
-				BEGIN
-					UPDATE  reporter.output_folder
-					SET     owner = dest_usr, name = name || suffix
-					WHERE   id = renamable_row.id;
-				EXCEPTION WHEN unique_violation THEN
-					suffix := suffix || ' ';
-					CONTINUE;
-				END;
-				EXIT;
-			END LOOP;
-		END LOOP;
-	EXCEPTION WHEN undefined_table THEN
-		-- do nothing
-	END;
-
-	BEGIN
-		UPDATE reporter.report SET owner = dest_usr WHERE owner = src_usr;
-	EXCEPTION WHEN undefined_table THEN
-		-- do nothing
-	END;
-
-	-- Update with a rename to avoid collisions
-	BEGIN
-		FOR renamable_row in
-			SELECT id, name
-			FROM   reporter.report_folder
-			WHERE  owner = src_usr
-		LOOP
-			suffix := ' (' || src_usr || ')';
-			LOOP
-				BEGIN
-					UPDATE  reporter.report_folder
-					SET     owner = dest_usr, name = name || suffix
-					WHERE   id = renamable_row.id;
-				EXCEPTION WHEN unique_violation THEN
-					suffix := suffix || ' ';
-					CONTINUE;
-				END;
-				EXIT;
-			END LOOP;
-		END LOOP;
-	EXCEPTION WHEN undefined_table THEN
-		-- do nothing
-	END;
-
-	BEGIN
-		UPDATE reporter.schedule SET runner = dest_usr WHERE runner = src_usr;
-	EXCEPTION WHEN undefined_table THEN
-		-- do nothing
-	END;
-
-	BEGIN
-		UPDATE reporter.template SET owner = dest_usr WHERE owner = src_usr;
-	EXCEPTION WHEN undefined_table THEN
-		-- do nothing
-	END;
-
-	-- Update with a rename to avoid collisions
-	BEGIN
-		FOR renamable_row in
-			SELECT id, name
-			FROM   reporter.template_folder
-			WHERE  owner = src_usr
-		LOOP
-			suffix := ' (' || src_usr || ')';
-			LOOP
-				BEGIN
-					UPDATE  reporter.template_folder
-					SET     owner = dest_usr, name = name || suffix
-					WHERE   id = renamable_row.id;
-				EXCEPTION WHEN unique_violation THEN
-					suffix := suffix || ' ';
-					CONTINUE;
-				END;
-				EXIT;
-			END LOOP;
-		END LOOP;
-	EXCEPTION WHEN undefined_table THEN
-	-- do nothing
-	END;
-
-	-- vandelay.*
-	-- Update with a rename to avoid collisions
-	FOR renamable_row in
-		SELECT id, name
-		FROM   vandelay.queue
-		WHERE  owner = src_usr
-	LOOP
-		suffix := ' (' || src_usr || ')';
-		LOOP
-			BEGIN
-				UPDATE  vandelay.queue
-				SET     owner = dest_usr, name = name || suffix
-				WHERE   id = renamable_row.id;
-			EXCEPTION WHEN unique_violation THEN
-				suffix := suffix || ' ';
-				CONTINUE;
-			END;
-			EXIT;
-		END LOOP;
-	END LOOP;
-
-    UPDATE vandelay.session_tracker SET usr = dest_usr WHERE usr = src_usr;
-
-    -- NULL-ify addresses last so other cleanup (e.g. circ anonymization)
-    -- can access the information before deletion.
-	UPDATE actor.usr SET
-		active = FALSE,
-		card = NULL,
-		mailing_address = NULL,
-		billing_address = NULL
-	WHERE id = src_usr;
-
-END;
-$$ LANGUAGE plpgsql;
-
-
-COMMIT;