Index: openacs-4/packages/acs-authentication/sql/oracle/batch-job-tables-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/sql/oracle/batch-job-tables-create.sql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-authentication/sql/oracle/batch-job-tables-create.sql 16 Sep 2003 13:07:42 -0000 1.6 +++ openacs-4/packages/acs-authentication/sql/oracle/batch-job-tables-create.sql 26 Sep 2006 14:50:45 -0000 1.7 @@ -2,7 +2,7 @@ create table auth_batch_jobs ( job_id integer - constraint auth_batch_jobs_pk + constraint auth_batch_jobs_job_id_pk primary key, job_start_time date default sysdate, job_end_time date, Index: openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql,v diff -u -r1.25 -r1.26 --- openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql 4 Jun 2006 00:45:22 -0000 1.25 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql 26 Sep 2006 14:55:28 -0000 1.26 @@ -102,12 +102,12 @@ constraint cr_locale_abbrev_pk primary key, label varchar2(200) - constraint cr_locale_name_nil + constraint cr_locale_name_nn not null - constraint cr_locale_name_unq + constraint cr_locale_name_un unique, nls_language varchar2(30) - constraint cr_locale_nls_lang_nil + constraint cr_locale_nls_lang_nn not null, nls_territory varchar2(30), nls_charset varchar2(30) @@ -191,23 +191,23 @@ constraint cr_items_parent_id_fk references acs_objects on delete cascade, name varchar2(400) - constraint cr_items_name_nil + constraint cr_items_name_nn not null, locale varchar2(4) constraint cr_items_locale_fk references cr_locales, live_revision integer, latest_revision integer, publish_status varchar2(40) - constraint cr_items_pub_status_chk + constraint cr_items_pub_status_ck check (publish_status in ('production', 'ready', 'live', 'expired') ), content_type varchar2(100) constraint cr_items_rev_type_fk references acs_object_types, storage_type varchar2(10) default 'lob' not null - constraint cr_items_storage_type + constraint cr_items_storage_type_ck check (storage_type in ('lob','file')), storage_area_key varchar2(100) default 'CR_FILES' not null ); @@ -262,10 +262,10 @@ constraint cr_child_rels_rel_fk references acs_objects, parent_id integer - constraint cr_child_rels_parent_nil + constraint cr_child_rels_parent_nn not null, child_id integer - constraint cr_child_rels_child_nil + constraint cr_child_rels_child_nn not null, relation_tag varchar2(100), order_n integer @@ -290,7 +290,7 @@ constraint cr_item_rels_item_fk references cr_items, related_object_id integer - constraint cr_item_rels_rel_obj__fk + constraint cr_item_rels_rel_obj_fk references acs_objects, relation_tag varchar2(100), order_n integer @@ -330,15 +330,15 @@ revision_id constraint cr_revisions_rev_id_fk references acs_objects (object_id) on delete cascade constraint cr_revisions_pk primary key, - item_id constraint cr_revisions_item_id_nil + item_id constraint cr_revisions_item_id_nn not null constraint cr_revisions_item_id_fk references cr_items on delete cascade, title varchar2(1000), description varchar2(4000), publish_date date, mime_type varchar2(200) default 'text/plain' - constraint cr_revisions_mime_type_ref + constraint cr_revisions_mime_type_fk references cr_mime_types, nls_language varchar2(50), filename varchar2(4000), @@ -387,7 +387,9 @@ '; create global temporary table cr_content_text ( - revision_id integer primary key, + revision_id integer + constraint cr_content_text_revision_id_pk + primary key, content CLOB ) on commit delete rows; @@ -414,7 +416,7 @@ old_status varchar2(40), new_status varchar2(40), publish_date date - constraint cr_item_publish_audit_date_nil + constraint cr_item_publish_audit_date_nn not null ); @@ -473,11 +475,11 @@ description varchar2(4000), has_child_folders char(1) default 'f' - constraint cr_folder_child_chk + constraint cr_folder_child_ck check (has_child_folders in ('t','f')), has_child_symlinks char(1) default 'f' - constraint cr_folder_symlink_chk + constraint cr_folder_symlink_ck check (has_child_symlinks in ('t', 'f')), package_id integer constraint cr_fldr_pkg_id_fk references apm_packages @@ -548,13 +550,13 @@ content_type varchar2(100) constraint cr_type_template_map_typ_fk references acs_object_types - constraint cr_type_template_map_typ_nil + constraint cr_type_template_map_typ_nn not null, template_id integer constraint cr_type_template_map_tmpl_fk references cr_templates, use_context varchar2(100) - constraint cr_type_template_map_ctx_nil + constraint cr_type_template_map_ctx_nn not null constraint cr_type_template_map_ctx_fk references cr_template_use_contexts, @@ -587,15 +589,15 @@ item_id integer constraint cr_item_template_map_item_fk references cr_items - constraint cr_item_template_map_item_nil + constraint cr_item_template_map_item_nn not null, template_id integer constraint cr_item_template_map_tmpl_fk references cr_templates constraint cr_item_template_map_tmpl_nil not null, use_context varchar2(100) - constraint cr_item_template_map_ctx_nil + constraint cr_item_template_map_ctx_nn not null constraint cr_item_template_map_ctx_fk references cr_template_use_contexts, @@ -624,7 +626,7 @@ target_id integer constraint cr_symlink_target_id_fk references cr_items - constraint cr_symlink_target_id_nil + constraint cr_symlink_target_id_nn not null, label varchar2(1000) ); @@ -646,10 +648,10 @@ constraint cr_extlinks_pk primary key, url varchar2(1000) - constraint cr_extlink_url_nil + constraint cr_extlink_url_nn not null, label varchar2(1000) - constraint cr_extlink_label_nil + constraint cr_extlink_label_nn not null, description varchar2(4000) ); @@ -668,14 +670,14 @@ constraint cr_keywords_pk primary key, parent_id integer - constraint cr_keywords_hier + constraint cr_keywords_fk references cr_keywords, heading varchar2(600) - constraint cr_keywords_name_nil + constraint cr_keywords_name_nn not null, description varchar2(4000), has_children char(1) - constraint cr_keywords_child_chk + constraint cr_keywords_child_ck check (has_children in ('t', 'f')) ); @@ -703,12 +705,12 @@ item_id integer constraint cr_item_keyword_map_item_fk references cr_items - constraint cr_item_keyword_map_item_nil + constraint cr_item_keyword_map_item_nn not null, keyword_id integer constraint cr_item_keyword_map_kw_fk references cr_keywords - constraint cr_item_keyword_map_kw_nil + constraint cr_item_keyword_map_kw_nn not null, constraint cr_item_keyword_map_pk primary key (item_id, keyword_id) Index: openacs-4/packages/acs-content-repository/sql/oracle/content-image.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-image.sql,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-content-repository/sql/oracle/content-image.sql 4 Jun 2006 00:45:22 -0000 1.11 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-image.sql 26 Sep 2006 14:55:28 -0000 1.12 @@ -16,7 +16,7 @@ image_id integer constraint images_image_id_fk references cr_revisions - constraint images_pk + constraint images_image_id_pk primary key, width integer, height integer Index: openacs-4/packages/acs-content-repository/sql/oracle/content-xml.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-xml.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-content-repository/sql/oracle/content-xml.sql 24 Mar 2001 22:00:48 -0000 1.1 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-xml.sql 26 Sep 2006 14:55:28 -0000 1.2 @@ -16,7 +16,8 @@ create sequence cr_xml_doc_seq; create global temporary table cr_xml_docs ( - doc_id integer primary key, + doc_id integer + constraint cr_xml_docs_doc_id_pk primary key, doc CLOB ) on commit delete rows; Index: openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql,v diff -u -r1.19 -r1.20 --- openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql 18 Aug 2006 18:17:49 -0000 1.19 +++ openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql 26 Sep 2006 14:48:02 -0000 1.20 @@ -8,10 +8,10 @@ create table acs_magic_objects ( name varchar2(100) - constraint acs_magic_objects_name_pk primary key, - object_id constraint acs_magic_objects_object_id_nn not null - constraint acs_magic_objects_object_id_fk - references acs_objects(object_id) + constraint acs_magic_objects_name_pk primary key, + object_id constraint acs_magic_objects_object_id_nn not null + constraint acs_magic_objects_object_id_fk + references acs_objects(object_id) ); create index acs_mo_object_id_idx on acs_magic_objects (object_id); Index: openacs-4/packages/acs-kernel/sql/oracle/acs-permissions-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-permissions-create.sql,v diff -u -r1.10 -r1.11 --- openacs-4/packages/acs-kernel/sql/oracle/acs-permissions-create.sql 18 Aug 2006 18:17:49 -0000 1.10 +++ openacs-4/packages/acs-kernel/sql/oracle/acs-permissions-create.sql 26 Sep 2006 14:48:02 -0000 1.11 @@ -139,6 +139,7 @@ ------------------------------------ create table acs_permissions ( + constraint acs_permissions_object_id_fk object_id integer constraint acs_permissions_object_id_nn not null constraint acs_permissions_object_id_fk 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.10 -r1.11 --- openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql 18 Aug 2006 18:17:49 -0000 1.10 +++ openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql 26 Sep 2006 14:48:02 -0000 1.11 @@ -348,11 +348,11 @@ constraint acs_data_links_rel_id_nn not null constraint acs_data_links_rel_id_pk primary key, object_id_one integer not null - constraint acs_data_links_one_fk + constraint acs_data_links_obj_one_fk references acs_objects (object_id) on delete cascade, object_id_two integer not null - constraint acs_data_links_two_fk + constraint acs_data_links_obj_two_fk references acs_objects (object_id) on delete cascade, constraint acs_data_links_un unique Index: openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql,v diff -u -r1.37 -r1.38 --- openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql 18 Aug 2006 18:17:49 -0000 1.37 +++ openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql 26 Sep 2006 14:48:02 -0000 1.38 @@ -18,15 +18,15 @@ create table apm_package_types ( package_key varchar2(100) - constraint apm_package_types_p_key_pk primary key, + constraint apm_package_types_pkg_key_pk primary key, pretty_name varchar(100) constraint apm_package_types_pretty_n_nn not null constraint apm_package_types_pretty_n_un unique, pretty_plural varchar2(100) constraint apm_package_types_pretty_pl_un unique, package_uri varchar2(1500) - constraint apm_packages_types_p_uri_nn not null - constraint apm_packages_types_p_uri_un unique, + constraint apm_packages_types_pkg_uri_nn not null + constraint apm_packages_types_pkg_uri_un unique, package_type varchar2(300) constraint apm_packages_pack_type_ck check (package_type in ('apm_application', 'apm_service')), Index: openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql,v diff -u -r1.12 -r1.13 --- openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql 1 Jul 2004 11:29:54 -0000 1.12 +++ openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql 26 Sep 2006 14:48:02 -0000 1.13 @@ -12,13 +12,13 @@ create table auth_authorities ( authority_id integer - constraint auth_authorities_pk + constraint auth_authorities_auth_id_pk primary key constraint auth_authorities_aid_fk references acs_objects(object_id) on delete cascade, short_name varchar2(255) - constraint auth_authority_short_name_un + constraint auth_authorities_short_name_un unique, pretty_name varchar2(4000), help_contact_text varchar2(4000), @@ -105,10 +105,10 @@ constraint auth_driver_params_aid_nn not null, impl_id integer - constraint auth_driver_params_iid_fk + constraint auth_driver_params_impl_id_fk -- Cannot reference acs_sc_impls table as it doesn't exist yet references acs_objects(object_id) - constraint auth_driver_params_iid_nn + constraint auth_driver_params_impl_id_nn not null, key varchar2(200), value clob, Index: openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql,v diff -u -r1.14 -r1.15 --- openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql 18 Aug 2006 18:17:49 -0000 1.14 +++ openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql 26 Sep 2006 14:48:02 -0000 1.15 @@ -523,9 +523,9 @@ 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, authority_id integer - constraint users_auth_authorities_fk + constraint users_authority_id_fk references auth_authorities(authority_id), username varchar2(100) constraint users_username_nn @@ -561,9 +561,9 @@ create index users_email_verified_idx on users (email_verified_p); create table user_preferences ( - user_id constraint user_prefs_user_id_fk + user_id constraint user_preferences_user_id_fk references users (user_id) - constraint user_preferences_pk + constraint user_preferences_user_id_pk primary key, prefer_text_only_p char(1) default 'f' constraint user_prefs_pref_txt_only_p_ck Index: openacs-4/packages/acs-kernel/sql/oracle/journal-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/journal-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-kernel/sql/oracle/journal-create.sql 12 Mar 2004 18:48:49 -0000 1.5 +++ openacs-4/packages/acs-kernel/sql/oracle/journal-create.sql 26 Sep 2006 14:48:02 -0000 1.6 @@ -30,10 +30,10 @@ create table journal_entries ( journal_id constraint journal_entries_journal_id_fk references acs_objects (object_id) - constraint journal_entries_pk + constraint journal_entries_journal_id_pk primary key, object_id integer - constraint journal_entries_object_fk + constraint journal_entries_object_id_fk references acs_objects on delete cascade, action varchar2(100), action_pretty varchar2(4000), Index: openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-create.sql 18 Aug 2006 18:17:49 -0000 1.3 +++ openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-create.sql 26 Sep 2006 14:48:02 -0000 1.4 @@ -34,9 +34,9 @@ create table rel_constraints ( constraint_id integer - constraint rel_constraints_pk + constraint rel_constraints_constraint_id_pk primary key - constraint rc_constraint_id_fk + constraint rel_constraints_constraint_id_fk references acs_objects(object_id), constraint_name varchar(100) constraint rc_constraint_name_nn not null, Index: openacs-4/packages/acs-kernel/sql/oracle/security-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/security-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-kernel/sql/oracle/security-create.sql 29 Dec 2001 01:48:32 -0000 1.3 +++ openacs-4/packages/acs-kernel/sql/oracle/security-create.sql 26 Sep 2006 14:48:02 -0000 1.4 @@ -29,7 +29,7 @@ last_hit integer constraint sec_session_date_nn not null, - primary key(session_id, module, property_name) + constraint sec_session_prop_pk primary key(session_id, module, property_name) ) nologging storage ( initial 50m next 50m Index: openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.2.0b9-5.2.0b10.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.2.0b9-5.2.0b10.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.2.0b9-5.2.0b10.sql 4 Jun 2006 00:45:38 -0000 1.2 +++ openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.2.0b9-5.2.0b10.sql 26 Sep 2006 14:48:02 -0000 1.3 @@ -6,7 +6,7 @@ create table acs_data_links ( rel_id integer not null - constraint acs_data_links_pk primary key, + constraint acs_data_links_rel_id_pk primary key, object_id_one integer not null constraint acs_data_links_one_fk references acs_objects (object_id)