Index: openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql	14 Jun 2018 15:05:17 -0000	1.23
+++ openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql	3 Sep 2024 15:37:33 -0000	1.24
@@ -3,156 +3,156 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="package_create_attribute_list.select_all_attributes">      
+<fullquery name="package_create_attribute_list.select_all_attributes">
       <querytext>
 
-	select upper(coalesce(attr.table_name,t.table_name)) as attr_table_name, 
-	       upper(coalesce(attr.column_name, attr.attribute_name)) as attr_column_name,
-	       attr.ancestor_type, attr.min_n_values, attr.default_value
-	  from acs_object_type_attributes attr, 
-	       (select t2.object_type, t2.table_name, (tree_level(t1.tree_sortkey) - tree_level(t2.tree_sortkey)) + 1 as type_level
-	          from acs_object_types t1, acs_object_types t2
-		 where t1.tree_sortkey between t2.tree_sortkey and tree_right(t2.tree_sortkey)
-		   and t1.object_type = :object_type) t
+        select upper(coalesce(attr.table_name,t.table_name)) as attr_table_name,
+               upper(coalesce(attr.column_name, attr.attribute_name)) as attr_column_name,
+               attr.ancestor_type, attr.min_n_values, attr.default_value
+          from acs_object_type_attributes attr,
+               (select t2.object_type, t2.table_name, (tree_level(t1.tree_sortkey) - tree_level(t2.tree_sortkey)) + 1 as type_level
+                  from acs_object_types t1, acs_object_types t2
+                 where t1.tree_sortkey between t2.tree_sortkey and tree_right(t2.tree_sortkey)
+                   and t1.object_type = :object_type) t
          where attr.ancestor_type = t.object_type
            and attr.object_type = :object_type
-        order by t.type_level 
-    
+        order by t.type_level
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="package_recreate_hierarchy.select_object_types">      
+
+<fullquery name="package_recreate_hierarchy.select_object_types">
       <querytext>
 
-	select t2.object_type
-	  from acs_object_types t1, acs_object_types t2
-	 where t2.dynamic_p = 't'
-	   and t2.tree_sortkey between t1.tree_sortkey and tree_right(t1.tree_sortkey)
-	   and t1.object_type = :object_type
-    
+        select t2.object_type
+          from acs_object_types t1, acs_object_types t2
+         where t2.dynamic_p = 't'
+           and t2.tree_sortkey between t1.tree_sortkey and tree_right(t1.tree_sortkey)
+           and t1.object_type = :object_type
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="package_create.package_valid_p">      
+
+<fullquery name="package_create.package_valid_p">
       <querytext>
