Index: openacs-4/packages/acs-core-docs/www/parties.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/parties.html,v
diff -u -r1.43 -r1.44
--- openacs-4/packages/acs-core-docs/www/parties.html 5 Aug 2006 05:18:20 -0000 1.43
+++ openacs-4/packages/acs-core-docs/www/parties.html 25 Sep 2006 20:32:37 -0000 1.44
@@ -28,7 +28,7 @@
party_id not null
constraint parties_party_id_fk references
acs_objects (object_id)
- constraint parties_pk primary key,
+ constraint parties_party_id_pk primary key,
email varchar(100)
constraint parties_email_un unique,
url varchar(200)
@@ -55,7 +55,7 @@
person_id not null
constraint persons_person_id_fk
references parties (party_id)
- constraint persons_pk primary key,
+ constraint persons_person_id_pk primary key,
first_names varchar(100) not null,
last_name varchar(100) not null
);
@@ -84,7 +84,7 @@
user_id not null
constraint users_user_id_fk
references persons (person_id)
- constraint users_pk primary key,
+ constraint users_user_id_pk primary key,
password varchar(100),
salt varchar(100),
screen_name varchar(100)
@@ -117,7 +117,7 @@
group_id not null
constraint groups_group_id_fk
references parties (party_id)
- constraint groups_pk primary key,
+ constraint groups_group_id_pk primary key,
group_name varchar(100) not null
);
Index: openacs-4/packages/acs-core-docs/www/permissions-tediously-explained.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/permissions-tediously-explained.html,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/acs-core-docs/www/permissions-tediously-explained.html 5 Aug 2006 05:18:20 -0000 1.39
+++ openacs-4/packages/acs-core-docs/www/permissions-tediously-explained.html 25 Sep 2006 20:32:37 -0000 1.40
@@ -338,7 +338,7 @@
party_id
not null
constraint parties_party_id_fk references acs_objects (object_id)
- constraint parties_pk primary key,
+ constraint parties_party_id_pk primary key,
email varchar2(100)
constraint parties_email_un unique,
url varchar2(200)
@@ -348,7 +348,7 @@
person_id
not null
constraint persons_person_id_fk references parties (party_id)
- constraint persons_pk primary key,
+ constraint persons_person_id_pk primary key,
first_names varchar2(100)
not null,
last_name varchar2(100)
@@ -359,7 +359,7 @@
user_id
not null
constraint users_user_id_fk references persons (person_id)
- constraint users_pk primary key,
+ constraint users_user_id_pk primary key,
password char(40),
-- other attributes
);
@@ -368,7 +368,7 @@
group_id
not null
constraint groups_group_id_fk references parties (party_id)
- constraint groups_pk primary key,
+ constraint groups_group_id_pk primary key,
group_name varchar2(100) not null
);
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/parties.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/parties.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/parties.xml 5 Aug 2006 05:18:21 -0000 1.8
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/parties.xml 25 Sep 2006 20:32:37 -0000 1.9
@@ -62,7 +62,7 @@
party_id not null
constraint parties_party_id_fk references
acs_objects (object_id)
- constraint parties_pk primary key,
+ constraint parties_party_id_pk primary key,
email varchar(100)
constraint parties_email_un unique,
url varchar(200)
@@ -100,7 +100,7 @@
person_id not null
constraint persons_person_id_fk
references parties (party_id)
- constraint persons_pk primary key,
+ constraint persons_person_id_pk primary key,
first_names varchar(100) not null,
last_name varchar(100) not null
);
@@ -140,7 +140,7 @@
user_id not null
constraint users_user_id_fk
references persons (person_id)
- constraint users_pk primary key,
+ constraint users_user_id_pk primary key,
password varchar(100),
salt varchar(100),
screen_name varchar(100)
@@ -182,7 +182,7 @@
group_id not null
constraint groups_group_id_fk
references parties (party_id)
- constraint groups_pk primary key,
+ constraint groups_group_id_pk primary key,
group_name varchar(100) not null
);
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained-es.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained-es.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained-es.xml 17 Jul 2006 05:38:37 -0000 1.2
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained-es.xml 25 Sep 2006 20:32:37 -0000 1.3
@@ -420,7 +420,7 @@
party_id
not null
constraint parties_party_id_fk references acs_objects (object_id)
- constraint parties_pk primary key,
+ constraint parties_party_id_pk primary key,
email varchar2(100)
constraint parties_email_un unique,
url varchar2(200)
@@ -432,7 +432,7 @@
person_id
not null
constraint persons_person_id_fk references parties (party_id)
- constraint persons_pk primary key,
+ constraint persons_person_id_pk primary key,
first_names varchar2(100)
not null,
last_name varchar2(100)
@@ -445,7 +445,7 @@
user_id
not null
constraint users_user_id_fk references persons (person_id)
- constraint users_pk primary key,
+ constraint users_user_id_pk primary key,
password char(40),
-- other attributes
);
@@ -456,7 +456,7 @@
group_id
not null
constraint groups_group_id_fk references parties (party_id)
- constraint groups_pk primary key,
+ constraint groups_group_id_pk primary key,
group_name varchar2(100) not null
);
@@ -535,8 +535,8 @@
create table composition_rels (
rel_id
- constraint composition_rel_rel_id_fk references (rel_id)
- constraint composition_rel_rel_id_pk primary key
+ constraint composition_rels_rel_id_fk references (rel_id)
+ constraint composition_rels_rel_id_pk primary key
);
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained.xml 5 Aug 2006 05:18:21 -0000 1.7
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained.xml 25 Sep 2006 20:32:37 -0000 1.8
@@ -912,8 +912,8 @@
create table composition_rels (
rel_id
- constraint composition_rel_rel_id_fk references (rel_id)
- constraint composition_rel_rel_id_pk primary key
+ constraint composition_rels_rel_id_fk references (rel_id)
+ constraint composition_rels_rel_id_pk primary key
);
Index: openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql 24 Jun 2006 07:04:20 -0000 1.27
+++ openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql 25 Sep 2006 20:41:12 -0000 1.28
@@ -17,22 +17,22 @@
create table ad_locales (
locale varchar(30)
- constraint ad_locale_abbrev_pk
+ constraint ad_locales_locale_pk
primary key,
language char(3)
- constraint ad_language_name_nil
+ constraint ad_locales_language_nn
not null,
country char(2)
- constraint ad_country_name_nil
+ constraint ad_locales_country_nn
not null,
variant varchar(30),
label varchar(200)
- constraint ad_locale_name_nil
+ constraint ad_locales_label_nn
not null
- constraint ad_locale_name_unq
+ constraint ad_locales_label_un
unique,
nls_language varchar(30)
- constraint ad_locale_nls_lang_nil
+ constraint ad_locale_nls_lang_nn
not null,
nls_territory varchar(30),
nls_charset varchar(30),
@@ -67,7 +67,7 @@
constraint lang_package_l_u_package_id_fk
references apm_packages(package_id) on delete cascade,
locale varchar(30) not null
- constraint trb_language_preference_lid_fk
+ constraint ad_locale_user_prefs_locale_fk
references ad_locales (locale) on delete cascade
);
Index: openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql 26 Feb 2004 15:28:44 -0000 1.16
+++ openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql 25 Sep 2006 20:41:12 -0000 1.17
@@ -22,7 +22,7 @@
constraint lang_message_keys_message_key_nn
not null,
package_key varchar(100)
- constraint lang_message_keys_fk
+ constraint lang_message_keys_pkg_key_fk
references apm_package_types(package_key)
on delete cascade
constraint lang_message_keys_package_key_nn
@@ -55,7 +55,7 @@
default now()
not null,
creation_user integer
- constraint lang_messages_creation_u_fk
+ constraint lang_messages_creation_user_fk
references users (user_id),
constraint lang_messages_fk
foreign key (message_key, package_key)
@@ -76,7 +76,7 @@
constraint lang_messages_audit_p_key_nn
not null,
locale varchar(30)
- constraint lang_messages_audit_l_fk
+ constraint lang_messages_audit_locale_fk
references ad_locales(locale)
constraint lang_messages_audit_l_nn
not null,
@@ -111,7 +111,9 @@
-- ****************************************************************************
create table lang_translate_columns (
- column_id integer primary key,
+ column_id integer
+ constraint ltc_column_id_pk
+ primary key,
-- cant do references on user_tables cause oracle sucks
on_which_table varchar(50),
on_what_column varchar(50),
@@ -128,7 +130,7 @@
-- or add a row in the on_which_table table with the translated content.
--
short_p boolean,
- constraint ltc_u unique (on_which_table, on_what_column)
+ constraint ltc_un unique (on_which_table, on_what_column)
);
@@ -141,7 +143,7 @@
create table lang_translation_registry (
on_which_table varchar(50),
on_what_id integer not null,
- locale varchar(30) constraint ltr_locale_ref
+ locale varchar(30) constraint ltr_locale_fk
references ad_locales(locale),
--
-- should have dependency info here