diff --git a/config/sql/_all/h2-3.8-all.sql b/config/sql/_all/h2-3.8-all.sql index a591f6f18de..c36e766a2f2 100644 --- a/config/sql/_all/h2-3.8-all.sql +++ b/config/sql/_all/h2-3.8-all.sql @@ -33,6 +33,7 @@ create table m_object_ext_long (item_id integer not null, owner_oid varchar(36) create table m_object_ext_poly (item_id integer not null, owner_oid varchar(36) not null, ownerType integer not null, orig varchar(255) not null, norm varchar(255), primary key (owner_oid, ownerType, item_id, orig)); create table m_object_ext_reference (item_id integer not null, owner_oid varchar(36) not null, ownerType integer not null, targetoid varchar(36) not null, relation varchar(157), targetType integer, primary key (owner_oid, ownerType, item_id, targetoid)); create table m_object_ext_string (item_id integer not null, owner_oid varchar(36) not null, ownerType integer not null, stringValue varchar(255) not null, primary key (owner_oid, ownerType, item_id, stringValue)); +create table m_object_subtype (object_oid varchar(36) not null, subType varchar(255)); create table m_object_text_info (owner_oid varchar(36) not null, text varchar(255) not null, primary key (owner_oid, text)); create table m_operation_execution (id integer not null, owner_oid varchar(36) not null, initiatorRef_relation varchar(157), initiatorRef_targetOid varchar(36), initiatorRef_type integer, status integer, taskRef_relation varchar(157), taskRef_targetOid varchar(36), taskRef_type integer, timestampValue timestamp, primary key (id, owner_oid)); create table m_org_closure (ancestor_oid varchar(36) not null, descendant_oid varchar(36) not null, val integer, primary key (ancestor_oid, descendant_oid)); @@ -49,7 +50,7 @@ create table m_abstract_role (approvalProcess varchar(255), autoassign_enabled b create table m_case (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_connector (connectorBundle varchar(255), connectorHostRef_relation varchar(157), connectorHostRef_targetOid varchar(36), connectorHostRef_type integer, connectorType varchar(255), connectorVersion varchar(255), framework varchar(255), name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_connector_host (hostname varchar(255), name_norm varchar(255), name_orig varchar(255), port varchar(255), oid varchar(36) not null, primary key (oid)); -create table m_focus (administrativeStatus integer, archiveTimestamp timestamp, disableReason varchar(255), disableTimestamp timestamp, effectiveStatus integer, enableTimestamp timestamp, validFrom timestamp, validTo timestamp, validityChangeTimestamp timestamp, validityStatus integer, hasPhoto boolean default false not null, oid varchar(36) not null, primary key (oid)); +create table m_focus (administrativeStatus integer, archiveTimestamp timestamp, disableReason varchar(255), disableTimestamp timestamp, effectiveStatus integer, enableTimestamp timestamp, validFrom timestamp, validTo timestamp, validityChangeTimestamp timestamp, validityStatus integer, costCenter varchar(255), emailAddress varchar(255), hasPhoto boolean default false not null, locale varchar(255), locality_norm varchar(255), locality_orig varchar(255), preferredLanguage varchar(255), telephoneNumber varchar(255), timezone varchar(255), oid varchar(36) not null, primary key (oid)); create table m_form (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_function_library (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_generic_object (name_norm varchar(255), name_orig varchar(255), objectType varchar(255), oid varchar(36) not null, primary key (oid)); @@ -57,17 +58,17 @@ create table m_lookup_table (name_norm varchar(255), name_orig varchar(255), oid create table m_lookup_table_row (id integer not null, owner_oid varchar(36) not null, row_key varchar(255), label_norm varchar(255), label_orig varchar(255), lastChangeTimestamp timestamp, row_value varchar(255), primary key (id, owner_oid)); create table m_node (name_norm varchar(255), name_orig varchar(255), nodeIdentifier varchar(255), oid varchar(36) not null, primary key (oid)); create table m_object_template (name_norm varchar(255), name_orig varchar(255), type integer, oid varchar(36) not null, primary key (oid)); -create table m_org (costCenter varchar(255), displayOrder integer, locality_norm varchar(255), locality_orig varchar(255), name_norm varchar(255), name_orig varchar(255), tenant boolean, oid varchar(36) not null, primary key (oid)); +create table m_org (displayOrder integer, name_norm varchar(255), name_orig varchar(255), tenant boolean, oid varchar(36) not null, primary key (oid)); create table m_report (export integer, name_norm varchar(255), name_orig varchar(255), orientation integer, parent boolean, useHibernateSession boolean, oid varchar(36) not null, primary key (oid)); create table m_report_output (name_norm varchar(255), name_orig varchar(255), reportRef_relation varchar(157), reportRef_targetOid varchar(36), reportRef_type integer, oid varchar(36) not null, primary key (oid)); create table m_resource (administrativeState integer, connectorRef_relation varchar(157), connectorRef_targetOid varchar(36), connectorRef_type integer, name_norm varchar(255), name_orig varchar(255), o16_lastAvailabilityStatus integer, oid varchar(36) not null, primary key (oid)); create table m_role (name_norm varchar(255), name_orig varchar(255), roleType varchar(255), oid varchar(36) not null, primary key (oid)); create table m_security_policy (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_sequence (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); -create table m_service (displayOrder integer, locality_norm varchar(255), locality_orig varchar(255), name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); +create table m_service (displayOrder integer, name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_system_configuration (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_trigger (id integer not null, owner_oid varchar(36) not null, handlerUri varchar(255), timestampValue timestamp, primary key (id, owner_oid)); -create table m_user (additionalName_norm varchar(255), additionalName_orig varchar(255), costCenter varchar(255), emailAddress varchar(255), employeeNumber varchar(255), familyName_norm varchar(255), familyName_orig varchar(255), fullName_norm varchar(255), fullName_orig varchar(255), givenName_norm varchar(255), givenName_orig varchar(255), honorificPrefix_norm varchar(255), honorificPrefix_orig varchar(255), honorificSuffix_norm varchar(255), honorificSuffix_orig varchar(255), locale varchar(255), locality_norm varchar(255), locality_orig varchar(255), name_norm varchar(255), name_orig varchar(255), nickName_norm varchar(255), nickName_orig varchar(255), preferredLanguage varchar(255), status integer, telephoneNumber varchar(255), timezone varchar(255), title_norm varchar(255), title_orig varchar(255), oid varchar(36) not null, primary key (oid)); +create table m_user (additionalName_norm varchar(255), additionalName_orig varchar(255), employeeNumber varchar(255), familyName_norm varchar(255), familyName_orig varchar(255), fullName_norm varchar(255), fullName_orig varchar(255), givenName_norm varchar(255), givenName_orig varchar(255), honorificPrefix_norm varchar(255), honorificPrefix_orig varchar(255), honorificSuffix_norm varchar(255), honorificSuffix_orig varchar(255), name_norm varchar(255), name_orig varchar(255), nickName_norm varchar(255), nickName_orig varchar(255), title_norm varchar(255), title_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_value_policy (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); alter table m_acc_cert_campaign add constraint uc_acc_cert_campaign_name unique (name_norm); create index iCaseObjectRefTargetOid on m_acc_cert_case (objectRef_targetOid); @@ -135,6 +136,7 @@ alter table m_case add constraint uc_case_name unique (name_norm); alter table m_connector_host add constraint uc_connector_host_name unique (name_norm); create index iFocusAdministrative on m_focus (administrativeStatus); create index iFocusEffective on m_focus (effectiveStatus); +create index iLocality on m_focus (locality_orig); alter table m_form add constraint uc_form_name unique (name_norm); alter table m_function_library add constraint uc_function_library_name unique (name_norm); alter table m_generic_object add constraint uc_generic_object_name unique (name_norm); @@ -152,11 +154,10 @@ alter table m_security_policy add constraint uc_security_policy_name unique (nam alter table m_sequence add constraint uc_sequence_name unique (name_norm); alter table m_system_configuration add constraint uc_system_configuration_name unique (name_norm); create index iTriggerTimestamp on m_trigger (timestampValue); -create index iEmployeeNumber on m_user (employeeNumber); create index iFullName on m_user (fullName_orig); create index iFamilyName on m_user (familyName_orig); create index iGivenName on m_user (givenName_orig); -create index iLocality on m_user (locality_orig); +create index iEmployeeNumber on m_user (employeeNumber); alter table m_user add constraint uc_user_name unique (name_norm); alter table m_value_policy add constraint uc_value_policy_name unique (name_norm); alter table m_acc_cert_campaign add constraint fk_acc_cert_campaign foreign key (oid) references m_object; @@ -198,6 +199,7 @@ alter table m_object_ext_reference add constraint fk_o_ext_reference_owner forei alter table m_object_ext_reference add constraint fk_o_ext_reference_item foreign key (item_id) references m_ext_item; alter table m_object_ext_string add constraint fk_object_ext_string foreign key (owner_oid) references m_object; alter table m_object_ext_string add constraint fk_o_ext_string_item foreign key (item_id) references m_ext_item; +alter table m_object_subtype add constraint fk_object_subtype foreign key (object_oid) references m_object; alter table m_object_text_info add constraint fk_object_text_info_owner foreign key (owner_oid) references m_object; alter table m_operation_execution add constraint fk_op_exec_owner foreign key (owner_oid) references m_object; alter table m_org_closure add constraint fk_ancestor foreign key (ancestor_oid) references m_object; diff --git a/config/sql/_all/mysql-3.8-all.sql b/config/sql/_all/mysql-3.8-all.sql index 43e65c93c94..0ea0fc80184 100644 --- a/config/sql/_all/mysql-3.8-all.sql +++ b/config/sql/_all/mysql-3.8-all.sql @@ -31,6 +31,7 @@ create table m_object_ext_long (item_id integer not null, owner_oid varchar(36) create table m_object_ext_poly (item_id integer not null, owner_oid varchar(36) not null, ownerType integer not null, orig varchar(255) not null, norm varchar(255), primary key (owner_oid, ownerType, item_id, orig)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_object_ext_reference (item_id integer not null, owner_oid varchar(36) not null, ownerType integer not null, targetoid varchar(36) not null, relation varchar(157), targetType integer, primary key (owner_oid, ownerType, item_id, targetoid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_object_ext_string (item_id integer not null, owner_oid varchar(36) not null, ownerType integer not null, stringValue varchar(255) not null, primary key (owner_oid, ownerType, item_id, stringValue)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; +create table m_object_subtype (object_oid varchar(36) not null, subType varchar(255)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_object_text_info (owner_oid varchar(36) not null, text varchar(255) not null, primary key (owner_oid, text)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_operation_execution (id integer not null, owner_oid varchar(36) not null, initiatorRef_relation varchar(157), initiatorRef_targetOid varchar(36), initiatorRef_type integer, status integer, taskRef_relation varchar(157), taskRef_targetOid varchar(36), taskRef_type integer, timestampValue datetime(6), primary key (id, owner_oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_org_closure (ancestor_oid varchar(36) not null, descendant_oid varchar(36) not null, val integer, primary key (ancestor_oid, descendant_oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; @@ -47,7 +48,7 @@ create table m_abstract_role (approvalProcess varchar(255), autoassign_enabled b create table m_case (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_connector (connectorBundle varchar(255), connectorHostRef_relation varchar(157), connectorHostRef_targetOid varchar(36), connectorHostRef_type integer, connectorType varchar(255), connectorVersion varchar(255), framework varchar(255), name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_connector_host (hostname varchar(255), name_norm varchar(255), name_orig varchar(255), port varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; -create table m_focus (administrativeStatus integer, archiveTimestamp datetime(6), disableReason varchar(255), disableTimestamp datetime(6), effectiveStatus integer, enableTimestamp datetime(6), validFrom datetime(6), validTo datetime(6), validityChangeTimestamp datetime(6), validityStatus integer, hasPhoto bit default false not null, oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; +create table m_focus (administrativeStatus integer, archiveTimestamp datetime(6), disableReason varchar(255), disableTimestamp datetime(6), effectiveStatus integer, enableTimestamp datetime(6), validFrom datetime(6), validTo datetime(6), validityChangeTimestamp datetime(6), validityStatus integer, costCenter varchar(255), emailAddress varchar(255), hasPhoto bit default false not null, locale varchar(255), locality_norm varchar(255), locality_orig varchar(255), preferredLanguage varchar(255), telephoneNumber varchar(255), timezone varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_form (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_function_library (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_generic_object (name_norm varchar(255), name_orig varchar(255), objectType varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; @@ -55,17 +56,17 @@ create table m_lookup_table (name_norm varchar(255), name_orig varchar(255), oid create table m_lookup_table_row (id integer not null, owner_oid varchar(36) not null, row_key varchar(255), label_norm varchar(255), label_orig varchar(255), lastChangeTimestamp datetime(6), row_value varchar(255), primary key (id, owner_oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_node (name_norm varchar(255), name_orig varchar(255), nodeIdentifier varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_object_template (name_norm varchar(255), name_orig varchar(255), type integer, oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; -create table m_org (costCenter varchar(255), displayOrder integer, locality_norm varchar(255), locality_orig varchar(255), name_norm varchar(255), name_orig varchar(255), tenant bit, oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; +create table m_org (displayOrder integer, name_norm varchar(255), name_orig varchar(255), tenant bit, oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_report (export integer, name_norm varchar(255), name_orig varchar(255), orientation integer, parent bit, useHibernateSession bit, oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_report_output (name_norm varchar(255), name_orig varchar(255), reportRef_relation varchar(157), reportRef_targetOid varchar(36), reportRef_type integer, oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_resource (administrativeState integer, connectorRef_relation varchar(157), connectorRef_targetOid varchar(36), connectorRef_type integer, name_norm varchar(255), name_orig varchar(255), o16_lastAvailabilityStatus integer, oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_role (name_norm varchar(255), name_orig varchar(255), roleType varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_security_policy (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_sequence (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; -create table m_service (displayOrder integer, locality_norm varchar(255), locality_orig varchar(255), name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; +create table m_service (displayOrder integer, name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_system_configuration (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_trigger (id integer not null, owner_oid varchar(36) not null, handlerUri varchar(255), timestampValue datetime(6), primary key (id, owner_oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; -create table m_user (additionalName_norm varchar(255), additionalName_orig varchar(255), costCenter varchar(255), emailAddress varchar(255), employeeNumber varchar(255), familyName_norm varchar(255), familyName_orig varchar(255), fullName_norm varchar(255), fullName_orig varchar(255), givenName_norm varchar(255), givenName_orig varchar(255), honorificPrefix_norm varchar(255), honorificPrefix_orig varchar(255), honorificSuffix_norm varchar(255), honorificSuffix_orig varchar(255), locale varchar(255), locality_norm varchar(255), locality_orig varchar(255), name_norm varchar(255), name_orig varchar(255), nickName_norm varchar(255), nickName_orig varchar(255), preferredLanguage varchar(255), status integer, telephoneNumber varchar(255), timezone varchar(255), title_norm varchar(255), title_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; +create table m_user (additionalName_norm varchar(255), additionalName_orig varchar(255), employeeNumber varchar(255), familyName_norm varchar(255), familyName_orig varchar(255), fullName_norm varchar(255), fullName_orig varchar(255), givenName_norm varchar(255), givenName_orig varchar(255), honorificPrefix_norm varchar(255), honorificPrefix_orig varchar(255), honorificSuffix_norm varchar(255), honorificSuffix_orig varchar(255), name_norm varchar(255), name_orig varchar(255), nickName_norm varchar(255), nickName_orig varchar(255), title_norm varchar(255), title_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; create table m_value_policy (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin engine=InnoDB; alter table m_acc_cert_campaign add constraint uc_acc_cert_campaign_name unique (name_norm); create index iCaseObjectRefTargetOid on m_acc_cert_case (objectRef_targetOid); @@ -133,6 +134,7 @@ alter table m_case add constraint uc_case_name unique (name_norm); alter table m_connector_host add constraint uc_connector_host_name unique (name_norm); create index iFocusAdministrative on m_focus (administrativeStatus); create index iFocusEffective on m_focus (effectiveStatus); +create index iLocality on m_focus (locality_orig); alter table m_form add constraint uc_form_name unique (name_norm); alter table m_function_library add constraint uc_function_library_name unique (name_norm); alter table m_generic_object add constraint uc_generic_object_name unique (name_norm); @@ -150,11 +152,10 @@ alter table m_security_policy add constraint uc_security_policy_name unique (nam alter table m_sequence add constraint uc_sequence_name unique (name_norm); alter table m_system_configuration add constraint uc_system_configuration_name unique (name_norm); create index iTriggerTimestamp on m_trigger (timestampValue); -create index iEmployeeNumber on m_user (employeeNumber); create index iFullName on m_user (fullName_orig); create index iFamilyName on m_user (familyName_orig); create index iGivenName on m_user (givenName_orig); -create index iLocality on m_user (locality_orig); +create index iEmployeeNumber on m_user (employeeNumber); alter table m_user add constraint uc_user_name unique (name_norm); alter table m_value_policy add constraint uc_value_policy_name unique (name_norm); alter table m_acc_cert_campaign add constraint fk_acc_cert_campaign foreign key (oid) references m_object (oid); @@ -196,6 +197,7 @@ alter table m_object_ext_reference add constraint fk_o_ext_reference_owner forei alter table m_object_ext_reference add constraint fk_o_ext_reference_item foreign key (item_id) references m_ext_item (id); alter table m_object_ext_string add constraint fk_object_ext_string foreign key (owner_oid) references m_object (oid); alter table m_object_ext_string add constraint fk_o_ext_string_item foreign key (item_id) references m_ext_item (id); +alter table m_object_subtype add constraint fk_object_subtype foreign key (object_oid) references m_object (oid); alter table m_object_text_info add constraint fk_object_text_info_owner foreign key (owner_oid) references m_object (oid); alter table m_operation_execution add constraint fk_op_exec_owner foreign key (owner_oid) references m_object (oid); alter table m_org_closure add constraint fk_ancestor foreign key (ancestor_oid) references m_object (oid); diff --git a/config/sql/_all/oracle-3.8-all.sql b/config/sql/_all/oracle-3.8-all.sql index 9ca2b1b837b..ccfaf263615 100644 --- a/config/sql/_all/oracle-3.8-all.sql +++ b/config/sql/_all/oracle-3.8-all.sql @@ -29,6 +29,7 @@ create table m_object_ext_long (item_id number(10,0) not null, owner_oid varchar create table m_object_ext_poly (item_id number(10,0) not null, owner_oid varchar2(36 char) not null, ownerType number(10,0) not null, orig varchar2(255 char) not null, norm varchar2(255 char), primary key (owner_oid, ownerType, item_id, orig)) initrans 30; create table m_object_ext_reference (item_id number(10,0) not null, owner_oid varchar2(36 char) not null, ownerType number(10,0) not null, targetoid varchar2(36 char) not null, relation varchar2(157 char), targetType number(10,0), primary key (owner_oid, ownerType, item_id, targetoid)) initrans 30; create table m_object_ext_string (item_id number(10,0) not null, owner_oid varchar2(36 char) not null, ownerType number(10,0) not null, stringValue varchar2(255 char) not null, primary key (owner_oid, ownerType, item_id, stringValue)) initrans 30; +create table m_object_subtype (object_oid varchar2(36 char) not null, subType varchar2(255 char)) initrans 30; create table m_object_text_info (owner_oid varchar2(36 char) not null, text varchar2(255 char) not null, primary key (owner_oid, text)) initrans 30; create table m_operation_execution (id number(10,0) not null, owner_oid varchar2(36 char) not null, initiatorRef_relation varchar2(157 char), initiatorRef_targetOid varchar2(36 char), initiatorRef_type number(10,0), status number(10,0), taskRef_relation varchar2(157 char), taskRef_targetOid varchar2(36 char), taskRef_type number(10,0), timestampValue timestamp, primary key (id, owner_oid)) initrans 30; create table m_org_closure (ancestor_oid varchar2(36 char) not null, descendant_oid varchar2(36 char) not null, val number(10,0), primary key (ancestor_oid, descendant_oid)) initrans 30; @@ -45,7 +46,7 @@ create table m_abstract_role (approvalProcess varchar2(255 char), autoassign_ena create table m_case (name_norm varchar2(255 char), name_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_connector (connectorBundle varchar2(255 char), connectorHostRef_relation varchar2(157 char), connectorHostRef_targetOid varchar2(36 char), connectorHostRef_type number(10,0), connectorType varchar2(255 char), connectorVersion varchar2(255 char), framework varchar2(255 char), name_norm varchar2(255 char), name_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_connector_host (hostname varchar2(255 char), name_norm varchar2(255 char), name_orig varchar2(255 char), port varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; -create table m_focus (administrativeStatus number(10,0), archiveTimestamp timestamp, disableReason varchar2(255 char), disableTimestamp timestamp, effectiveStatus number(10,0), enableTimestamp timestamp, validFrom timestamp, validTo timestamp, validityChangeTimestamp timestamp, validityStatus number(10,0), hasPhoto number(1,0) default false not null, oid varchar2(36 char) not null, primary key (oid)) initrans 30; +create table m_focus (administrativeStatus number(10,0), archiveTimestamp timestamp, disableReason varchar2(255 char), disableTimestamp timestamp, effectiveStatus number(10,0), enableTimestamp timestamp, validFrom timestamp, validTo timestamp, validityChangeTimestamp timestamp, validityStatus number(10,0), costCenter varchar2(255 char), emailAddress varchar2(255 char), hasPhoto number(1,0) default false not null, locale varchar2(255 char), locality_norm varchar2(255 char), locality_orig varchar2(255 char), preferredLanguage varchar2(255 char), telephoneNumber varchar2(255 char), timezone varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_form (name_norm varchar2(255 char), name_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_function_library (name_norm varchar2(255 char), name_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_generic_object (name_norm varchar2(255 char), name_orig varchar2(255 char), objectType varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; @@ -53,17 +54,17 @@ create table m_lookup_table (name_norm varchar2(255 char), name_orig varchar2(25 create table m_lookup_table_row (id number(10,0) not null, owner_oid varchar2(36 char) not null, row_key varchar2(255 char), label_norm varchar2(255 char), label_orig varchar2(255 char), lastChangeTimestamp timestamp, row_value varchar2(255 char), primary key (id, owner_oid)) initrans 30; create table m_node (name_norm varchar2(255 char), name_orig varchar2(255 char), nodeIdentifier varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_object_template (name_norm varchar2(255 char), name_orig varchar2(255 char), type number(10,0), oid varchar2(36 char) not null, primary key (oid)) initrans 30; -create table m_org (costCenter varchar2(255 char), displayOrder number(10,0), locality_norm varchar2(255 char), locality_orig varchar2(255 char), name_norm varchar2(255 char), name_orig varchar2(255 char), tenant number(1,0), oid varchar2(36 char) not null, primary key (oid)) initrans 30; +create table m_org (displayOrder number(10,0), name_norm varchar2(255 char), name_orig varchar2(255 char), tenant number(1,0), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_report (export number(10,0), name_norm varchar2(255 char), name_orig varchar2(255 char), orientation number(10,0), parent number(1,0), useHibernateSession number(1,0), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_report_output (name_norm varchar2(255 char), name_orig varchar2(255 char), reportRef_relation varchar2(157 char), reportRef_targetOid varchar2(36 char), reportRef_type number(10,0), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_resource (administrativeState number(10,0), connectorRef_relation varchar2(157 char), connectorRef_targetOid varchar2(36 char), connectorRef_type number(10,0), name_norm varchar2(255 char), name_orig varchar2(255 char), o16_lastAvailabilityStatus number(10,0), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_role (name_norm varchar2(255 char), name_orig varchar2(255 char), roleType varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_security_policy (name_norm varchar2(255 char), name_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_sequence (name_norm varchar2(255 char), name_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; -create table m_service (displayOrder number(10,0), locality_norm varchar2(255 char), locality_orig varchar2(255 char), name_norm varchar2(255 char), name_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; +create table m_service (displayOrder number(10,0), name_norm varchar2(255 char), name_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_system_configuration (name_norm varchar2(255 char), name_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_trigger (id number(10,0) not null, owner_oid varchar2(36 char) not null, handlerUri varchar2(255 char), timestampValue timestamp, primary key (id, owner_oid)) initrans 30; -create table m_user (additionalName_norm varchar2(255 char), additionalName_orig varchar2(255 char), costCenter varchar2(255 char), emailAddress varchar2(255 char), employeeNumber varchar2(255 char), familyName_norm varchar2(255 char), familyName_orig varchar2(255 char), fullName_norm varchar2(255 char), fullName_orig varchar2(255 char), givenName_norm varchar2(255 char), givenName_orig varchar2(255 char), honorificPrefix_norm varchar2(255 char), honorificPrefix_orig varchar2(255 char), honorificSuffix_norm varchar2(255 char), honorificSuffix_orig varchar2(255 char), locale varchar2(255 char), locality_norm varchar2(255 char), locality_orig varchar2(255 char), name_norm varchar2(255 char), name_orig varchar2(255 char), nickName_norm varchar2(255 char), nickName_orig varchar2(255 char), preferredLanguage varchar2(255 char), status number(10,0), telephoneNumber varchar2(255 char), timezone varchar2(255 char), title_norm varchar2(255 char), title_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; +create table m_user (additionalName_norm varchar2(255 char), additionalName_orig varchar2(255 char), employeeNumber varchar2(255 char), familyName_norm varchar2(255 char), familyName_orig varchar2(255 char), fullName_norm varchar2(255 char), fullName_orig varchar2(255 char), givenName_norm varchar2(255 char), givenName_orig varchar2(255 char), honorificPrefix_norm varchar2(255 char), honorificPrefix_orig varchar2(255 char), honorificSuffix_norm varchar2(255 char), honorificSuffix_orig varchar2(255 char), name_norm varchar2(255 char), name_orig varchar2(255 char), nickName_norm varchar2(255 char), nickName_orig varchar2(255 char), title_norm varchar2(255 char), title_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; create table m_value_policy (name_norm varchar2(255 char), name_orig varchar2(255 char), oid varchar2(36 char) not null, primary key (oid)) initrans 30; alter table m_acc_cert_campaign add constraint uc_acc_cert_campaign_name unique (name_norm); create index iCaseObjectRefTargetOid on m_acc_cert_case (objectRef_targetOid) initrans 30; @@ -131,6 +132,7 @@ alter table m_case add constraint uc_case_name unique (name_norm); alter table m_connector_host add constraint uc_connector_host_name unique (name_norm); create index iFocusAdministrative on m_focus (administrativeStatus) initrans 30; create index iFocusEffective on m_focus (effectiveStatus) initrans 30; +create index iLocality on m_focus (locality_orig) initrans 30; alter table m_form add constraint uc_form_name unique (name_norm); alter table m_function_library add constraint uc_function_library_name unique (name_norm); alter table m_generic_object add constraint uc_generic_object_name unique (name_norm); @@ -148,11 +150,10 @@ alter table m_security_policy add constraint uc_security_policy_name unique (nam alter table m_sequence add constraint uc_sequence_name unique (name_norm); alter table m_system_configuration add constraint uc_system_configuration_name unique (name_norm); create index iTriggerTimestamp on m_trigger (timestampValue) initrans 30; -create index iEmployeeNumber on m_user (employeeNumber) initrans 30; create index iFullName on m_user (fullName_orig) initrans 30; create index iFamilyName on m_user (familyName_orig) initrans 30; create index iGivenName on m_user (givenName_orig) initrans 30; -create index iLocality on m_user (locality_orig) initrans 30; +create index iEmployeeNumber on m_user (employeeNumber) initrans 30; alter table m_user add constraint uc_user_name unique (name_norm); alter table m_value_policy add constraint uc_value_policy_name unique (name_norm); alter table m_acc_cert_campaign add constraint fk_acc_cert_campaign foreign key (oid) references m_object; @@ -194,6 +195,7 @@ alter table m_object_ext_reference add constraint fk_o_ext_reference_owner forei alter table m_object_ext_reference add constraint fk_o_ext_reference_item foreign key (item_id) references m_ext_item; alter table m_object_ext_string add constraint fk_object_ext_string foreign key (owner_oid) references m_object; alter table m_object_ext_string add constraint fk_o_ext_string_item foreign key (item_id) references m_ext_item; +alter table m_object_subtype add constraint fk_object_subtype foreign key (object_oid) references m_object; alter table m_object_text_info add constraint fk_object_text_info_owner foreign key (owner_oid) references m_object; alter table m_operation_execution add constraint fk_op_exec_owner foreign key (owner_oid) references m_object; alter table m_org_closure add constraint fk_ancestor foreign key (ancestor_oid) references m_object; diff --git a/config/sql/_all/postgresql-3.8-all.sql b/config/sql/_all/postgresql-3.8-all.sql index 7a3b5018aea..ff3776d7125 100644 --- a/config/sql/_all/postgresql-3.8-all.sql +++ b/config/sql/_all/postgresql-3.8-all.sql @@ -29,6 +29,7 @@ create table m_object_ext_long (item_id int4 not null, owner_oid varchar(36) not create table m_object_ext_poly (item_id int4 not null, owner_oid varchar(36) not null, ownerType int4 not null, orig varchar(255) not null, norm varchar(255), primary key (owner_oid, ownerType, item_id, orig)); create table m_object_ext_reference (item_id int4 not null, owner_oid varchar(36) not null, ownerType int4 not null, targetoid varchar(36) not null, relation varchar(157), targetType int4, primary key (owner_oid, ownerType, item_id, targetoid)); create table m_object_ext_string (item_id int4 not null, owner_oid varchar(36) not null, ownerType int4 not null, stringValue varchar(255) not null, primary key (owner_oid, ownerType, item_id, stringValue)); +create table m_object_subtype (object_oid varchar(36) not null, subType varchar(255)); create table m_object_text_info (owner_oid varchar(36) not null, text varchar(255) not null, primary key (owner_oid, text)); create table m_operation_execution (id int4 not null, owner_oid varchar(36) not null, initiatorRef_relation varchar(157), initiatorRef_targetOid varchar(36), initiatorRef_type int4, status int4, taskRef_relation varchar(157), taskRef_targetOid varchar(36), taskRef_type int4, timestampValue timestamp, primary key (id, owner_oid)); create table m_org_closure (ancestor_oid varchar(36) not null, descendant_oid varchar(36) not null, val int4, primary key (ancestor_oid, descendant_oid)); @@ -45,7 +46,7 @@ create table m_abstract_role (approvalProcess varchar(255), autoassign_enabled b create table m_case (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_connector (connectorBundle varchar(255), connectorHostRef_relation varchar(157), connectorHostRef_targetOid varchar(36), connectorHostRef_type int4, connectorType varchar(255), connectorVersion varchar(255), framework varchar(255), name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_connector_host (hostname varchar(255), name_norm varchar(255), name_orig varchar(255), port varchar(255), oid varchar(36) not null, primary key (oid)); -create table m_focus (administrativeStatus int4, archiveTimestamp timestamp, disableReason varchar(255), disableTimestamp timestamp, effectiveStatus int4, enableTimestamp timestamp, validFrom timestamp, validTo timestamp, validityChangeTimestamp timestamp, validityStatus int4, hasPhoto boolean default false not null, oid varchar(36) not null, primary key (oid)); +create table m_focus (administrativeStatus int4, archiveTimestamp timestamp, disableReason varchar(255), disableTimestamp timestamp, effectiveStatus int4, enableTimestamp timestamp, validFrom timestamp, validTo timestamp, validityChangeTimestamp timestamp, validityStatus int4, costCenter varchar(255), emailAddress varchar(255), hasPhoto boolean default false not null, locale varchar(255), locality_norm varchar(255), locality_orig varchar(255), preferredLanguage varchar(255), telephoneNumber varchar(255), timezone varchar(255), oid varchar(36) not null, primary key (oid)); create table m_form (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_function_library (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_generic_object (name_norm varchar(255), name_orig varchar(255), objectType varchar(255), oid varchar(36) not null, primary key (oid)); @@ -53,17 +54,17 @@ create table m_lookup_table (name_norm varchar(255), name_orig varchar(255), oid create table m_lookup_table_row (id int4 not null, owner_oid varchar(36) not null, row_key varchar(255), label_norm varchar(255), label_orig varchar(255), lastChangeTimestamp timestamp, row_value varchar(255), primary key (id, owner_oid)); create table m_node (name_norm varchar(255), name_orig varchar(255), nodeIdentifier varchar(255), oid varchar(36) not null, primary key (oid)); create table m_object_template (name_norm varchar(255), name_orig varchar(255), type int4, oid varchar(36) not null, primary key (oid)); -create table m_org (costCenter varchar(255), displayOrder int4, locality_norm varchar(255), locality_orig varchar(255), name_norm varchar(255), name_orig varchar(255), tenant boolean, oid varchar(36) not null, primary key (oid)); +create table m_org (displayOrder int4, name_norm varchar(255), name_orig varchar(255), tenant boolean, oid varchar(36) not null, primary key (oid)); create table m_report (export int4, name_norm varchar(255), name_orig varchar(255), orientation int4, parent boolean, useHibernateSession boolean, oid varchar(36) not null, primary key (oid)); create table m_report_output (name_norm varchar(255), name_orig varchar(255), reportRef_relation varchar(157), reportRef_targetOid varchar(36), reportRef_type int4, oid varchar(36) not null, primary key (oid)); create table m_resource (administrativeState int4, connectorRef_relation varchar(157), connectorRef_targetOid varchar(36), connectorRef_type int4, name_norm varchar(255), name_orig varchar(255), o16_lastAvailabilityStatus int4, oid varchar(36) not null, primary key (oid)); create table m_role (name_norm varchar(255), name_orig varchar(255), roleType varchar(255), oid varchar(36) not null, primary key (oid)); create table m_security_policy (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_sequence (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); -create table m_service (displayOrder int4, locality_norm varchar(255), locality_orig varchar(255), name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); +create table m_service (displayOrder int4, name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_system_configuration (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_trigger (id int4 not null, owner_oid varchar(36) not null, handlerUri varchar(255), timestampValue timestamp, primary key (id, owner_oid)); -create table m_user (additionalName_norm varchar(255), additionalName_orig varchar(255), costCenter varchar(255), emailAddress varchar(255), employeeNumber varchar(255), familyName_norm varchar(255), familyName_orig varchar(255), fullName_norm varchar(255), fullName_orig varchar(255), givenName_norm varchar(255), givenName_orig varchar(255), honorificPrefix_norm varchar(255), honorificPrefix_orig varchar(255), honorificSuffix_norm varchar(255), honorificSuffix_orig varchar(255), locale varchar(255), locality_norm varchar(255), locality_orig varchar(255), name_norm varchar(255), name_orig varchar(255), nickName_norm varchar(255), nickName_orig varchar(255), preferredLanguage varchar(255), status int4, telephoneNumber varchar(255), timezone varchar(255), title_norm varchar(255), title_orig varchar(255), oid varchar(36) not null, primary key (oid)); +create table m_user (additionalName_norm varchar(255), additionalName_orig varchar(255), employeeNumber varchar(255), familyName_norm varchar(255), familyName_orig varchar(255), fullName_norm varchar(255), fullName_orig varchar(255), givenName_norm varchar(255), givenName_orig varchar(255), honorificPrefix_norm varchar(255), honorificPrefix_orig varchar(255), honorificSuffix_norm varchar(255), honorificSuffix_orig varchar(255), name_norm varchar(255), name_orig varchar(255), nickName_norm varchar(255), nickName_orig varchar(255), title_norm varchar(255), title_orig varchar(255), oid varchar(36) not null, primary key (oid)); create table m_value_policy (name_norm varchar(255), name_orig varchar(255), oid varchar(36) not null, primary key (oid)); alter table if exists m_acc_cert_campaign add constraint uc_acc_cert_campaign_name unique (name_norm); create index iCaseObjectRefTargetOid on m_acc_cert_case (objectRef_targetOid); @@ -131,6 +132,7 @@ alter table if exists m_case add constraint uc_case_name unique (name_norm); alter table if exists m_connector_host add constraint uc_connector_host_name unique (name_norm); create index iFocusAdministrative on m_focus (administrativeStatus); create index iFocusEffective on m_focus (effectiveStatus); +create index iLocality on m_focus (locality_orig); alter table if exists m_form add constraint uc_form_name unique (name_norm); alter table if exists m_function_library add constraint uc_function_library_name unique (name_norm); alter table if exists m_generic_object add constraint uc_generic_object_name unique (name_norm); @@ -148,11 +150,10 @@ alter table if exists m_security_policy add constraint uc_security_policy_name u alter table if exists m_sequence add constraint uc_sequence_name unique (name_norm); alter table if exists m_system_configuration add constraint uc_system_configuration_name unique (name_norm); create index iTriggerTimestamp on m_trigger (timestampValue); -create index iEmployeeNumber on m_user (employeeNumber); create index iFullName on m_user (fullName_orig); create index iFamilyName on m_user (familyName_orig); create index iGivenName on m_user (givenName_orig); -create index iLocality on m_user (locality_orig); +create index iEmployeeNumber on m_user (employeeNumber); alter table if exists m_user add constraint uc_user_name unique (name_norm); alter table if exists m_value_policy add constraint uc_value_policy_name unique (name_norm); alter table if exists m_acc_cert_campaign add constraint fk_acc_cert_campaign foreign key (oid) references m_object; @@ -194,6 +195,7 @@ alter table if exists m_object_ext_reference add constraint fk_o_ext_reference_o alter table if exists m_object_ext_reference add constraint fk_o_ext_reference_item foreign key (item_id) references m_ext_item; alter table if exists m_object_ext_string add constraint fk_object_ext_string foreign key (owner_oid) references m_object; alter table if exists m_object_ext_string add constraint fk_o_ext_string_item foreign key (item_id) references m_ext_item; +alter table if exists m_object_subtype add constraint fk_object_subtype foreign key (object_oid) references m_object; alter table if exists m_object_text_info add constraint fk_object_text_info_owner foreign key (owner_oid) references m_object; alter table if exists m_operation_execution add constraint fk_op_exec_owner foreign key (owner_oid) references m_object; alter table if exists m_org_closure add constraint fk_ancestor foreign key (ancestor_oid) references m_object; diff --git a/config/sql/_all/sqlserver-3.8-all.sql b/config/sql/_all/sqlserver-3.8-all.sql index c1d66dd0397..00d9a8c2ba0 100644 --- a/config/sql/_all/sqlserver-3.8-all.sql +++ b/config/sql/_all/sqlserver-3.8-all.sql @@ -355,6 +355,10 @@ CREATE TABLE m_object_ext_string ( stringValue NVARCHAR(255) COLLATE database_default NOT NULL, PRIMARY KEY (owner_oid, ownerType, item_id, stringValue) ); +CREATE TABLE m_object_subtype ( + object_oid NVARCHAR(36) COLLATE database_default NOT NULL, + subType NVARCHAR(255) COLLATE database_default +); CREATE TABLE m_object_text_info ( owner_oid NVARCHAR(36) COLLATE database_default NOT NULL, text NVARCHAR(255) COLLATE database_default NOT NULL, @@ -525,7 +529,15 @@ CREATE TABLE m_focus ( validTo DATETIME2, validityChangeTimestamp DATETIME2, validityStatus INT, + costCenter NVARCHAR(255) COLLATE database_default, + emailAddress NVARCHAR(255) COLLATE database_default, hasPhoto BIT DEFAULT FALSE NOT NULL, + locale NVARCHAR(255) COLLATE database_default, + locality_norm NVARCHAR(255) COLLATE database_default, + locality_orig NVARCHAR(255) COLLATE database_default, + preferredLanguage NVARCHAR(255) COLLATE database_default, + telephoneNumber NVARCHAR(255) COLLATE database_default, + timezone NVARCHAR(255) COLLATE database_default, oid NVARCHAR(36) COLLATE database_default NOT NULL, PRIMARY KEY (oid) ); @@ -579,14 +591,11 @@ CREATE TABLE m_object_template ( PRIMARY KEY (oid) ); CREATE TABLE m_org ( - costCenter NVARCHAR(255) COLLATE database_default, - displayOrder INT, - locality_norm NVARCHAR(255) COLLATE database_default, - locality_orig NVARCHAR(255) COLLATE database_default, - name_norm NVARCHAR(255) COLLATE database_default, - name_orig NVARCHAR(255) COLLATE database_default, - tenant BIT, - oid NVARCHAR(36) COLLATE database_default NOT NULL, + displayOrder INT, + name_norm NVARCHAR(255) COLLATE database_default, + name_orig NVARCHAR(255) COLLATE database_default, + tenant BIT, + oid NVARCHAR(36) COLLATE database_default NOT NULL, PRIMARY KEY (oid) ); CREATE TABLE m_report ( @@ -639,12 +648,10 @@ CREATE TABLE m_sequence ( PRIMARY KEY (oid) ); CREATE TABLE m_service ( - displayOrder INT, - locality_norm NVARCHAR(255) COLLATE database_default, - locality_orig NVARCHAR(255) COLLATE database_default, - name_norm NVARCHAR(255) COLLATE database_default, - name_orig NVARCHAR(255) COLLATE database_default, - oid NVARCHAR(36) COLLATE database_default NOT NULL, + displayOrder INT, + name_norm NVARCHAR(255) COLLATE database_default, + name_orig NVARCHAR(255) COLLATE database_default, + oid NVARCHAR(36) COLLATE database_default NOT NULL, PRIMARY KEY (oid) ); CREATE TABLE m_system_configuration ( @@ -663,8 +670,6 @@ CREATE TABLE m_trigger ( CREATE TABLE m_user ( additionalName_norm NVARCHAR(255) COLLATE database_default, additionalName_orig NVARCHAR(255) COLLATE database_default, - costCenter NVARCHAR(255) COLLATE database_default, - emailAddress NVARCHAR(255) COLLATE database_default, employeeNumber NVARCHAR(255) COLLATE database_default, familyName_norm NVARCHAR(255) COLLATE database_default, familyName_orig NVARCHAR(255) COLLATE database_default, @@ -676,17 +681,10 @@ CREATE TABLE m_user ( honorificPrefix_orig NVARCHAR(255) COLLATE database_default, honorificSuffix_norm NVARCHAR(255) COLLATE database_default, honorificSuffix_orig NVARCHAR(255) COLLATE database_default, - locale NVARCHAR(255) COLLATE database_default, - locality_norm NVARCHAR(255) COLLATE database_default, - locality_orig NVARCHAR(255) COLLATE database_default, name_norm NVARCHAR(255) COLLATE database_default, name_orig NVARCHAR(255) COLLATE database_default, nickName_norm NVARCHAR(255) COLLATE database_default, nickName_orig NVARCHAR(255) COLLATE database_default, - preferredLanguage NVARCHAR(255) COLLATE database_default, - status INT, - telephoneNumber NVARCHAR(255) COLLATE database_default, - timezone NVARCHAR(255) COLLATE database_default, title_norm NVARCHAR(255) COLLATE database_default, title_orig NVARCHAR(255) COLLATE database_default, oid NVARCHAR(36) COLLATE database_default NOT NULL, @@ -724,12 +722,18 @@ CREATE INDEX iOrgRefTargetOid ON m_assignment (orgRef_targetOid); CREATE INDEX iResourceRefTargetOid ON m_assignment (resourceRef_targetOid); -create index iAExtensionBoolean on m_assignment_ext_boolean (booleanValue); -create index iAExtensionDate on m_assignment_ext_date (dateValue); -create index iAExtensionLong on m_assignment_ext_long (longValue); -create index iAExtensionPolyString on m_assignment_ext_poly (orig); -create index iAExtensionReference on m_assignment_ext_reference (targetoid); -create index iAExtensionString on m_assignment_ext_string (stringValue); +CREATE INDEX iAExtensionBoolean + ON m_assignment_ext_boolean (booleanValue); +CREATE INDEX iAExtensionDate + ON m_assignment_ext_date (dateValue); +CREATE INDEX iAExtensionLong + ON m_assignment_ext_long (longValue); +CREATE INDEX iAExtensionPolyString + ON m_assignment_ext_poly (orig); +CREATE INDEX iAExtensionReference + ON m_assignment_ext_reference (targetoid); +CREATE INDEX iAExtensionString + ON m_assignment_ext_string (stringValue); CREATE INDEX iAssignmentReferenceTargetOid ON m_assignment_reference (targetOid); CREATE INDEX iTimestampValue @@ -750,12 +754,18 @@ CREATE INDEX iObjectCreateTimestamp ON m_object (createTimestamp); CREATE INDEX iObjectLifecycleState ON m_object (lifecycleState); -create index iExtensionBoolean on m_object_ext_boolean (booleanValue); -create index iExtensionDate on m_object_ext_date (dateValue); -create index iExtensionLong on m_object_ext_long (longValue); -create index iExtensionPolyString on m_object_ext_poly (orig); -create index iExtensionReference on m_object_ext_reference (targetoid); -create index iExtensionString on m_object_ext_string (stringValue); +CREATE INDEX iExtensionBoolean + ON m_object_ext_boolean (booleanValue); +CREATE INDEX iExtensionDate + ON m_object_ext_date (dateValue); +CREATE INDEX iExtensionLong + ON m_object_ext_long (longValue); +CREATE INDEX iExtensionPolyString + ON m_object_ext_poly (orig); +CREATE INDEX iExtensionReference + ON m_object_ext_reference (targetoid); +CREATE INDEX iExtensionString + ON m_object_ext_string (stringValue); CREATE INDEX iOpExecTaskOid ON m_operation_execution (taskRef_targetOid); CREATE INDEX iOpExecInitiatorOid @@ -818,6 +828,8 @@ CREATE INDEX iFocusAdministrative ON m_focus (administrativeStatus); CREATE INDEX iFocusEffective ON m_focus (effectiveStatus); +CREATE INDEX iLocality + ON m_focus (locality_orig); ALTER TABLE m_form ADD CONSTRAINT uc_form_name UNIQUE (name_norm); ALTER TABLE m_function_library @@ -852,16 +864,14 @@ ALTER TABLE m_system_configuration ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm); CREATE INDEX iTriggerTimestamp ON m_trigger (timestampValue); -CREATE INDEX iEmployeeNumber - ON m_user (employeeNumber); CREATE INDEX iFullName ON m_user (fullName_orig); CREATE INDEX iFamilyName ON m_user (familyName_orig); CREATE INDEX iGivenName ON m_user (givenName_orig); -CREATE INDEX iLocality - ON m_user (locality_orig); +CREATE INDEX iEmployeeNumber + ON m_user (employeeNumber); ALTER TABLE m_user ADD CONSTRAINT uc_user_name UNIQUE (name_norm); ALTER TABLE m_value_policy @@ -944,6 +954,8 @@ ALTER TABLE m_object_ext_string ADD CONSTRAINT fk_object_ext_string FOREIGN KEY (owner_oid) REFERENCES m_object; ALTER TABLE m_object_ext_string ADD CONSTRAINT fk_o_ext_string_item FOREIGN KEY (item_id) REFERENCES m_ext_item; +ALTER TABLE m_object_subtype + ADD CONSTRAINT fk_object_subtype FOREIGN KEY (object_oid) REFERENCES m_object; ALTER TABLE m_object_text_info ADD CONSTRAINT fk_object_text_info_owner FOREIGN KEY (owner_oid) REFERENCES m_object; ALTER TABLE m_operation_execution