Index: openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql,v diff -u -r1.12 -r1.13 --- openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql 4 Jan 2010 19:54:37 -0000 1.12 +++ openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql 5 Jan 2010 15:30:26 -0000 1.13 @@ -355,15 +355,16 @@ constraint acs_data_links_obj_two_fk references acs_objects (object_id) on delete cascade, - relation_tag varchar2(100), - constraint acs_data_links_un unique - (object_id_one, object_id_two, relation_tag) + relation_tag varchar2(100) ); create index acs_data_links_id_one_idx on acs_data_links (object_id_one); create index acs_data_links_id_two_idx on acs_data_links (object_id_two); create index acs_data_links_rel_tag_idx on acs_data_links (relation_tag); +create unique index acs_data_links_un on acs_data_links ( + object_id_one, object_id_two, relation_tag +); -------------- -- TRIGGERS -- Index: openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.6.0d3-5.6.0d4.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.6.0d3-5.6.0d4.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.6.0d3-5.6.0d4.sql 4 Jan 2010 19:54:37 -0000 1.1 +++ openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.6.0d3-5.6.0d4.sql 5 Jan 2010 15:30:26 -0000 1.2 @@ -1,9 +1,9 @@ alter table acs_data_links add relation_tag varchar2(100); -drop index acs_data_links_un; +create index acs_data_links_rel_tag_idx on acs_data_links (relation_tag); +alter table acs_data_links drop constraint acs_data_links_un; + create unique index acs_data_links_un on acs_data_links ( object_id_one, object_id_two, relation_tag -); - -create index acs_data_links_rel_tag_idx on acs_data_links (relation_tag); \ No newline at end of file +); \ No newline at end of file Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql,v diff -u -r1.28 -r1.29 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql 4 Jan 2010 19:54:37 -0000 1.28 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql 5 Jan 2010 15:30:26 -0000 1.29 @@ -378,15 +378,17 @@ constraint acs_data_links_obj_two_fk references acs_objects (object_id) on delete cascade, - relation_tag varchar(100), - constraint acs_data_links_un unique - (object_id_one, object_id_two, relation_tag) + relation_tag varchar(100) ); create index acs_data_links_id_one_idx on acs_data_links (object_id_one); create index acs_data_links_id_two_idx on acs_data_links (object_id_two); create index acs_data_links_rel_tag_idx on acs_data_links (relation_tag); +create unique index acs_data_links_un on acs_data_links ( + object_id_one, object_id_two, relation_tag +); + -------------- -- TRIGGERS -- -------------- Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0d3-5.6.0d4.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0d3-5.6.0d4.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0d3-5.6.0d4.sql 4 Jan 2010 19:54:37 -0000 1.1 +++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0d3-5.6.0d4.sql 5 Jan 2010 15:30:26 -0000 1.2 @@ -1,9 +1,9 @@ alter table acs_data_links add column relation_tag varchar(100); -drop index acs_data_links_un; +create index acs_data_links_rel_tag_idx on acs_data_links (relation_tag); +alter table acs_data_links drop constraint acs_data_links_un; + create unique index acs_data_links_un on acs_data_links ( object_id_one, object_id_two, relation_tag -); - -create index acs_data_links_rel_tag_idx on acs_data_links (relation_tag); \ No newline at end of file +); \ No newline at end of file