-      
---	    select case when exists (select 1 
---                                       from user_objects 
+
+--          select case when exists (select 1
+--                                       from user_objects
 --                                      where status = 'INVALID'
 --                                        and object_name = upper(:package_name)
 --                                        and object_type = upper(:type))
 --                        then 0 else 1 end
-            select 1 from dual;     
-	
+            select 1 from dual;
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="package_object_view_reset.select_ancestor_types">      
+
+<fullquery name="package_object_view_reset.select_ancestor_types">
       <querytext>
 
-	select t2.object_type as ancestor_type
-	  from acs_object_types t1, acs_object_types t2
-	 where t1.tree_sortkey between t2.tree_sortkey and tree_right(t2.tree_sortkey)
-	   and t1.object_type = :object_type
-    
+        select t2.object_type as ancestor_type
+          from acs_object_types t1, acs_object_types t2
+         where t1.tree_sortkey between t2.tree_sortkey and tree_right(t2.tree_sortkey)
+           and t1.object_type = :object_type
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="package_object_view_reset.select_sub_types">      
+
+<fullquery name="package_object_view_reset.select_sub_types">
       <querytext>
 
-	select t2.object_type as sub_type
-	  from acs_object_types t1, acs_object_types t2
-	 where t2.tree_sortkey between t1.tree_sortkey and tree_right(t1.tree_sortkey)
-	   and t1.object_type = :object_type 
-    
+        select t2.object_type as sub_type
+          from acs_object_types t1, acs_object_types t2
+         where t2.tree_sortkey between t1.tree_sortkey and tree_right(t1.tree_sortkey)
+           and t1.object_type = :object_type
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="package_object_attribute_list.attributes_select">      
+
+<fullquery name="package_object_attribute_list.attributes_select">
       <querytext>
 
-	select a.attribute_id, 
-	       coalesce(a.table_name, t.table_name) as table_name,
-	       coalesce(a.column_name, a.attribute_name) as attribute_name, 
-	       a.pretty_name, 
-	       a.datatype, 
-	       case when a.min_n_values = 0 then 'f' else 't' end as required_p, 
-               a.default_value, 
-               t.table_name as object_type_table_name, 
+        select a.attribute_id,
+               coalesce(a.table_name, t.table_name) as table_name,
+               coalesce(a.column_name, a.attribute_name) as attribute_name,
+               a.pretty_name,
+               a.datatype,
+               case when a.min_n_values = 0 then 'f' else 't' end as required_p,
+               a.default_value,
+               t.table_name as object_type_table_name,
                t.id_column as object_type_id_column
-          from acs_object_type_attributes a, 
+          from acs_object_type_attributes a,
                (select t.object_type, t.table_name, t.id_column, tree_level(t.tree_sortkey) as type_level
                 from acs_object_types t, acs_object_types t2
-		where t.tree_sortkey between t2.tree_sortkey and tree_right(t2.tree_sortkey)
-		  and t2.object_type = :start_with) t
+                where t.tree_sortkey between t2.tree_sortkey and tree_right(t2.tree_sortkey)
+                  and t2.object_type = :start_with) t
          where a.object_type = :object_type
            and t.object_type = a.ancestor_type $storage_clause
          order by type_level, sort_order, attribute_id
       </querytext>
 </fullquery>
 
- 
-<fullquery name="package_table_columns_for_type.select_object_type_param_list">      
+
+<fullquery name="package_table_columns_for_type.select_object_type_param_list">
       <querytext>
 
