From 1dcd318324f1e9411ca03b9be755174be3a76147 Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Tue, 5 Dec 2017 14:35:19 +0100 Subject: [PATCH] Updated db scripts for Oracle. --- config/sql/_all/oracle-3.7-all.sql | 8 +- config/sql/_all/oracle-upgrade-3.6-3.7.sql | 32 +++- .../3.6/oracle/oracle-upgrade-3.5-3.6.sql | 177 ------------------ .../oracle/oracle-3.7.sql} | 2 +- .../3.7/oracle/oracle-upgrade-3.6-3.7.sql | 5 +- 5 files changed, 43 insertions(+), 181 deletions(-) delete mode 100644 config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql rename config/sql/midpoint/{3.6/oracle/oracle-3.6.sql => 3.7/oracle/oracle-3.7.sql} (99%) diff --git a/config/sql/_all/oracle-3.7-all.sql b/config/sql/_all/oracle-3.7-all.sql index 46a91b26eae..1c8af772c55 100644 --- a/config/sql/_all/oracle-3.7-all.sql +++ b/config/sql/_all/oracle-3.7-all.sql @@ -270,6 +270,8 @@ CREATE TABLE m_audit_delta ( CREATE TABLE m_audit_event ( id NUMBER(19, 0) NOT NULL, + attorneyName VARCHAR2(255 CHAR), + attorneyOid VARCHAR2(36 CHAR), channel VARCHAR2(255 CHAR), eventIdentifier VARCHAR2(255 CHAR), eventStage NUMBER(10, 0), @@ -277,6 +279,7 @@ CREATE TABLE m_audit_event ( hostIdentifier VARCHAR2(255 CHAR), initiatorName VARCHAR2(255 CHAR), initiatorOid VARCHAR2(36 CHAR), + initiatorType NUMBER(10, 0), message VARCHAR2(1024 CHAR), nodeIdentifier VARCHAR2(255 CHAR), outcome NUMBER(10, 0), @@ -949,6 +952,9 @@ CREATE INDEX iOpExecInitiatorOid CREATE INDEX iOpExecStatus ON m_operation_execution (status) INITRANS 30; +CREATE INDEX iOpExecOwnerOid + ON m_operation_execution (owner_oid) INITRANS 30; + ALTER TABLE m_org ADD CONSTRAINT uc_org_name UNIQUE (name_norm) INITRANS 30; @@ -999,7 +1005,7 @@ ALTER TABLE m_system_configuration ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm) INITRANS 30; ALTER TABLE m_task - ADD CONSTRAINT UK_59yhlpgtqu3a9wvnw0ujx4xl1 UNIQUE (taskIdentifier) INITRANS 30; + ADD CONSTRAINT uc_task_identifier UNIQUE (taskIdentifier) INITRANS 30; CREATE INDEX iParent ON m_task (parent) INITRANS 30; diff --git a/config/sql/_all/oracle-upgrade-3.6-3.7.sql b/config/sql/_all/oracle-upgrade-3.6-3.7.sql index d6d87d3de17..b8be12358a4 100644 --- a/config/sql/_all/oracle-upgrade-3.6-3.7.sql +++ b/config/sql/_all/oracle-upgrade-3.6-3.7.sql @@ -1,2 +1,32 @@ ALTER TABLE qrtz_triggers ADD (EXECUTION_GROUP VARCHAR2(200) NULL); -ALTER TABLE qrtz_fired_triggers ADD (EXECUTION_GROUP VARCHAR2(200) NULL); \ No newline at end of file +ALTER TABLE qrtz_fired_triggers ADD (EXECUTION_GROUP VARCHAR2(200) NULL); + +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; + +ALTER TABLE m_function_library + ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm) INITRANS 30; + +ALTER TABLE m_function_library + ADD CONSTRAINT fk_function_library +FOREIGN KEY (oid) +REFERENCES m_object; + +ALTER TABLE m_abstract_role ADD autoassign_enabled NUMBER(1, 0); + +CREATE INDEX iAutoassignEnabled + ON m_abstract_role (autoassign_enabled) INITRANS 30; + +ALTER TABLE m_task + ADD CONSTRAINT uc_task_identifier UNIQUE (taskIdentifier) INITRANS 30; + +ALTER TABLE m_audit_event ADD attorneyName VARCHAR2(255 CHAR); +ALTER TABLE m_audit_event ADD attorneyOid VARCHAR2(36 CHAR); +ALTER TABLE m_audit_event ADD initiatorType NUMBER(10, 0); + +CREATE INDEX iOpExecOwnerOid + ON m_operation_execution (owner_oid) INITRANS 30; diff --git a/config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql b/config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql deleted file mode 100644 index 5ef22137de6..00000000000 --- a/config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql +++ /dev/null @@ -1,177 +0,0 @@ -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; - -ALTER TABLE m_form - ADD CONSTRAINT uc_form_name UNIQUE (name_norm) INITRANS 30; - -ALTER TABLE m_form - ADD CONSTRAINT fk_form -FOREIGN KEY (oid) -REFERENCES m_object; - -CREATE TABLE m_audit_prop_value ( - id NUMBER(19, 0) NOT NULL, - name VARCHAR2(255 CHAR), - record_id NUMBER(19, 0), - value VARCHAR2(1024 CHAR), - PRIMARY KEY (id) -) INITRANS 30; - -CREATE TABLE m_audit_ref_value ( - id NUMBER(19, 0) NOT NULL, - name VARCHAR2(255 CHAR), - oid VARCHAR2(255 CHAR), - record_id NUMBER(19, 0), - targetName_norm VARCHAR2(255 CHAR), - targetName_orig VARCHAR2(255 CHAR), - type VARCHAR2(255 CHAR), - PRIMARY KEY (id) -) INITRANS 30; - -CREATE INDEX iAuditPropValRecordId - ON m_audit_prop_value (record_id) INITRANS 30; - -CREATE INDEX iAuditRefValRecordId - ON m_audit_ref_value (record_id) INITRANS 30; - - -ALTER TABLE m_audit_prop_value - ADD CONSTRAINT fk_audit_prop_value -FOREIGN KEY (record_id) -REFERENCES m_audit_event; - -ALTER TABLE m_audit_ref_value - ADD CONSTRAINT fk_audit_ref_value -FOREIGN KEY (record_id) -REFERENCES m_audit_event; - -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; - -ALTER TABLE m_object_text_info - ADD CONSTRAINT fk_object_text_info_owner -FOREIGN KEY (owner_oid) -REFERENCES m_object; - -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; - -ALTER TABLE m_case - ADD CONSTRAINT uc_case_name UNIQUE (name_norm) INITRANS 30; - -ALTER TABLE m_case - ADD CONSTRAINT fk_case -FOREIGN KEY (oid) -REFERENCES m_object; - -ALTER TABLE m_assignment_reference RENAME COLUMN containerType TO targetType; -ALTER TABLE m_reference RENAME COLUMN containerType TO targetType; - -DROP TABLE m_acc_cert_case_reference; - -ALTER TABLE m_acc_cert_case RENAME COLUMN currentStageNumber TO stageNumber; -ALTER TABLE m_acc_cert_case DROP COLUMN currentStageOutcome; -ALTER TABLE m_acc_cert_case DROP COLUMN overallOutcome; -ALTER TABLE m_acc_cert_case ADD (currentStageOutcome VARCHAR2(255 CHAR)); -ALTER TABLE m_acc_cert_case ADD (outcome VARCHAR2(255 CHAR)); - -DROP TABLE m_acc_cert_decision; - -CREATE TABLE m_acc_cert_wi ( - id NUMBER(10, 0) NOT NULL, - owner_id NUMBER(10, 0) NOT NULL, - owner_owner_oid VARCHAR2(36 CHAR) NOT NULL, - closeTimestamp TIMESTAMP, - outcome VARCHAR2(255 CHAR), - outputChangeTimestamp TIMESTAMP, - performerRef_relation VARCHAR2(157 CHAR), - performerRef_targetOid VARCHAR2(36 CHAR), - performerRef_type NUMBER(10, 0), - stageNumber NUMBER(10, 0), - PRIMARY KEY (id, owner_id, owner_owner_oid) -) INITRANS 30; - -CREATE TABLE m_acc_cert_wi_reference ( - owner_id NUMBER(10, 0) NOT NULL, - owner_owner_id NUMBER(10, 0) NOT NULL, - owner_owner_owner_oid VARCHAR2(36 CHAR) NOT NULL, - relation VARCHAR2(157 CHAR) NOT NULL, - targetOid VARCHAR2(36 CHAR) NOT NULL, - targetType NUMBER(10, 0), - PRIMARY KEY (owner_id, owner_owner_id, owner_owner_owner_oid, relation, targetOid) -) INITRANS 30; - -CREATE INDEX iCertWorkItemRefTargetOid ON m_acc_cert_wi_reference (targetOid) INITRANS 30; - -ALTER TABLE m_acc_cert_case DROP CONSTRAINT fk_acc_cert_case_owner; - -ALTER TABLE m_acc_cert_case - ADD CONSTRAINT fk_acc_cert_case_owner -FOREIGN KEY (owner_oid) -REFERENCES m_acc_cert_campaign; - -ALTER TABLE m_acc_cert_wi - ADD CONSTRAINT fk_acc_cert_wi_owner -FOREIGN KEY (owner_id, owner_owner_oid) -REFERENCES m_acc_cert_case; - -ALTER TABLE m_acc_cert_wi_reference - ADD CONSTRAINT fk_acc_cert_wi_ref_owner -FOREIGN KEY (owner_id, owner_owner_id, owner_owner_owner_oid) -REFERENCES m_acc_cert_wi; - -ALTER TABLE m_shadow ADD (pendingOperationCount NUMBER(10, 0)); - -CREATE INDEX iShadowKind ON m_shadow (kind) INITRANS 30; - -CREATE INDEX iShadowIntent ON m_shadow (intent) INITRANS 30; - -CREATE INDEX iShadowObjectClass ON m_shadow (objectClass) INITRANS 30; - -CREATE INDEX iShadowFailedOperationType ON m_shadow (failedOperationType) INITRANS 30; - -CREATE INDEX iShadowSyncSituation ON m_shadow (synchronizationSituation) INITRANS 30; - -CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount) 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 INDEX iOpExecTaskOid - ON m_operation_execution (taskRef_targetOid) INITRANS 30; - -CREATE INDEX iOpExecInitiatorOid - ON m_operation_execution (initiatorRef_targetOid) INITRANS 30; - -CREATE INDEX iOpExecStatus - ON m_operation_execution (status) INITRANS 30; - -ALTER TABLE m_operation_execution - ADD CONSTRAINT fk_op_exec_owner -FOREIGN KEY (owner_oid) -REFERENCES m_object; - -ALTER TABLE m_audit_event ADD (nodeIdentifier VARCHAR2(255 CHAR)); -ALTER TABLE m_audit_event ADD (remoteHostAddress VARCHAR2(255 CHAR)); diff --git a/config/sql/midpoint/3.6/oracle/oracle-3.6.sql b/config/sql/midpoint/3.7/oracle/oracle-3.7.sql similarity index 99% rename from config/sql/midpoint/3.6/oracle/oracle-3.6.sql rename to config/sql/midpoint/3.7/oracle/oracle-3.7.sql index 66344ccabfd..d694dd3e2e8 100644 --- a/config/sql/midpoint/3.6/oracle/oracle-3.6.sql +++ b/config/sql/midpoint/3.7/oracle/oracle-3.7.sql @@ -893,7 +893,7 @@ ALTER TABLE m_form ALTER TABLE m_function_library ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm) INITRANS 30; - + ALTER TABLE m_generic_object ADD CONSTRAINT uc_generic_object_name UNIQUE (name_norm) INITRANS 30; diff --git a/config/sql/midpoint/3.7/oracle/oracle-upgrade-3.6-3.7.sql b/config/sql/midpoint/3.7/oracle/oracle-upgrade-3.6-3.7.sql index 692d0bbb70d..34652d454f2 100644 --- a/config/sql/midpoint/3.7/oracle/oracle-upgrade-3.6-3.7.sql +++ b/config/sql/midpoint/3.7/oracle/oracle-upgrade-3.6-3.7.sql @@ -23,4 +23,7 @@ ALTER TABLE m_task ALTER TABLE m_audit_event ADD attorneyName VARCHAR2(255 CHAR); ALTER TABLE m_audit_event ADD attorneyOid VARCHAR2(36 CHAR); -ALTER TABLE m_audit_event ADD initiatorType NUMBER(10, 0); \ No newline at end of file +ALTER TABLE m_audit_event ADD initiatorType NUMBER(10, 0); + +CREATE INDEX iOpExecOwnerOid + ON m_operation_execution (owner_oid) INITRANS 30;