Index: openacs-4/packages/acs-tcl/tcl/object-type-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/object-type-procs-oracle.xql,v diff -u -r1.3 -r1.3.20.1 --- openacs-4/packages/acs-tcl/tcl/object-type-procs-oracle.xql 11 Apr 2005 22:18:48 -0000 1.3 +++ openacs-4/packages/acs-tcl/tcl/object-type-procs-oracle.xql 11 Dec 2019 16:35:11 -0000 1.3.20.1 @@ -1,7 +1,7 @@ - oracle8.1.6 - + oracle8.1.6 + select object_type, @@ -14,8 +14,8 @@ - - + + select object_type, @@ -28,7 +28,7 @@ - + select object_type from acs_object_types Index: openacs-4/packages/acs-tcl/tcl/object-type-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/object-type-procs-postgresql.xql,v diff -u -r1.7 -r1.7.20.1 --- openacs-4/packages/acs-tcl/tcl/object-type-procs-postgresql.xql 11 Apr 2005 22:18:48 -0000 1.7 +++ openacs-4/packages/acs-tcl/tcl/object-type-procs-postgresql.xql 11 Dec 2019 16:35:11 -0000 1.7.20.1 @@ -1,25 +1,25 @@ - postgresql7.1 - + postgresql7.1 + select o2.object_type, o2.pretty_name, '' as indent, tree_level(o2.tree_sortkey) as level - from (select * - from acs_object_types - where object_type = :object_type) o1, + from (select * + from acs_object_types + where object_type = :object_type) o1, acs_object_types o2 where o2.tree_sortkey <= o1.tree_sortkey and o1.tree_sortkey between o2.tree_sortkey and tree_right(o2.tree_sortkey) order by level desc - - + + select object_type, @@ -31,17 +31,17 @@ - + select o2.object_type - from acs_object_types o1, + from acs_object_types o1, acs_object_types o2 where o1.object_type = :subtype and o2.tree_sortkey < o1.tree_sortkey - and o1.tree_sortkey between o2.tree_sortkey + and o1.tree_sortkey between o2.tree_sortkey and tree_right(o2.tree_sortkey) order by tree_level(o2.tree_sortkey) desc - + Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql,v diff -u -r1.22 -r1.22.2.1 --- openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql 28 Jun 2018 09:10:14 -0000 1.22 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql 11 Dec 2019 16:37:22 -0000 1.22.2.1 @@ -13,7 +13,7 @@ - + begin person.del( @@ -40,45 +40,45 @@ (object_type = 'group' or object_type = 'person') - + object_type = :start_with - + - + - - select - types.pretty_name, - types.object_type, - types.tree_level, + + select + types.pretty_name, + types.object_type, + types.tree_level, types.indent, case when valid_types.object_type = null then 0 else 1 end as valid_p - from + from (select t.pretty_name, t.object_type, level as tree_level, - replace(lpad(' ', (level - 1) * 4), + replace(lpad(' ', (level - 1) * 4), ' ', ' ') as indent, rownum as tree_rownum - from + from acs_object_types t - connect by + connect by prior t.object_type = t.supertype - start with + start with $start_with_clause ) types, - (select - object_type - from + (select + object_type + from rel_types_valid_obj_two_types - where + where rel_type = :rel_type ) valid_types - where + where types.object_type = valid_types.object_type(+) order by tree_rownum - + Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql,v diff -u -r1.23 -r1.23.2.1 --- openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql 28 Jun 2018 09:10:14 -0000 1.23 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql 11 Dec 2019 16:37:22 -0000 1.23.2.1 @@ -9,11 +9,11 @@ - + select person__delete(:person_id); - + @@ -37,20 +37,20 @@ (t1.object_type = 'group' or t1.object_type = 'person') - + t1.object_type = :start_with - + - + - select types.pretty_name, - types.object_type, - types.tree_level, + select types.pretty_name, + types.object_type, + types.tree_level, types.indent, case when valid_types.object_type = null then 0 else 1 end as valid_p from (select t2.pretty_name, @@ -63,12 +63,12 @@ where t2.tree_sortkey between t1.tree_sortkey and tree_right(t1.tree_sortkey) and $start_with_clause ) types left outer join - (select object_type + (select object_type from rel_types_valid_obj_two_types where rel_type = :rel_type ) valid_types using (object_type) order by types.tree_sortkey - +