-	select cols.table_name, cols.column_name
-	  from user_tab_columns cols, 
-	       (select upper(t2.table_name) as table_name
-	          from acs_object_types t1, acs_object_types t2
-		 where t1.tree_sortkey between t2.tree_sortkey and tree_right(t2.tree_sortkey)
-		   and t1.object_type = :object_type) t
-	 where cols.column_name in
-	          (select args.arg_name
+        select cols.table_name, cols.column_name
+          from user_tab_columns cols,
+               (select upper(t2.table_name) as table_name
+                  from acs_object_types t1, acs_object_types t2
+                 where t1.tree_sortkey between t2.tree_sortkey and tree_right(t2.tree_sortkey)
+                   and t1.object_type = :object_type) t
+         where cols.column_name in
+                  (select args.arg_name
                      from acs_function_args args
                     where args.function = upper(:package_name) || '__' || upper(:object_name))
-	   and cols.table_name = t.table_name
-    
+           and cols.table_name = t.table_name
+
       </querytext>
 </fullquery>
 
 
-<fullquery name="package_plsql_args.select_package_func_param_list">      
+<fullquery name="package_plsql_args.select_package_func_param_list">
       <querytext>
-	select args.arg_name
+        select args.arg_name
         from acs_function_args args
         where args.function = upper(:package_name) || '__' || upper(:object_name)
       </querytext>
 </fullquery>
 
-<fullquery name="package_function_p.function_p">      
+<fullquery name="package_function_p.function_p">
       <querytext>
-	 select 1
+         select 1
       </querytext>
 </fullquery>
- 
-<fullquery name="package_instantiate_object.create_object">      
+
+<fullquery name="package_instantiate_object.create_object">
       <querytext>
 
-	select ${package_name}__new([plpgsql_utility::generate_attribute_parameter_call \
-		-prepend ":" \
-		${package_name}__new \
-		$pieces])
+        select ${package_name}__new([plpgsql_utility::generate_attribute_parameter_call \
+                -prepend ":" \
+                ${package_name}__new \
+                $pieces])
 
       </querytext>
 </fullquery>
 
- 
-<fullquery name="package_generate_body.select_supertype_function_params">      
+
+<fullquery name="package_generate_body.select_supertype_function_params">
       <querytext>
         select args.arg_name
           from acs_function_args args
         where args.function = upper(:supertype_package_name) || '__NEW'
        </querytext>
 </fullquery>
 
- 
-<partialquery name="package_generate_body.body">      
+
+<partialquery name="package_generate_body.body">
       <querytext>
 
 begin
@@ -162,31 +162,31 @@
 perform define_function_args('${package_name}__new','[plpgsql_utility::define_function_args $attribute_list]');
 
 CREATE FUNCTION ${package_name}__new([plpgsql_utility::generate_function_signature $attribute_list])
-RETURNS [plpgsql_utility::table_column_type ${table_name} ${id_column}] AS $$
+RETURNS [db_column_type -complain $table_name $id_column] AS $$
 DECLARE
     [plpgsql_utility::generate_attribute_parameters $attribute_list];
     v_$id_column ${table_name}.${id_column}%TYPE;
 BEGIN
 
     v_$id_column := ${supertype_package_name}__new (
                      [plpgsql_utility::generate_attribute_parameter_call_from_attributes \
-			     -prepend "p_" \
-			     "${supertype_package_name}__new" \
-			     $supertype_attr_list]
+                             -prepend "p_" \
+                             "${supertype_package_name}__new" \
+                             $supertype_attr_list]
                    );
 
-    insert into ${table_name} 
-    ($id_column[plsql_utility::generate_attribute_dml -ignore [list $id_column] $table_name $attribute_list]) 
-    values 
+    insert into ${table_name}
+    ($id_column[plsql_utility::generate_attribute_dml -ignore [list $id_column] $table_name $attribute_list])
+    values
     (v_$id_column[plsql_utility::generate_attribute_dml -prepend "p_" -ignore [list $id_column] $table_name $attribute_list]);
 
     return v_$id_column;
 
-END; 
+END;
 $$ LANGUAGE plpgsql;
 
 CREATE FUNCTION ${package_name}__delete (
-    p_${id_column} [plpgsql_utility::table_column_type ${table_name} ${id_column}]
+    p_${id_column} [db_column_type -complain $table_name $id_column]
 ) RETURNS integer AS $$
 DECLARE
 BEGIN
@@ -199,34 +199,34 @@
 
 return null;
 end;
-    
+
       </querytext>
 </partialquery>
 
 
-<partialquery name="package_generate_spec.spec">      
+<partialquery name="package_generate_spec.spec">
       <querytext>
 
 select 1;
-    
+
       </querytext>
 </partialquery>
 
 
-<fullquery name="package_function_p.function_p">      
+<fullquery name="package_function_p.function_p">
       <querytext>
-	select 1 from dual
+        select 1 from dual
       </querytext>
 </fullquery>
 
 
-<fullquery name="package_exec_plsql.exec_func_plsql">      
+<fullquery name="package_exec_plsql.exec_func_plsql">
       <querytext>
 
-	select ${__package_name}__${__object_name}([plpgsql_utility::generate_attribute_parameter_call \
-		-prepend ":" \
-		${__package_name}__${__object_name} \
-		$pieces])
+        select ${__package_name}__${__object_name}([plpgsql_utility::generate_attribute_parameter_call \
+                -prepend ":" \
+                ${__package_name}__${__object_name} \
+                $pieces])
 
       </querytext>
 </fullquery>