Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/Attic/one-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one-postgresql.xql 15 May 2001 16:59:00 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one-postgresql.xql 9 Sep 2001 17:42:04 -0000 1.2
@@ -24,7 +24,6 @@
- FIX ME OUTER JOIN
select role1.role as role_one,
coalesce(role1.pretty_name,'Object on side one') as role_one_pretty_name,
@@ -33,33 +32,13 @@
coalesce(role2.pretty_name,'Object on side two') as role_two_pretty_name,
coalesce(role2.pretty_plural,'Objects on side two') as role_two_pretty_plural,
acs_object_type__pretty_name(rel.rel_type) as rel_type_pretty_name
- from acs_rel_types rel, acs_rel_roles role1, acs_rel_roles role2
+ from acs_rel_types rel
+ left outer join acs_rel_roles role1 on (rel.role_one = role1.role)
+ left outer join acs_rel_roles role2 on (rel.role_two = role2.role)
where rel.rel_type = :rel_type
- and rel.role_one = role1.role(+)
- and rel.role_two = role2.role(+)
-
-
- FIX ME OUTER JOIN
-
- select role1.role as role_one,
- coalesce(role1.pretty_name,'Object on side one') as role_one_pretty_name,
- coalesce(role1.pretty_plural,'Objects on side one') as role_one_pretty_plural,
- role2.role as role_two,
- coalesce(role2.pretty_name,'Object on side two') as role_two_pretty_name,
- coalesce(role2.pretty_plural,'Objects on side two') as role_two_pretty_plural,
- acs_object_type__pretty_name(rel.rel_type) as rel_type_pretty_name
- from acs_rel_types rel, acs_rel_roles role1, acs_rel_roles role2
- where rel.rel_type = :rel_type
- and rel.role_one = role1.role(+)
- and rel.role_two = role2.role(+)
-
-
-
-
-