Index: openacs-4/packages/acs-admin/www/users/one-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one-oracle.xql,v
diff -u -N
--- openacs-4/packages/acs-admin/www/users/one-oracle.xql 22 Nov 2017 14:24:37 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-
-
-
- oracle8.1.6
-
-
-
- select at.pretty_name, at.pretty_plural, a.creation_date, acs_object.name(a.object_id) object_name
-from acs_objects a, acs_object_types at
-where a.object_type = at.object_type
-and a.creation_user = :user_id
-order by pretty_name, creation_date desc, object_name
-
-
-
-
Index: openacs-4/packages/acs-admin/www/users/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-admin/www/users/one-postgresql.xql 30 Jan 2004 09:54:03 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-
-
-
- postgresql7.1
-
-
-
- select at.pretty_name, at.pretty_plural, to_char(a.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date,
- acs_object__name(a.object_id) as object_name
- from acs_objects a, acs_object_types at
- where a.object_type = at.object_type
- and a.creation_user = :user_id
- order by pretty_name, creation_date desc, object_name
-
-
-
-
-
Index: openacs-4/packages/acs-admin/www/users/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.tcl,v
diff -u -N -r1.20.2.2 -r1.20.2.3
--- openacs-4/packages/acs-admin/www/users/one.tcl 8 Apr 2019 12:58:18 -0000 1.20.2.2
+++ openacs-4/packages/acs-admin/www/users/one.tcl 3 Sep 2019 10:56:57 -0000 1.20.2.3
@@ -63,7 +63,16 @@
# XXX Make sure to make the following into links and this looks okay
-db_multirow user_contributions user_contributions {}
+db_multirow user_contributions user_contributions {
+ select at.pretty_name,
+ at.pretty_plural,
+ to_char(a.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date,
+ acs_object.name(a.object_id) as object_name
+ from acs_objects a, acs_object_types at
+ where a.object_type = at.object_type
+ and a.creation_user = :user_id
+ order by pretty_name, creation_date desc, object_name
+}
# cro@ncacasi.org 2002-02-20
# Boy is this query wacked, but I think I am starting to understand
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new-oracle.xql,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new-oracle.xql 20 Jun 2018 09:06:10 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new-oracle.xql 3 Sep 2019 11:01:43 -0000 1.2.2.1
@@ -19,20 +19,4 @@
-
-
-
-
- select viol.rel_id, acs_object.name(viol.party_id) as name
- from rel_constraints_violated_one viol
- where viol.constraint_id = :constraint_id
- UNION ALL
- select viol.rel_id, acs_object.name(viol.party_id) as name
- from rel_constraints_violated_two viol
- where viol.constraint_id = :constraint_id
-
-
-
-
-
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new-postgresql.xql,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new-postgresql.xql 20 Jun 2018 09:06:10 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new-postgresql.xql 3 Sep 2019 11:01:43 -0000 1.3.2.1
@@ -21,20 +21,4 @@
-
-
-
-
- select viol.rel_id, acs_object__name(viol.party_id) as name
- from rel_constraints_violated_one viol
- where viol.constraint_id = :constraint_id
- UNION ALL
- select viol.rel_id, acs_object__name(viol.party_id) as name
- from rel_constraints_violated_two viol
- where viol.constraint_id = :constraint_id
-
-
-
-
-
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl,v
diff -u -N -r1.9 -r1.9.2.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl 20 Jun 2018 09:06:10 -0000 1.9
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl 3 Sep 2019 11:01:43 -0000 1.9.2.1
@@ -117,7 +117,15 @@
# check for violations
template::multirow create violations rel_id name
- db_foreach select_violated_rels {} {
+ db_foreach select_violated_rels {
+ select viol.rel_id, acs_object.name(viol.party_id) as name
+ from rel_constraints_violated_one viol
+ where viol.constraint_id = :constraint_id
+ UNION ALL
+ select viol.rel_id, acs_object.name(viol.party_id) as name
+ from rel_constraints_violated_two viol
+ where viol.constraint_id = :constraint_id
+ } {
template::multirow append violations $rel_id $name
incr ctr
}