Index: openacs-4/packages/accounts-ledger/sql/postgresql/contacts-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/accounts-ledger/sql/postgresql/contacts-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/accounts-ledger/sql/postgresql/contacts-create.sql	3 Jul 2006 11:24:21 -0000	1.3
+++ openacs-4/packages/accounts-ledger/sql/postgresql/contacts-create.sql	25 Oct 2020 18:57:08 -0000	1.4
@@ -229,7 +229,7 @@
 -- );
 -- 
 -- create function ec_user_classes_audit_tr ()
--- returns opaque as '
+-- returns trigger as '
 -- begin
 --         insert into ec_user_classes_audit (
 --         user_class_id, user_class_name,
@@ -273,7 +273,7 @@
 );
 
 create function qar_ec_product_u_c_prices_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into qar_ec_product_u_c_prices_audit (
         product_id, user_class_id,
@@ -324,7 +324,7 @@
 -- 
 -- 
 -- create function ec_user_class_user_audit_tr ()
--- returns opaque as '
+-- returns trigger as '
 -- begin
 --         insert into ec_user_class_user_map_audit (
 --         user_id, user_class_id, user_class_approved_p,
@@ -418,7 +418,7 @@
 -- 
 -- -- Jerry - I removed usps_abbrev and/or state here
 -- create function ec_retailers_audit_tr ()
--- returns opaque as '
+-- returns trigger as '
 -- begin
 --         insert into ec_retailers_audit (
 --         retailer_id, retailer_name,
@@ -524,7 +524,7 @@
 -- 
 -- -- Jerry - I removed usps_abbrev and/or state here
 -- create function ec_retailer_locations_audit_tr ()
--- returns opaque as '
+-- returns trigger as '
 -- begin
 --         insert into ec_retailer_locations_audit (
 --         retailer_location_id, retailer_id, location_name,
Index: openacs-4/packages/accounts-receivables/sql/postgresql/accounts-receivables-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/accounts-receivables/sql/postgresql/accounts-receivables-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/accounts-receivables/sql/postgresql/accounts-receivables-create.sql	3 Jul 2006 19:25:05 -0000	1.1
+++ openacs-4/packages/accounts-receivables/sql/postgresql/accounts-receivables-create.sql	25 Oct 2020 18:57:08 -0000	1.2
@@ -150,7 +150,7 @@
 create index qar_orderitems_trans_id_key on qar_orderitems (trans_id);
 create index qar_orderitems_id_key on qar_orderitems (id);
 --
-CREATE FUNCTION qar_del_recurring() returns opaque as '
+CREATE FUNCTION qar_del_recurring() returns trigger as '
 BEGIN
   DELETE FROM qar_recurring WHERE id = old.id;
   DELETE FROM qar_recurringemail WHERE id = old.id;
@@ -334,7 +334,7 @@
    
    
    create function qar_ec_gift_certificates_audit_tr ()
-   returns opaque as '
+   returns trigger as '
    begin
            insert into qar_ec_gift_certificates_audit (
            gift_certificate_id, amount,
@@ -519,7 +519,7 @@
 -- fills creditcard_id into qar_ec_financial_transactions if it's missing
 -- (using the credit card associated with the order)
 create function fin_trans_ccard_update_tr ()
-returns opaque as '
+returns trigger as '
 declare
         v_creditcard_id         qar_ec_creditcards.creditcard_id%TYPE;
 begin
@@ -657,7 +657,7 @@
    -- II. row-level trigger which updates ec_state_change_order_ids 
    -- so we know which rows to update in ec_orders
    -- create function ec_order_state_before_tr ()
-   -- returns opaque as '
+   -- returns trigger as '
    -- begin
    --         insert into ec_state_change_order_ids (order_id) values (new.order_id);
    -- 	return new;
@@ -672,7 +672,7 @@
    
    -- gilbertw - I took the trigger procedure from OpenACS 3.2.5.
    create function qar_ec_order_state_after_tr ()
-   returns opaque as '
+   returns trigger as '
    declare
            -- v_order_id              integer;
            n_items                 integer;
@@ -789,7 +789,7 @@
    
    
    create function qar_ec_offers_audit_tr ()
-   returns opaque as '
+   returns trigger as '
    begin
            insert into qar_ec_offers_audit (
            offer_id,
@@ -1145,7 +1145,7 @@
 -- trio crap and we have a simple trigger for everything.
 
 create function trig_qar_ec_cert_amount_remains()
-returns opaque
+returns trigger
 as '
 DECLARE
         bal_amount_used         numeric;
@@ -1475,7 +1475,7 @@
     
     -- Jerry - I removed usps_abbrev and/or state here
     create function qar_ec_sales_tax_by_state_audit_tr ()
-    returns opaque as '
+    returns trigger as '
     begin
             insert into qar_ec_sales_tax_by_state_audit (
             usps_abbrev, tax_rate,
Index: openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql	5 Dec 2018 12:45:08 -0000	1.20
+++ openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql	25 Oct 2020 18:57:08 -0000	1.21
@@ -127,7 +127,7 @@
 -- consistent for duration of the service.
 -- And yet, experience knows that sometimes email servers change
 -- and UIDs for an email change with it.
--- Users switching email servers of an email account using a IMAP4 client 
+-- Users switching email servers of an email account using an IMAP4 client 
 -- might hassle with moving email, but
 -- in the process they generally know what is happening. They don't re-read
 -- all the email. 
Index: openacs-4/packages/adserver/sql/postgresql/adserver-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/sql/postgresql/adserver-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/adserver/sql/postgresql/adserver-create.sql	13 Jan 2005 13:56:02 -0000	1.4
+++ openacs-4/packages/adserver/sql/postgresql/adserver-create.sql	25 Oct 2020 18:57:08 -0000	1.5
@@ -196,7 +196,7 @@
 -- trigger to insert an advertisement and
 -- automatically determine/maintain the highest
 -- advertisement number
-create function advs_count_bfr_insert_fun() returns opaque as '
+create function advs_count_bfr_insert_fun() returns trigger as '
 declare
         top integer;
 begin
@@ -222,7 +222,7 @@
 -- row level trigger to "save" an intermediate 
 -- adnumber to be swapped for the "high" adnumber.
 -- for each row to be deleted do:
-create function advs_count_afr_del_row_fun() returns opaque as '
+create function advs_count_afr_del_row_fun() returns trigger as '
 begin
     insert into advs_swaps values (old.adv_number);
 
@@ -235,7 +235,7 @@
 for each row execute procedure advs_count_afr_del_row_fun();
 
 -- statement level trigger to perform the swaps.
-create function advs_count_afr_del_fun() returns opaque as '
+create function advs_count_afr_del_fun() returns trigger as '
 declare
     v_next integer;
     s record;
@@ -304,7 +304,7 @@
 
 */
 
-create function adv_group_count_bfr_insert_fun() returns opaque as '
+create function adv_group_count_bfr_insert_fun() returns trigger as '
 declare 
     top integer; 
 begin 
@@ -335,7 +335,7 @@
 
 */
 
-create function adv_group_count_afr_del_row_fun() returns opaque as '
+create function adv_group_count_afr_del_row_fun() returns trigger as '
 begin 
     update adv_group_map set adv_group_number=adv_group_number-1 where adv_group_number>old.adv_group_number and group_key=old.group_key;
 
Index: openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql	16 Apr 2019 07:40:27 -0000	1.29
+++ openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql	25 Oct 2020 18:57:08 -0000	1.30
@@ -158,7 +158,7 @@
 	return trim(leading separator from folder_names);
 end;' language 'plpgsql';
 
-create function bm_bookmarks_insert_tr () returns opaque as '
+create function bm_bookmarks_insert_tr () returns trigger as '
 declare
         v_parent_sk     varbit default null;
         v_max_value     integer;
@@ -189,7 +189,7 @@
 on bm_bookmarks for each row 
 execute procedure bm_bookmarks_insert_tr ();
 
-create function bm_bookmarks_update_tr () returns opaque as '
+create function bm_bookmarks_update_tr () returns trigger as '
 declare
         v_parent_sk     varbit default null;
         v_max_value     integer;
Index: openacs-4/packages/cms/sql/postgresql/cms-permissions.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-permissions.sql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/cms/sql/postgresql/cms-permissions.sql	5 Apr 2018 14:44:08 -0000	1.12
+++ openacs-4/packages/cms/sql/postgresql/cms-permissions.sql	25 Oct 2020 18:57:08 -0000	1.13
@@ -364,7 +364,7 @@
 );
 insert into v_items (value) values ('{0}');
 
-create or replace function v_items_tr () returns opaque as '
+create or replace function v_items_tr () returns trigger as '
 begin
         raise EXCEPTION ''Only updates are allowed on this table'';
         return null;
@@ -379,7 +379,7 @@
 );
 insert into v_perms (value) values ('{''}');
 
-create or replace function v_perms_tr () returns opaque as '
+create or replace function v_perms_tr () returns trigger as '
 begin
         raise EXCEPTION ''Only updates are allowed on this table'';
         return null;
@@ -685,7 +685,7 @@
 -- A trigger to automatically grant item creators the cm_write and cm_perm
 -- permissions
 
-create or replace function cr_items_permission_tr () returns opaque as '
+create or replace function cr_items_permission_tr () returns trigger as '
 declare
   v_user_id parties.party_id%TYPE;
 begin
Index: openacs-4/packages/customer-service/sql/postgresql/customer-service-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/customer-service/sql/postgresql/customer-service-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/customer-service/sql/postgresql/customer-service-create.sql	3 Jul 2006 19:33:33 -0000	1.1
+++ openacs-4/packages/customer-service/sql/postgresql/customer-service-create.sql	25 Oct 2020 18:57:08 -0000	1.2
@@ -44,7 +44,7 @@
 -- 
 -- -- puts date_added into eccs_user_identification if it's missing
 -- create function eccs_user_identificate_date_tr ()
--- returns opaque as '
+-- returns trigger as '
 -- begin
 --         IF new.date_added is null THEN
 --                 new.date_added := now();
@@ -74,7 +74,7 @@
 -- 
 -- -- gilbertw - used the code in OpenACS 3.2.5 as a reference
 -- create function eccs_cs_interaction_inserts ()
--- returns opaque as '
+-- returns trigger as '
 -- begin
 --  IF new.interaction_date is null THEN 
 --     new.interaction_date := now();
@@ -123,7 +123,7 @@
 -- -- gilbertw - used code OpenACS 3.2.5 as a reference
 -- -- removed INSERTING
 -- create function eccs_cs_issue_inserts ()
--- returns opaque as '
+-- returns trigger as '
 -- begin
 --  IF new.open_date is null THEN 
 --     new.open_date := now();
@@ -183,7 +183,7 @@
 -- );
 -- 
 -- create function eccs_picklist_items_audit_tr ()
--- returns opaque as '
+-- returns trigger as '
 -- begin
 --         insert into eccs_picklist_items_audit (
 --         picklist_item_id, picklist_item,
@@ -257,7 +257,7 @@
 -- );
 -- 
 -- create function eccs_email_templates_audit_tr ()
--- returns opaque as '
+-- returns trigger as '
 -- begin
 --         insert into eccs_email_templates_audit (
 --         email_template_id, title,
Index: openacs-4/packages/ecommerce/sql/postgresql/ec-product-sc-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/sql/postgresql/ec-product-sc-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/sql/postgresql/ec-product-sc-create.sql	8 Jan 2002 23:14:17 -0000	1.3
+++ openacs-4/packages/ecommerce/sql/postgresql/ec-product-sc-create.sql	25 Oct 2020 18:57:08 -0000	1.4
@@ -22,21 +22,21 @@
 
 
 create function ec_products__itrg ()
-returns opaque as '
+returns trigger as '
 begin
     perform search_observer__enqueue(new.product_id,''INSERT'');
     return new;
 end;' language 'plpgsql';
 
 create function ec_products__dtrg ()
-returns opaque as '
+returns trigger as '
 begin
     perform search_observer__enqueue(old.product_id,''DELETE'');
     return old;
 end;' language 'plpgsql';
 
 create function ec_products__utrg ()
-returns opaque as '
+returns trigger as '
 begin
     perform search_observer__enqueue(old.product_id,''UPDATE'');
     return old;
Index: openacs-4/packages/ecommerce/sql/postgresql/ecommerce-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/sql/postgresql/ecommerce-create.sql,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/ecommerce/sql/postgresql/ecommerce-create.sql	28 Aug 2008 10:46:28 -0000	1.21
+++ openacs-4/packages/ecommerce/sql/postgresql/ecommerce-create.sql	25 Oct 2020 18:57:08 -0000	1.22
@@ -75,7 +75,7 @@
 -- A trigger is used to move information from the main table to 
 -- the audit table
 create function ec_templates_audit_tr () 
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_templates_audit (
         template_id, template_name,
@@ -124,7 +124,7 @@
 );
 
 create function ec_categories_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_categories_audit (
         category_id, category_name, sort_key,
@@ -172,7 +172,7 @@
 );
 
 create function ec_subcategories_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_subcategories_audit (
         subcategory_id, category_id,
@@ -230,7 +230,7 @@
 );
 
 create function ec_subsubcategories_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_subsubcategories_audit (
         subsubcategory_id, subcategory_id,
@@ -419,7 +419,7 @@
 );
 
 create function ec_products_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_products_audit (
         product_id, product_name, creation_date,
@@ -515,7 +515,7 @@
 
 
 create function ec_sale_prices_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_sale_prices_audit (
         sale_price_id, product_id, sale_price,
@@ -562,7 +562,7 @@
 
 
 create function ec_product_series_map_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_product_series_map_audit (
         series_id, component_id,
@@ -655,7 +655,7 @@
 );
 
 create function ec_user_classes_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_user_classes_audit (
         user_class_id, user_class_name,
@@ -699,7 +699,7 @@
 );
 
 create function ec_product_u_c_prices_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_product_u_c_prices_audit (
         product_id, user_class_id,
@@ -762,7 +762,7 @@
 );
 
 create function ec_product_recommend_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_product_recommend_audit (
         recommendation_id, product_id,
@@ -842,7 +842,7 @@
 
 
 create function ec_user_class_user_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_user_class_user_map_audit (
         user_id, user_class_id, user_class_approved_p,
@@ -883,7 +883,7 @@
 );
 
 create function ec_product_links_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_product_links_audit (
         product_a, product_b,
@@ -939,7 +939,7 @@
 );
 
 create function ec_product_comments_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_product_comments_audit (
         comment_id, product_id, user_id,
@@ -997,7 +997,7 @@
 );
 
 create function ec_product_reviews_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_product_reviews_audit (
         review_id, product_id,
@@ -1049,7 +1049,7 @@
 -- ec_category_product_map_audit_tr abbreviated as
 -- ec_cat_prod_map_audit_tr
 create function ec_cat_prod_map_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_category_product_map_audit (
         product_id, category_id,
@@ -1096,7 +1096,7 @@
 
 -- ec_subcat_prod_map_audit_tr
 create function ec_subcat_prod_map_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_subcat_prod_map_audit (
         product_id, subcategory_id,
@@ -1141,7 +1141,7 @@
 );
 
 create function ec_subsubcat_prod_map_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_subsubcat_prod_map_audit (
         product_id, subsubcategory_id,
@@ -1209,7 +1209,7 @@
 );
 
 create function ec_custom_prod_fields_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_custom_product_fields_audit (
         field_identifier, field_name,
@@ -1252,7 +1252,7 @@
 );
 
 create function ec_custom_p_f_values_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_custom_p_field_values_audit (
         product_id,
@@ -1409,7 +1409,7 @@
 -- fills address_id into ec_shipments if it's missing
 -- (using the shipping_address associated with the order)
 create function ec_shipment_address_update_tr ()
-returns opaque as '
+returns trigger as '
 declare
         v_address_id            ec_addresses.address_id%TYPE;
 begin
@@ -1442,7 +1442,7 @@
 );
 
 create function ec_shipments_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_shipments_audit (
         shipment_id, order_id, address_id,
@@ -1595,7 +1595,7 @@
 -- II. row-level trigger which updates ec_state_change_order_ids 
 -- so we know which rows to update in ec_orders
 -- create function ec_order_state_before_tr ()
--- returns opaque as '
+-- returns trigger as '
 -- begin
 --         insert into ec_state_change_order_ids (order_id) values (new.order_id);
 -- 	return new;
@@ -1610,7 +1610,7 @@
 
 -- gilbertw - I took the trigger procedure from OpenACS 3.2.5.
 create function ec_order_state_after_tr ()
-returns opaque as '
+returns trigger as '
 declare
         -- v_order_id              integer;
         n_items                 integer;
@@ -1702,7 +1702,7 @@
 );
 
 create function ec_admin_settings_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_admin_settings_audit (
         admin_setting_id, base_shipping_cost, default_shipping_per_item,
@@ -1755,7 +1755,7 @@
 
 -- Jerry - I removed usps_abbrev and/or state here
 create function ec_sales_tax_by_state_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_sales_tax_by_state_audit (
         usps_abbrev, tax_rate,
@@ -1847,7 +1847,7 @@
 
 -- Jerry - I removed usps_abbrev and/or state here
 create function ec_retailers_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_retailers_audit (
         retailer_id, retailer_name,
@@ -1953,7 +1953,7 @@
 
 -- Jerry - I removed usps_abbrev and/or state here
 create function ec_retailer_locations_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_retailer_locations_audit (
         retailer_location_id, retailer_id, location_name,
@@ -2052,7 +2052,7 @@
 
 
 create function ec_offers_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_offers_audit (
         offer_id,
@@ -2183,7 +2183,7 @@
 
 
 create function ec_gift_certificates_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_gift_certificates_audit (
         gift_certificate_id, amount,
@@ -2260,7 +2260,7 @@
 
 -- puts date_added into ec_user_identification if it's missing
 create function ec_user_identificate_date_tr ()
-returns opaque as '
+returns trigger as '
 begin
         IF new.date_added is null THEN
                 new.date_added := now();
@@ -2290,7 +2290,7 @@
 
 -- gilbertw - used the code in OpenACS 3.2.5 as a reference
 create function ec_cs_interaction_inserts ()
-returns opaque as '
+returns trigger as '
 begin
  IF new.interaction_date is null THEN 
     new.interaction_date := now();
@@ -2339,7 +2339,7 @@
 -- gilbertw - used code OpenACS 3.2.5 as a reference
 -- removed INSERTING
 create function ec_cs_issue_inserts ()
-returns opaque as '
+returns trigger as '
 begin
  IF new.open_date is null THEN 
     new.open_date := now();
@@ -2399,7 +2399,7 @@
 );
 
 create function ec_picklist_items_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_picklist_items_audit (
         picklist_item_id, picklist_item,
@@ -2473,7 +2473,7 @@
 );
 
 create function ec_email_templates_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into ec_email_templates_audit (
         email_template_id, title,
@@ -2622,7 +2622,7 @@
 -- fills creditcard_id into ec_financial_transactions if it's missing
 -- (using the credit card associated with the order)
 create function fin_trans_ccard_update_tr ()
-returns opaque as '
+returns trigger as '
 declare
         v_creditcard_id         ec_creditcards.creditcard_id%TYPE;
 begin
@@ -3013,7 +3013,7 @@
 -- trio crap and we have a simple trigger for everything.
 
 create function trig_ec_cert_amount_remains()
-returns opaque
+returns trigger
 as '
 DECLARE
         bal_amount_used         numeric;
Index: openacs-4/packages/faq/sql/postgresql/faq-sc-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/sql/postgresql/faq-sc-create.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/faq/sql/postgresql/faq-sc-create.sql	30 Jan 2019 11:59:49 -0000	1.5
+++ openacs-4/packages/faq/sql/postgresql/faq-sc-create.sql	25 Oct 2020 18:57:08 -0000	1.6
@@ -7,23 +7,23 @@
 --
 
 create function faq_sc__itrg ()
-returns opaque as $$
+returns trigger as $$
 begin
     perform search_observer__enqueue(new.entry_id,'INSERT'); 
     return new;
 end; 
 $$ language plpgsql;
 
 create function faq_sc__dtrg ()
-returns opaque as $$
+returns trigger as $$
 begin
     perform search_observer__enqueue(old.entry_id,'DELETE'); 
     return old;
 end;
 $$ language plpgsql;
 
 create function faq_sc__utrg ()
-returns opaque as $$
+returns trigger as $$
 begin
     perform search_observer__enqueue(old.entry_id,'UPDATE'); 
     return old;
Index: openacs-4/packages/imsld/sql/postgresql/imsld-tree-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-tree-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/sql/postgresql/imsld-tree-create.sql	18 Nov 2005 08:44:50 -0000	1.1
+++ openacs-4/packages/imsld/sql/postgresql/imsld-tree-create.sql	25 Oct 2020 18:57:08 -0000	1.2
@@ -7,7 +7,7 @@
 
 -- tree query support for imsld_items
 
-create function imsld_items_insert_tr() returns opaque as '
+create function imsld_items_insert_tr() returns trigger as '
 declare
         v_parent_sk    		varbit default null;
         v_max_child_sortkey	varbit;
Index: openacs-4/packages/inventory-control/sql/postgresql/catalog-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/inventory-control/sql/postgresql/catalog-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/inventory-control/sql/postgresql/catalog-create.sql	17 Apr 2018 14:47:02 -0000	1.3
+++ openacs-4/packages/inventory-control/sql/postgresql/catalog-create.sql	25 Oct 2020 18:57:08 -0000	1.4
@@ -302,7 +302,7 @@
 );
 
 create function qci_ec_products_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
      insert into qci_ec_products_audit (
      product_id, product_name, creation_date,
@@ -366,7 +366,7 @@
 
 
 create function qci_product_series_map_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
      insert into qci_product_series_map_audit (
      series_id, product_id,
Index: openacs-4/packages/inventory-control/sql/postgresql/inventory-control-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/inventory-control/sql/postgresql/inventory-control-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/inventory-control/sql/postgresql/inventory-control-create.sql	9 Jul 2006 22:14:24 -0000	1.3
+++ openacs-4/packages/inventory-control/sql/postgresql/inventory-control-create.sql	25 Oct 2020 18:57:08 -0000	1.4
@@ -143,7 +143,7 @@
 
 
 create function qci_ec_sale_prices_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into qci_ec_sale_prices_audit (
         sale_price_id, product_id, sale_price,
@@ -186,7 +186,7 @@
 );
 
 create function qci_ec_product_links_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into qci_ec_product_links_audit (
         product_a, product_b,
@@ -238,7 +238,7 @@
 );
 
 create function qci_ec_custom_prod_fields_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into qci_ec_custom_product_fields_audit (
         field_identifier, field_name,
@@ -281,7 +281,7 @@
 );
 
 create function qci_ec_custom_p_f_values_audit_tr ()
-returns opaque as '
+returns trigger as '
 begin
         insert into qci_ec_custom_p_field_values_audit (
         product_id,
Index: openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-sc-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-sc-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-sc-create.sql	2 Apr 2004 01:01:08 -0000	1.3
+++ openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-sc-create.sql	25 Oct 2020 18:57:08 -0000	1.4
@@ -25,7 +25,7 @@
 
 
 create function pinds_blog_entries__itrg ()
-returns opaque as '
+returns trigger as '
 begin
     if new.draft_p = ''f'' then
         perform search_observer__enqueue(new.entry_id,''INSERT'');
@@ -34,14 +34,14 @@
 end;' language 'plpgsql';
 
 create function pinds_blog_entries__dtrg ()
-returns opaque as '
+returns trigger as '
 begin
     perform search_observer__enqueue(old.entry_id,''DELETE'');
     return old;
 end;' language 'plpgsql';
 
 create function pinds_blog_entries__utrg ()
-returns opaque as '
+returns trigger as '
 begin
     if (new.draft_p = ''t'' and old.draft_p = ''f'') or new.deleted_p = ''t'' then
         perform search_observer__enqueue(old.entry_id,''DELETE'');
Index: openacs-4/packages/lors/sql/postgresql/lors-imsmd-sc-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lors/sql/postgresql/lors-imsmd-sc-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lors/sql/postgresql/lors-imsmd-sc-create.sql	4 Sep 2004 14:04:07 -0000	1.1
+++ openacs-4/packages/lors/sql/postgresql/lors-imsmd-sc-create.sql	25 Oct 2020 18:57:08 -0000	1.2
@@ -28,21 +28,21 @@
 
 
 create function ims_md_record__itrg ()
-returns opaque as '
+returns trigger as '
 begin
         perform search_observer__enqueue(new.ims_md_id,''INSERT'');
     return null;
 end;' language 'plpgsql';
 
 create function ims_md_record__dtrg ()
-returns opaque as '
+returns trigger as '
 begin
     perform search_observer__enqueue(old.ims_md_id,''DELETE'');
     return old;
 end;' language 'plpgsql';
 
 create function ims_md_record__utrg ()
-returns opaque as '
+returns trigger as '
 begin
         perform search_observer__enqueue(old.ims_md_id,''DELETE'');
         perform search_observer__enqueue(old.ims_md_id,''UPDATE'');
Index: openacs-4/packages/online-catalog/sql/postgresql/online-catalog-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/online-catalog/sql/postgresql/online-catalog-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/online-catalog/sql/postgresql/online-catalog-create.sql	3 Jul 2006 19:32:32 -0000	1.1
+++ openacs-4/packages/online-catalog/sql/postgresql/online-catalog-create.sql	25 Oct 2020 18:57:08 -0000	1.2
@@ -41,7 +41,7 @@
 -- A trigger is used to move information from the main table to 
 -- the audit table
 create function ecca_ec_templates_audit_tr () 
-returns opaque as '
+returns trigger as '
 begin
         insert into ecca_ec_templates_audit (
         template_id, template_name,
Index: openacs-4/packages/ratings/sql/postgresql/ratings-triggers.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ratings/sql/postgresql/ratings-triggers.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ratings/sql/postgresql/ratings-triggers.sql	21 May 2004 22:53:02 -0000	1.2
+++ openacs-4/packages/ratings/sql/postgresql/ratings-triggers.sql	25 Oct 2020 18:57:08 -0000	1.3
@@ -12,7 +12,7 @@
 -- License.  Full text of the license is available from the GNU Project:
 -- http://www.fsf.org/copyleft/gpl.html
 
-create function ratings_ins_tr () returns opaque as '
+create function ratings_ins_tr () returns trigger as '
 begin
     if not exists (
         SELECT 1
@@ -63,7 +63,7 @@
 for each row
 execute procedure ratings_ins_tr();
 
-create function ratings_upd_tr () returns opaque as '
+create function ratings_upd_tr () returns trigger as '
 begin
     -- We first subtract the old, then add the new, in case owner_id, dimension_id or object_id was changed.
 
@@ -122,7 +122,7 @@
 execute procedure ratings_upd_tr();
 
 -- drop function ratings_del_tr() cascade;
-create function ratings_del_tr () returns opaque as '
+create function ratings_del_tr () returns trigger as '
 begin
     if old.owner_id = 0 then
         UPDATE rating_aggregates 
Index: openacs-4/packages/shipping-tracking/sql/postgresql/shipping-tracking-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/shipping-tracking/sql/postgresql/shipping-tracking-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/shipping-tracking/sql/postgresql/shipping-tracking-create.sql	3 Jul 2006 19:30:26 -0000	1.1
+++ openacs-4/packages/shipping-tracking/sql/postgresql/shipping-tracking-create.sql	25 Oct 2020 18:57:08 -0000	1.2
@@ -63,7 +63,7 @@
    -- (using the shipping_address associated with the order)
 
    create function ecst_shipment_address_update_tr ()
-   returns opaque as '
+   returns trigger as '
    declare
            v_address_id            qal_ec_addresses.address_id%TYPE;
    begin
@@ -96,7 +96,7 @@
    );
    
    create function ecst_shipments_audit_tr ()
-   returns opaque as '
+   returns trigger as '
    begin
            insert into ecst_shipments_audit (
            shipment_id, order_id, address_id,
Index: openacs-4/packages/soap-gateway/sql/postgresql/soap-gateway-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/soap-gateway/sql/postgresql/soap-gateway-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/soap-gateway/sql/postgresql/soap-gateway-create.sql	17 Dec 2018 09:48:45 -0000	1.2
+++ openacs-4/packages/soap-gateway/sql/postgresql/soap-gateway-create.sql	25 Oct 2020 18:57:08 -0000	1.3
@@ -531,21 +531,21 @@
 	
 -- trigger functions
 create function sg_methods__itrg ()
-returns opaque as '
+returns trigger as '
 begin
     perform sg_namespaces__dirty(new.namespace_id);
     return new;
 end;' language 'plpgsql';
 
 create function sg_methods__dtrg ()
-returns opaque as '
+returns trigger as '
 begin
     perform sg_namespaces__dirty(old.namespace_id);
     return old;
 end;' language 'plpgsql';
 
 create function sg_methods__utrg ()
-returns opaque as '
+returns trigger as '
 begin
     perform sg_namespaces__dirty(new.namespace_id);
 	if new.namespace_id <> old.namespace_id then
Index: openacs-4/packages/static-pages/sql/postgresql/static-pages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/sql/postgresql/static-pages-create.sql,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/static-pages/sql/postgresql/static-pages-create.sql	16 Jan 2003 14:00:21 -0000	1.19
+++ openacs-4/packages/static-pages/sql/postgresql/static-pages-create.sql	25 Oct 2020 18:57:08 -0000	1.20
@@ -63,7 +63,7 @@
 
 -- tree_sortkey triggers DaveB
 
-create function sp_folders_insert_tr () returns opaque as '
+create function sp_folders_insert_tr () returns trigger as '
 declare
         v_parent_sk     varbit default null;
         v_max_value     integer;
@@ -89,7 +89,7 @@
 on sp_folders for each row 
 execute procedure sp_folders_insert_tr ();
 
-create function sp_folders_update_tr () returns opaque as '
+create function sp_folders_update_tr () returns trigger as '
 declare
         v_parent_sk     varbit default null;
         v_max_value     integer;