diff --git a/config/sql/_all/mysql-3.7-all.sql b/config/sql/_all/mysql-3.7-all.sql index 46086ca84f5..c8ccfc2caff 100644 --- a/config/sql/_all/mysql-3.7-all.sql +++ b/config/sql/_all/mysql-3.7-all.sql @@ -331,6 +331,8 @@ CREATE TABLE m_audit_delta ( CREATE TABLE m_audit_event ( id BIGINT NOT NULL, + attorneyName VARCHAR(255), + attorneyOid VARCHAR(36), channel VARCHAR(255), eventIdentifier VARCHAR(255), eventStage INTEGER, @@ -338,6 +340,7 @@ CREATE TABLE m_audit_event ( hostIdentifier VARCHAR(255), initiatorName VARCHAR(255), initiatorOid VARCHAR(36), + initiatorType INTEGER, message VARCHAR(1024), nodeIdentifier VARCHAR(255), outcome INTEGER, @@ -1153,6 +1156,9 @@ CREATE INDEX iOpExecInitiatorOid CREATE INDEX iOpExecStatus ON m_operation_execution (status); +CREATE INDEX iOpExecOwnerOid + ON m_operation_execution (owner_oid); + ALTER TABLE m_org ADD CONSTRAINT uc_org_name UNIQUE (name_norm); @@ -1205,7 +1211,7 @@ ALTER TABLE m_system_configuration ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm); ALTER TABLE m_task - ADD CONSTRAINT UK_59yhlpgtqu3a9wvnw0ujx4xl1 UNIQUE (taskIdentifier); + ADD CONSTRAINT uc_task_identifier UNIQUE (taskIdentifier); CREATE INDEX iParent ON m_task (parent); diff --git a/config/sql/_all/mysql-upgrade-3.5-3.6.sql b/config/sql/_all/mysql-upgrade-3.5-3.6.sql deleted file mode 100644 index 0344cbd8517..00000000000 --- a/config/sql/_all/mysql-upgrade-3.5-3.6.sql +++ /dev/null @@ -1,200 +0,0 @@ -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; - -ALTER TABLE m_form - ADD CONSTRAINT uc_form_name UNIQUE (name_norm); - -ALTER TABLE m_form - ADD CONSTRAINT fk_form -FOREIGN KEY (oid) -REFERENCES m_object (oid); - -CREATE TABLE m_audit_prop_value ( - id BIGINT NOT NULL, - name VARCHAR(255), - record_id BIGINT, - value VARCHAR(1024), - PRIMARY KEY (id) -) - DEFAULT CHARACTER SET utf8 - COLLATE utf8_bin - ENGINE = InnoDB; - -CREATE TABLE m_audit_ref_value ( - id BIGINT NOT NULL, - name VARCHAR(255), - oid VARCHAR(255), - record_id BIGINT, - targetName_norm VARCHAR(255), - targetName_orig VARCHAR(255), - type VARCHAR(255), - PRIMARY KEY (id) -) - DEFAULT CHARACTER SET utf8 - COLLATE utf8_bin - ENGINE = InnoDB; - -CREATE INDEX iAuditPropValRecordId - ON m_audit_prop_value (record_id); - -CREATE INDEX iAuditRefValRecordId - ON m_audit_ref_value (record_id); - -ALTER TABLE m_audit_prop_value - ADD CONSTRAINT fk_audit_prop_value -FOREIGN KEY (record_id) -REFERENCES m_audit_event (id); - -ALTER TABLE m_audit_ref_value - ADD CONSTRAINT fk_audit_ref_value -FOREIGN KEY (record_id) -REFERENCES m_audit_event (id); - -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; - -ALTER TABLE m_object_text_info - ADD CONSTRAINT fk_object_text_info_owner -FOREIGN KEY (owner_oid) -REFERENCES m_object (oid); - -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; - -ALTER TABLE m_case - ADD CONSTRAINT uc_case_name UNIQUE (name_norm); - -ALTER TABLE m_case - ADD CONSTRAINT fk_case -FOREIGN KEY (oid) -REFERENCES m_object (oid); - -ALTER TABLE m_assignment_reference CHANGE containerType targetType INTEGER; -ALTER TABLE m_reference CHANGE containerType targetType INTEGER; - -DROP TABLE m_acc_cert_case_reference; - -ALTER TABLE m_acc_cert_case CHANGE currentStageNumber stageNumber INTEGER; -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 COLUMN currentStageOutcome VARCHAR(255); -ALTER TABLE m_acc_cert_case ADD COLUMN outcome VARCHAR(255); - -DROP TABLE m_acc_cert_decision; - -CREATE TABLE m_acc_cert_wi ( - id INTEGER NOT NULL, - owner_id INTEGER NOT NULL, - owner_owner_oid VARCHAR(36) NOT NULL, - closeTimestamp DATETIME(6), - outcome VARCHAR(255), - outputChangeTimestamp DATETIME(6), - performerRef_relation VARCHAR(157), - performerRef_targetOid VARCHAR(36), - performerRef_type INTEGER, - stageNumber INTEGER, - PRIMARY KEY (id, owner_id, owner_owner_oid) -) - DEFAULT CHARACTER SET utf8 - COLLATE utf8_bin - ENGINE = InnoDB; - -CREATE TABLE m_acc_cert_wi_reference ( - owner_id INTEGER NOT NULL, - owner_owner_id INTEGER NOT NULL, - owner_owner_owner_oid VARCHAR(36) NOT NULL, - relation VARCHAR(157) NOT NULL, - targetOid VARCHAR(36) NOT NULL, - targetType INTEGER, - PRIMARY KEY (owner_id, owner_owner_id, owner_owner_owner_oid, relation, targetOid) -) - DEFAULT CHARACTER SET utf8 - COLLATE utf8_bin - ENGINE = InnoDB; - -CREATE INDEX iCertWorkItemRefTargetOid ON m_acc_cert_wi_reference (targetOid); - -ALTER TABLE m_acc_cert_case DROP FOREIGN KEY 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 (oid); - -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 (id, owner_oid); - -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 (id, owner_id, owner_owner_oid); - -ALTER TABLE m_shadow ADD COLUMN pendingOperationCount INTEGER; - -CREATE INDEX iShadowKind ON m_shadow (kind); - -CREATE INDEX iShadowIntent ON m_shadow (intent); - -CREATE INDEX iShadowObjectClass ON m_shadow (objectClass); - -CREATE INDEX iShadowFailedOperationType ON m_shadow (failedOperationType); - -CREATE INDEX iShadowSyncSituation ON m_shadow (synchronizationSituation); - -CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount); - -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 INDEX iOpExecTaskOid - ON m_operation_execution (taskRef_targetOid); - -CREATE INDEX iOpExecInitiatorOid - ON m_operation_execution (initiatorRef_targetOid); - -CREATE INDEX iOpExecStatus - ON m_operation_execution (status); - -ALTER TABLE m_operation_execution - ADD CONSTRAINT fk_op_exec_owner -FOREIGN KEY (owner_oid) -REFERENCES m_object (oid); - -ALTER TABLE m_audit_event ADD COLUMN nodeIdentifier VARCHAR(255); -ALTER TABLE m_audit_event ADD COLUMN remoteHostAddress VARCHAR(255); diff --git a/config/sql/_all/mysql-upgrade-3.6-3.7.sql b/config/sql/_all/mysql-upgrade-3.6-3.7.sql index c1c27c8669a..d27a5a7c32f 100644 --- a/config/sql/_all/mysql-upgrade-3.6-3.7.sql +++ b/config/sql/_all/mysql-upgrade-3.6-3.7.sql @@ -1,11 +1,6 @@ ALTER TABLE QRTZ_TRIGGERS ADD COLUMN EXECUTION_GROUP VARCHAR(200) NULL; ALTER TABLE QRTZ_FIRED_TRIGGERS ADD COLUMN EXECUTION_GROUP VARCHAR(200) NULL; -ALTER TABLE m_abstract_role AD COLUMN autoassign_enabled BIT; - -CREATE INDEX iAutoassignEnabled - ON m_abstract_role (autoassign_enabled); - CREATE TABLE m_function_library ( name_norm VARCHAR(255), name_orig VARCHAR(255), @@ -17,4 +12,24 @@ CREATE TABLE m_function_library ( ENGINE = InnoDB; ALTER TABLE m_function_library - ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm); \ No newline at end of file + ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm); + +ALTER TABLE m_function_library + ADD CONSTRAINT fk_function_library +FOREIGN KEY (oid) +REFERENCES m_object (oid); + +ALTER TABLE m_abstract_role ADD COLUMN autoassign_enabled BIT; + +CREATE INDEX iAutoassignEnabled + ON m_abstract_role (autoassign_enabled); + +ALTER TABLE m_task + ADD CONSTRAINT uc_task_identifier UNIQUE (taskIdentifier); + +ALTER TABLE m_audit_event ADD COLUMN attorneyName VARCHAR(255); +ALTER TABLE m_audit_event ADD COLUMN attorneyOid VARCHAR(36); +ALTER TABLE m_audit_event ADD COLUMN initiatorType INTEGER; + +CREATE INDEX iOpExecOwnerOid + ON m_operation_execution (owner_oid); 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.5-3.6.sql b/config/sql/_all/oracle-upgrade-3.5-3.6.sql deleted file mode 100644 index 5ef22137de6..00000000000 --- a/config/sql/_all/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/_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/_all/sqlserver-3.7-all.sql b/config/sql/_all/sqlserver-3.7-all.sql index ad4449b55d7..b691367bdbd 100644 --- a/config/sql/_all/sqlserver-3.7-all.sql +++ b/config/sql/_all/sqlserver-3.7-all.sql @@ -267,6 +267,8 @@ CREATE TABLE m_audit_delta ( CREATE TABLE m_audit_event ( id BIGINT NOT NULL, + attorneyName NVARCHAR(255) COLLATE database_default, + attorneyOid NVARCHAR(36) COLLATE database_default, channel NVARCHAR(255) COLLATE database_default, eventIdentifier NVARCHAR(255) COLLATE database_default, eventStage INT, @@ -274,6 +276,7 @@ CREATE TABLE m_audit_event ( hostIdentifier NVARCHAR(255) COLLATE database_default, initiatorName NVARCHAR(255) COLLATE database_default, initiatorOid NVARCHAR(36) COLLATE database_default, + initiatorType INT, message NVARCHAR(1024) COLLATE database_default, nodeIdentifier NVARCHAR(255) COLLATE database_default, outcome INT, @@ -939,6 +942,9 @@ CREATE INDEX iOpExecInitiatorOid CREATE INDEX iOpExecStatus ON m_operation_execution (status); +CREATE INDEX iOpExecOwnerOid + ON m_operation_execution (owner_oid); + ALTER TABLE m_org ADD CONSTRAINT uc_org_name UNIQUE (name_norm); @@ -989,7 +995,7 @@ ALTER TABLE m_system_configuration ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm); ALTER TABLE m_task - ADD CONSTRAINT UK_59yhlpgtqu3a9wvnw0ujx4xl1 UNIQUE (taskIdentifier); + ADD CONSTRAINT uc_task_identifier UNIQUE (taskIdentifier); CREATE INDEX iParent ON m_task (parent); diff --git a/config/sql/_all/sqlserver-upgrade-3.5-3.6.sql b/config/sql/_all/sqlserver-upgrade-3.5-3.6.sql deleted file mode 100644 index 22278d50bc2..00000000000 --- a/config/sql/_all/sqlserver-upgrade-3.5-3.6.sql +++ /dev/null @@ -1,176 +0,0 @@ -CREATE TABLE m_form ( - 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) -); - -ALTER TABLE m_form - ADD CONSTRAINT uc_form_name UNIQUE (name_norm); - -ALTER TABLE m_form - ADD CONSTRAINT fk_form -FOREIGN KEY (oid) -REFERENCES m_object; - -CREATE TABLE m_audit_prop_value ( - id BIGINT NOT NULL, - name NVARCHAR(255) COLLATE database_default, - record_id BIGINT, - value NVARCHAR(1024) COLLATE database_default, - PRIMARY KEY (id) -); - -CREATE TABLE m_audit_ref_value ( - id BIGINT NOT NULL, - name NVARCHAR(255) COLLATE database_default, - oid NVARCHAR(255) COLLATE database_default, - record_id BIGINT, - targetName_norm NVARCHAR(255) COLLATE database_default, - targetName_orig NVARCHAR(255) COLLATE database_default, - type NVARCHAR(255) COLLATE database_default, - PRIMARY KEY (id) -); - -CREATE INDEX iAuditPropValRecordId - ON m_audit_prop_value (record_id); - -CREATE INDEX iAuditRefValRecordId - ON m_audit_ref_value (record_id); - -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 NVARCHAR(36) COLLATE database_default NOT NULL, - text NVARCHAR(255) COLLATE database_default NOT NULL, - PRIMARY KEY (owner_oid, text) -); - -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 NVARCHAR(255) COLLATE database_default, - name_orig NVARCHAR(255) COLLATE database_default, - oid NVARCHAR(36) COLLATE database_default NOT NULL, - PRIMARY KEY (oid) -); - -ALTER TABLE m_case - ADD CONSTRAINT uc_case_name UNIQUE (name_norm); - -ALTER TABLE m_case - ADD CONSTRAINT fk_case -FOREIGN KEY (oid) -REFERENCES m_object; - -EXEC sp_rename 'm_assignment_reference.containerType', 'targetType', 'COLUMN'; -EXEC sp_rename 'm_reference.containerType', 'targetType', 'COLUMN'; - -DROP TABLE m_acc_cert_case_reference; - -EXEC sp_rename 'm_acc_cert_case.currentStageNumber', 'stageNumber', 'COLUMN'; -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 NVARCHAR(255) COLLATE database_default; -ALTER TABLE m_acc_cert_case ADD outcome NVARCHAR(255) COLLATE database_default; - -DROP TABLE m_acc_cert_decision; - -CREATE TABLE m_acc_cert_wi ( - id INT NOT NULL, - owner_id INT NOT NULL, - owner_owner_oid NVARCHAR(36) COLLATE database_default NOT NULL, - closeTimestamp DATETIME2, - outcome NVARCHAR(255) COLLATE database_default, - outputChangeTimestamp DATETIME2, - performerRef_relation NVARCHAR(157) COLLATE database_default, - performerRef_targetOid NVARCHAR(36) COLLATE database_default, - performerRef_type INT, - stageNumber INT, - PRIMARY KEY (id, owner_id, owner_owner_oid) -); - -CREATE TABLE m_acc_cert_wi_reference ( - owner_id INT NOT NULL, - owner_owner_id INT NOT NULL, - owner_owner_owner_oid NVARCHAR(36) COLLATE database_default NOT NULL, - relation NVARCHAR(157) COLLATE database_default NOT NULL, - targetOid NVARCHAR(36) COLLATE database_default NOT NULL, - targetType INT, - PRIMARY KEY (owner_id, owner_owner_id, owner_owner_owner_oid, relation, targetOid) -); - -CREATE INDEX iCertWorkItemRefTargetOid ON m_acc_cert_wi_reference (targetOid); - -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 INT; - -CREATE INDEX iShadowKind ON m_shadow (kind); - -CREATE INDEX iShadowIntent ON m_shadow (intent); - -CREATE INDEX iShadowObjectClass ON m_shadow (objectClass); - -CREATE INDEX iShadowFailedOperationType ON m_shadow (failedOperationType); - -CREATE INDEX iShadowSyncSituation ON m_shadow (synchronizationSituation); - -CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount); - -CREATE TABLE m_operation_execution ( - id INT NOT NULL, - owner_oid NVARCHAR(36) COLLATE database_default NOT NULL, - initiatorRef_relation NVARCHAR(157) COLLATE database_default, - initiatorRef_targetOid NVARCHAR(36) COLLATE database_default, - initiatorRef_type INT, - status INT, - taskRef_relation NVARCHAR(157) COLLATE database_default, - taskRef_targetOid NVARCHAR(36) COLLATE database_default, - taskRef_type INT, - timestampValue DATETIME2, - PRIMARY KEY (id, owner_oid) -); - -CREATE INDEX iOpExecTaskOid - ON m_operation_execution (taskRef_targetOid); - -CREATE INDEX iOpExecInitiatorOid - ON m_operation_execution (initiatorRef_targetOid); - -CREATE INDEX iOpExecStatus - ON m_operation_execution (status); - -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 NVARCHAR(255) COLLATE database_default; -ALTER TABLE m_audit_event ADD remoteHostAddress NVARCHAR(255) COLLATE database_default; \ No newline at end of file diff --git a/config/sql/_all/sqlserver-upgrade-3.6-3.7.sql b/config/sql/_all/sqlserver-upgrade-3.6-3.7.sql index 565daf2a3d9..a6d748fe253 100644 --- a/config/sql/_all/sqlserver-upgrade-3.6-3.7.sql +++ b/config/sql/_all/sqlserver-upgrade-3.6-3.7.sql @@ -1,2 +1,32 @@ ALTER TABLE QRTZ_TRIGGERS ADD EXECUTION_GROUP VARCHAR (200) NULL; -ALTER TABLE QRTZ_FIRED_TRIGGERS ADD EXECUTION_GROUP VARCHAR (200) NULL; \ No newline at end of file +ALTER TABLE QRTZ_FIRED_TRIGGERS ADD EXECUTION_GROUP VARCHAR (200) NULL; + +CREATE TABLE m_function_library ( + 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) +); + +ALTER TABLE m_function_library + ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm); + +ALTER TABLE m_function_library + ADD CONSTRAINT fk_function_library +FOREIGN KEY (oid) +REFERENCES m_object; + +ALTER TABLE m_abstract_role ADD autoassign_enabled BIT; + +CREATE INDEX iAutoassignEnabled + ON m_abstract_role (autoassign_enabled); + +ALTER TABLE m_task + ADD CONSTRAINT uc_task_identifier UNIQUE (taskIdentifier); + +ALTER TABLE m_audit_event ADD attorneyName NVARCHAR(255) COLLATE database_default; +ALTER TABLE m_audit_event ADD attorneyOid NVARCHAR(36) COLLATE database_default; +ALTER TABLE m_audit_event ADD initiatorType INT; + +CREATE INDEX iOpExecOwnerOid + ON m_operation_execution (owner_oid); diff --git a/config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql b/config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql deleted file mode 100644 index 0344cbd8517..00000000000 --- a/config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql +++ /dev/null @@ -1,200 +0,0 @@ -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; - -ALTER TABLE m_form - ADD CONSTRAINT uc_form_name UNIQUE (name_norm); - -ALTER TABLE m_form - ADD CONSTRAINT fk_form -FOREIGN KEY (oid) -REFERENCES m_object (oid); - -CREATE TABLE m_audit_prop_value ( - id BIGINT NOT NULL, - name VARCHAR(255), - record_id BIGINT, - value VARCHAR(1024), - PRIMARY KEY (id) -) - DEFAULT CHARACTER SET utf8 - COLLATE utf8_bin - ENGINE = InnoDB; - -CREATE TABLE m_audit_ref_value ( - id BIGINT NOT NULL, - name VARCHAR(255), - oid VARCHAR(255), - record_id BIGINT, - targetName_norm VARCHAR(255), - targetName_orig VARCHAR(255), - type VARCHAR(255), - PRIMARY KEY (id) -) - DEFAULT CHARACTER SET utf8 - COLLATE utf8_bin - ENGINE = InnoDB; - -CREATE INDEX iAuditPropValRecordId - ON m_audit_prop_value (record_id); - -CREATE INDEX iAuditRefValRecordId - ON m_audit_ref_value (record_id); - -ALTER TABLE m_audit_prop_value - ADD CONSTRAINT fk_audit_prop_value -FOREIGN KEY (record_id) -REFERENCES m_audit_event (id); - -ALTER TABLE m_audit_ref_value - ADD CONSTRAINT fk_audit_ref_value -FOREIGN KEY (record_id) -REFERENCES m_audit_event (id); - -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; - -ALTER TABLE m_object_text_info - ADD CONSTRAINT fk_object_text_info_owner -FOREIGN KEY (owner_oid) -REFERENCES m_object (oid); - -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; - -ALTER TABLE m_case - ADD CONSTRAINT uc_case_name UNIQUE (name_norm); - -ALTER TABLE m_case - ADD CONSTRAINT fk_case -FOREIGN KEY (oid) -REFERENCES m_object (oid); - -ALTER TABLE m_assignment_reference CHANGE containerType targetType INTEGER; -ALTER TABLE m_reference CHANGE containerType targetType INTEGER; - -DROP TABLE m_acc_cert_case_reference; - -ALTER TABLE m_acc_cert_case CHANGE currentStageNumber stageNumber INTEGER; -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 COLUMN currentStageOutcome VARCHAR(255); -ALTER TABLE m_acc_cert_case ADD COLUMN outcome VARCHAR(255); - -DROP TABLE m_acc_cert_decision; - -CREATE TABLE m_acc_cert_wi ( - id INTEGER NOT NULL, - owner_id INTEGER NOT NULL, - owner_owner_oid VARCHAR(36) NOT NULL, - closeTimestamp DATETIME(6), - outcome VARCHAR(255), - outputChangeTimestamp DATETIME(6), - performerRef_relation VARCHAR(157), - performerRef_targetOid VARCHAR(36), - performerRef_type INTEGER, - stageNumber INTEGER, - PRIMARY KEY (id, owner_id, owner_owner_oid) -) - DEFAULT CHARACTER SET utf8 - COLLATE utf8_bin - ENGINE = InnoDB; - -CREATE TABLE m_acc_cert_wi_reference ( - owner_id INTEGER NOT NULL, - owner_owner_id INTEGER NOT NULL, - owner_owner_owner_oid VARCHAR(36) NOT NULL, - relation VARCHAR(157) NOT NULL, - targetOid VARCHAR(36) NOT NULL, - targetType INTEGER, - PRIMARY KEY (owner_id, owner_owner_id, owner_owner_owner_oid, relation, targetOid) -) - DEFAULT CHARACTER SET utf8 - COLLATE utf8_bin - ENGINE = InnoDB; - -CREATE INDEX iCertWorkItemRefTargetOid ON m_acc_cert_wi_reference (targetOid); - -ALTER TABLE m_acc_cert_case DROP FOREIGN KEY 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 (oid); - -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 (id, owner_oid); - -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 (id, owner_id, owner_owner_oid); - -ALTER TABLE m_shadow ADD COLUMN pendingOperationCount INTEGER; - -CREATE INDEX iShadowKind ON m_shadow (kind); - -CREATE INDEX iShadowIntent ON m_shadow (intent); - -CREATE INDEX iShadowObjectClass ON m_shadow (objectClass); - -CREATE INDEX iShadowFailedOperationType ON m_shadow (failedOperationType); - -CREATE INDEX iShadowSyncSituation ON m_shadow (synchronizationSituation); - -CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount); - -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 INDEX iOpExecTaskOid - ON m_operation_execution (taskRef_targetOid); - -CREATE INDEX iOpExecInitiatorOid - ON m_operation_execution (initiatorRef_targetOid); - -CREATE INDEX iOpExecStatus - ON m_operation_execution (status); - -ALTER TABLE m_operation_execution - ADD CONSTRAINT fk_op_exec_owner -FOREIGN KEY (owner_oid) -REFERENCES m_object (oid); - -ALTER TABLE m_audit_event ADD COLUMN nodeIdentifier VARCHAR(255); -ALTER TABLE m_audit_event ADD COLUMN remoteHostAddress VARCHAR(255); 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/sqlserver/sqlserver-upgrade-3.5-3.6.sql b/config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql deleted file mode 100644 index 22278d50bc2..00000000000 --- a/config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql +++ /dev/null @@ -1,176 +0,0 @@ -CREATE TABLE m_form ( - 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) -); - -ALTER TABLE m_form - ADD CONSTRAINT uc_form_name UNIQUE (name_norm); - -ALTER TABLE m_form - ADD CONSTRAINT fk_form -FOREIGN KEY (oid) -REFERENCES m_object; - -CREATE TABLE m_audit_prop_value ( - id BIGINT NOT NULL, - name NVARCHAR(255) COLLATE database_default, - record_id BIGINT, - value NVARCHAR(1024) COLLATE database_default, - PRIMARY KEY (id) -); - -CREATE TABLE m_audit_ref_value ( - id BIGINT NOT NULL, - name NVARCHAR(255) COLLATE database_default, - oid NVARCHAR(255) COLLATE database_default, - record_id BIGINT, - targetName_norm NVARCHAR(255) COLLATE database_default, - targetName_orig NVARCHAR(255) COLLATE database_default, - type NVARCHAR(255) COLLATE database_default, - PRIMARY KEY (id) -); - -CREATE INDEX iAuditPropValRecordId - ON m_audit_prop_value (record_id); - -CREATE INDEX iAuditRefValRecordId - ON m_audit_ref_value (record_id); - -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 NVARCHAR(36) COLLATE database_default NOT NULL, - text NVARCHAR(255) COLLATE database_default NOT NULL, - PRIMARY KEY (owner_oid, text) -); - -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 NVARCHAR(255) COLLATE database_default, - name_orig NVARCHAR(255) COLLATE database_default, - oid NVARCHAR(36) COLLATE database_default NOT NULL, - PRIMARY KEY (oid) -); - -ALTER TABLE m_case - ADD CONSTRAINT uc_case_name UNIQUE (name_norm); - -ALTER TABLE m_case - ADD CONSTRAINT fk_case -FOREIGN KEY (oid) -REFERENCES m_object; - -EXEC sp_rename 'm_assignment_reference.containerType', 'targetType', 'COLUMN'; -EXEC sp_rename 'm_reference.containerType', 'targetType', 'COLUMN'; - -DROP TABLE m_acc_cert_case_reference; - -EXEC sp_rename 'm_acc_cert_case.currentStageNumber', 'stageNumber', 'COLUMN'; -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 NVARCHAR(255) COLLATE database_default; -ALTER TABLE m_acc_cert_case ADD outcome NVARCHAR(255) COLLATE database_default; - -DROP TABLE m_acc_cert_decision; - -CREATE TABLE m_acc_cert_wi ( - id INT NOT NULL, - owner_id INT NOT NULL, - owner_owner_oid NVARCHAR(36) COLLATE database_default NOT NULL, - closeTimestamp DATETIME2, - outcome NVARCHAR(255) COLLATE database_default, - outputChangeTimestamp DATETIME2, - performerRef_relation NVARCHAR(157) COLLATE database_default, - performerRef_targetOid NVARCHAR(36) COLLATE database_default, - performerRef_type INT, - stageNumber INT, - PRIMARY KEY (id, owner_id, owner_owner_oid) -); - -CREATE TABLE m_acc_cert_wi_reference ( - owner_id INT NOT NULL, - owner_owner_id INT NOT NULL, - owner_owner_owner_oid NVARCHAR(36) COLLATE database_default NOT NULL, - relation NVARCHAR(157) COLLATE database_default NOT NULL, - targetOid NVARCHAR(36) COLLATE database_default NOT NULL, - targetType INT, - PRIMARY KEY (owner_id, owner_owner_id, owner_owner_owner_oid, relation, targetOid) -); - -CREATE INDEX iCertWorkItemRefTargetOid ON m_acc_cert_wi_reference (targetOid); - -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 INT; - -CREATE INDEX iShadowKind ON m_shadow (kind); - -CREATE INDEX iShadowIntent ON m_shadow (intent); - -CREATE INDEX iShadowObjectClass ON m_shadow (objectClass); - -CREATE INDEX iShadowFailedOperationType ON m_shadow (failedOperationType); - -CREATE INDEX iShadowSyncSituation ON m_shadow (synchronizationSituation); - -CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount); - -CREATE TABLE m_operation_execution ( - id INT NOT NULL, - owner_oid NVARCHAR(36) COLLATE database_default NOT NULL, - initiatorRef_relation NVARCHAR(157) COLLATE database_default, - initiatorRef_targetOid NVARCHAR(36) COLLATE database_default, - initiatorRef_type INT, - status INT, - taskRef_relation NVARCHAR(157) COLLATE database_default, - taskRef_targetOid NVARCHAR(36) COLLATE database_default, - taskRef_type INT, - timestampValue DATETIME2, - PRIMARY KEY (id, owner_oid) -); - -CREATE INDEX iOpExecTaskOid - ON m_operation_execution (taskRef_targetOid); - -CREATE INDEX iOpExecInitiatorOid - ON m_operation_execution (initiatorRef_targetOid); - -CREATE INDEX iOpExecStatus - ON m_operation_execution (status); - -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 NVARCHAR(255) COLLATE database_default; -ALTER TABLE m_audit_event ADD remoteHostAddress NVARCHAR(255) COLLATE database_default; \ No newline at end of file diff --git a/config/sql/midpoint/3.6/mysql/mysql-3.6.sql b/config/sql/midpoint/3.7/mysql/mysql-3.7.sql similarity index 100% rename from config/sql/midpoint/3.6/mysql/mysql-3.6.sql rename to config/sql/midpoint/3.7/mysql/mysql-3.7.sql diff --git a/config/sql/midpoint/3.7/mysql/mysql-upgrade-3.6-3.7.sql b/config/sql/midpoint/3.7/mysql/mysql-upgrade-3.6-3.7.sql index 082d76a409b..2b661900f7d 100644 --- a/config/sql/midpoint/3.7/mysql/mysql-upgrade-3.6-3.7.sql +++ b/config/sql/midpoint/3.7/mysql/mysql-upgrade-3.6-3.7.sql @@ -27,3 +27,6 @@ ALTER TABLE m_task ALTER TABLE m_audit_event ADD COLUMN attorneyName VARCHAR(255); ALTER TABLE m_audit_event ADD COLUMN attorneyOid VARCHAR(36); ALTER TABLE m_audit_event ADD COLUMN initiatorType INTEGER; + +CREATE INDEX iOpExecOwnerOid + ON m_operation_execution (owner_oid); 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; diff --git a/config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql b/config/sql/midpoint/3.7/sqlserver/sqlserver-3.7.sql similarity index 99% rename from config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql rename to config/sql/midpoint/3.7/sqlserver/sqlserver-3.7.sql index 578afa5c05f..c3db730167f 100644 --- a/config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql +++ b/config/sql/midpoint/3.7/sqlserver/sqlserver-3.7.sql @@ -1359,3 +1359,4 @@ CREATE TABLE hibernate_sequence ( ); INSERT INTO hibernate_sequence VALUES (1); + diff --git a/config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.6-3.7.sql b/config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.6-3.7.sql index 8c31d1a0684..55bb62224a4 100644 --- a/config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.6-3.7.sql +++ b/config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.6-3.7.sql @@ -24,3 +24,6 @@ ALTER TABLE m_task ALTER TABLE m_audit_event ADD attorneyName NVARCHAR(255) COLLATE database_default; ALTER TABLE m_audit_event ADD attorneyOid NVARCHAR(36) COLLATE database_default; ALTER TABLE m_audit_event ADD initiatorType INT; + +CREATE INDEX iOpExecOwnerOid + ON m_operation_execution (owner_oid); diff --git a/config/sql/quartz/tables_h2.sql b/config/sql/quartz/tables_h2.sql index 30994a1ca16..030d265da53 100644 --- a/config/sql/quartz/tables_h2.sql +++ b/config/sql/quartz/tables_h2.sql @@ -31,6 +31,7 @@ CREATE TABLE QRTZ_FIRED_TRIGGERS ( FIRED_TIME BIGINT NOT NULL , SCHED_TIME BIGINT NOT NULL , PRIORITY INTEGER NOT NULL , + EXECUTION_GROUP VARCHAR(200) NULL, STATE VARCHAR (16) NOT NULL, JOB_NAME VARCHAR (200) NULL , JOB_GROUP VARCHAR (200) NULL , @@ -112,7 +113,7 @@ CREATE TABLE QRTZ_TRIGGERS ( NEXT_FIRE_TIME BIGINT NULL , PREV_FIRE_TIME BIGINT NULL , PRIORITY INTEGER NULL , - REQUIRED_CAP VARCHAR(200) NULL, + EXECUTION_GROUP VARCHAR(200) NULL, TRIGGER_STATE VARCHAR (16) NOT NULL , TRIGGER_TYPE VARCHAR (8) NOT NULL , START_TIME BIGINT NOT NULL , diff --git a/config/sql/quartz/tables_mysql.sql b/config/sql/quartz/tables_mysql.sql index 6ae52e39e01..0c379972c97 100644 --- a/config/sql/quartz/tables_mysql.sql +++ b/config/sql/quartz/tables_mysql.sql @@ -46,7 +46,7 @@ CREATE TABLE QRTZ_TRIGGERS NEXT_FIRE_TIME BIGINT(13) NULL, PREV_FIRE_TIME BIGINT(13) NULL, PRIORITY INTEGER NULL, - REQUIRED_CAP VARCHAR(200) NULL, + EXECUTION_GROUP VARCHAR(200) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME BIGINT(13) NOT NULL, @@ -141,6 +141,7 @@ CREATE TABLE QRTZ_FIRED_TRIGGERS FIRED_TIME BIGINT(13) NOT NULL, SCHED_TIME BIGINT(13) NOT NULL, PRIORITY INTEGER NOT NULL, + EXECUTION_GROUP VARCHAR(200) NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(200) NULL, JOB_GROUP VARCHAR(200) NULL, diff --git a/config/sql/quartz/tables_mysql_innodb.sql b/config/sql/quartz/tables_mysql_innodb.sql index 816db6ec288..f89111e2860 100644 --- a/config/sql/quartz/tables_mysql_innodb.sql +++ b/config/sql/quartz/tables_mysql_innodb.sql @@ -42,7 +42,7 @@ DESCRIPTION VARCHAR(250) NULL, NEXT_FIRE_TIME BIGINT(13) NULL, PREV_FIRE_TIME BIGINT(13) NULL, PRIORITY INTEGER NULL, -REQUIRED_CAP VARCHAR(200) NULL, +EXECUTION_GROUP VARCHAR(200) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME BIGINT(13) NOT NULL, @@ -132,6 +132,7 @@ INSTANCE_NAME VARCHAR(200) NOT NULL, FIRED_TIME BIGINT(13) NOT NULL, SCHED_TIME BIGINT(13) NOT NULL, PRIORITY INTEGER NOT NULL, +EXECUTION_GROUP VARCHAR(200) NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(200) NULL, JOB_GROUP VARCHAR(200) NULL, diff --git a/config/sql/quartz/tables_oracle.sql b/config/sql/quartz/tables_oracle.sql index 9605b070007..a5db202d113 100644 --- a/config/sql/quartz/tables_oracle.sql +++ b/config/sql/quartz/tables_oracle.sql @@ -50,7 +50,7 @@ CREATE TABLE qrtz_triggers NEXT_FIRE_TIME NUMBER(13) NULL, PREV_FIRE_TIME NUMBER(13) NULL, PRIORITY NUMBER(13) NULL, - REQUIRED_CAP VARCHAR2(200) NULL, + EXECUTION_GROUP VARCHAR2(200) NULL, TRIGGER_STATE VARCHAR2(16) NOT NULL, TRIGGER_TYPE VARCHAR2(8) NOT NULL, START_TIME NUMBER(13) NOT NULL, @@ -138,6 +138,7 @@ CREATE TABLE qrtz_fired_triggers FIRED_TIME NUMBER(13) NOT NULL, SCHED_TIME NUMBER(13) NOT NULL, PRIORITY NUMBER(13) NOT NULL, + EXECUTION_GROUP VARCHAR2(200) NULL, STATE VARCHAR2(16) NOT NULL, JOB_NAME VARCHAR2(200) NULL, JOB_GROUP VARCHAR2(200) NULL, diff --git a/config/sql/quartz/tables_postgres.sql b/config/sql/quartz/tables_postgres.sql index 2a2b346817f..6873a07228c 100644 --- a/config/sql/quartz/tables_postgres.sql +++ b/config/sql/quartz/tables_postgres.sql @@ -41,7 +41,7 @@ CREATE TABLE qrtz_triggers NEXT_FIRE_TIME BIGINT NULL, PREV_FIRE_TIME BIGINT NULL, PRIORITY INTEGER NULL, - REQUIRED_CAP VARCHAR(200) NULL, + EXECUTION_GROUP VARCHAR(200) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME BIGINT NOT NULL, @@ -137,6 +137,7 @@ CREATE TABLE qrtz_fired_triggers FIRED_TIME BIGINT NOT NULL, SCHED_TIME BIGINT NOT NULL, PRIORITY INTEGER NOT NULL, + EXECUTION_GROUP VARCHAR(200) NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(200) NULL, JOB_GROUP VARCHAR(200) NULL, diff --git a/config/sql/quartz/tables_sqlServer.sql b/config/sql/quartz/tables_sqlServer.sql index e221a673142..c66f5dc376c 100644 --- a/config/sql/quartz/tables_sqlServer.sql +++ b/config/sql/quartz/tables_sqlServer.sql @@ -112,6 +112,7 @@ CREATE TABLE [dbo].[QRTZ_FIRED_TRIGGERS] ( [FIRED_TIME] [BIGINT] NOT NULL , [SCHED_TIME] [BIGINT] NOT NULL , [PRIORITY] [INTEGER] NOT NULL , + [EXECUTION_GROUP] [VARCHAR] (200) NULL , [STATE] [VARCHAR] (16) NOT NULL, [JOB_NAME] [VARCHAR] (200) NULL , [JOB_GROUP] [VARCHAR] (200) NULL , @@ -200,7 +201,7 @@ CREATE TABLE [dbo].[QRTZ_TRIGGERS] ( [NEXT_FIRE_TIME] [BIGINT] NULL , [PREV_FIRE_TIME] [BIGINT] NULL , [PRIORITY] [INTEGER] NULL , - [REQUIRED_CAP] [VARCHAR] (200) NULL , + [EXECUTION_GROUP] [VARCHAR] (200) NULL , [TRIGGER_STATE] [VARCHAR] (16) NOT NULL , [TRIGGER_TYPE] [VARCHAR] (8) NOT NULL , [START_TIME] [BIGINT] NOT NULL , diff --git a/dist/src/main/bin/springboot.sh b/dist/src/main/bin/springboot.sh index 910a176f1da..a174a9ea854 100755 --- a/dist/src/main/bin/springboot.sh +++ b/dist/src/main/bin/springboot.sh @@ -1,7 +1,26 @@ #!/bin/bash +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Parts of this file Copyright (c) 2017 Evolveum +# + SCRIPT_PATH=$(cd $(dirname "$0") && pwd -P)/$(basename "$2") USE_NOHUP="true" -JAVA_OPTS="$JAVA_OPTS -Xms2048M -Xmx2048M -XX:PermSize=128m -XX:MaxPermSize=256m -Dmidpoint.home=$SCRIPT_PATH../var" +if [ -z "$MIDPOINT_HOME" ] ; then + MIDPOINT_HOME="$SCRIPT_PATH../var" +fi +JAVA_OPTS="$JAVA_OPTS -Xms2048M -Xmx2048M -XX:PermSize=128m -XX:MaxPermSize=256m -Dmidpoint.home=$MIDPOINT_HOME" # resolve links - $0 may be a softlink PRG="$0" @@ -19,7 +38,7 @@ done # Get standard environment variables PRGDIR=`dirname "$PRG"` -cd "$PRGDIR/.." >/dev/null; pwd +cd "$PRGDIR/.." >/dev/null cd "$SCRIPT_PATH/.." @@ -28,8 +47,7 @@ if [ ! -d var ] ; then mkdir var/log fi -if [ -z "$BOOT_OUT" ] ; then - +if [ -z "$BOOT_OUT" ] ; then BOOT_OUT="$SCRIPT_PATH"../var/log/springboot.out fi @@ -72,13 +90,14 @@ if [ "$USE_NOHUP" = "true" ]; then _NOHUP=nohup fi + # ----- Execute The Requested Command ----------------------------------------- -if [ $have_tty -eq 1 ]; then - if [ ! -z "$SPRING_PID" ]; then - echo "Using SPRING_PID: $SPRING_PID" - fi -fi +#if [ $have_tty -eq 1 ]; then +# if [ ! -z "$SPRING_PID" ]; then +# echo "Using SPRING_PID: $SPRING_PID" +# fi +#fi if [ "$1" = "start" ] ; then if [ ! -z "$SPRING_PID" ]; then @@ -124,6 +143,9 @@ if [ $? != 0 ]; then shift touch "$BOOT_OUT" +echo "Starting midPoint..." +echo "MIDPOINT_HOME=$MIDPOINT_HOME" + cd eval $_NOHUP "\"$_RUNJAVA\"" -jar $LOGGING_MANAGER $JAVA_OPTS \ $SCRIPT_PATH../lib/midpoint.war \ @@ -134,7 +156,6 @@ if [ ! -z "$SPRING_PID" ]; then echo $! > "$SPRING_PID" fi - echo "Starting midPoint..." elif [ "$1" = "stop" ] ; then diff --git a/dist/src/main/bin/start.sh b/dist/src/main/bin/start.sh index a85ca6dda7f..262a563abb2 100755 --- a/dist/src/main/bin/start.sh +++ b/dist/src/main/bin/start.sh @@ -1,4 +1,19 @@ #!/bin/sh +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Parts of this file Copyright (c) 2017 Evolveum +# # resolve links - $0 may be a softlink PRG="$0" diff --git a/dist/src/main/bin/stop.sh b/dist/src/main/bin/stop.sh index 847970d0476..f723233a68f 100755 --- a/dist/src/main/bin/stop.sh +++ b/dist/src/main/bin/stop.sh @@ -1,4 +1,19 @@ #!/bin/sh +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Parts of this file Copyright (c) 2017 Evolveum +# # resolve links - $0 may be a softlink PRG="$0" diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java index ef3e84170b3..858e18280eb 100755 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java @@ -22,6 +22,7 @@ import com.evolveum.midpoint.common.refinery.RefinedResourceSchema; import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl; import com.evolveum.midpoint.gui.api.util.ModelServiceLocator; +import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.prism.*; import com.evolveum.midpoint.prism.delta.builder.DeltaBuilder; import com.evolveum.midpoint.prism.path.ItemPath; @@ -373,7 +374,18 @@ private ReferenceWrapper createReferenceWrapper(PrismR if (QNameUtil.match(AbstractRoleType.F_APPROVER_REF, def.getName()) || QNameUtil.match(AbstractRoleType.F_APPROVER_REF, def.getName())) { refWrapper.setTargetTypes(Arrays.asList(FocusType.COMPLEX_TYPE, OrgType.COMPLEX_TYPE)); } else { - refWrapper.setTargetTypes(Arrays.asList(def.getTargetTypeName())); + + QName targetType = def.getTargetTypeName(); + + if (targetType == null || ObjectType.COMPLEX_TYPE.equals(targetType)) { + refWrapper.setTargetTypes(WebComponentUtil.createObjectTypeList()); + } else if (AbstractRoleType.COMPLEX_TYPE.equals(targetType)) { + refWrapper.setTargetTypes(WebComponentUtil.createAbstractRoleTypeList()); + } else if (FocusType.COMPLEX_TYPE.equals(targetType)) { + refWrapper.setTargetTypes(WebComponentUtil.createFocusTypeList()); + } else { + refWrapper.setTargetTypes(Arrays.asList(def.getTargetTypeName())); + } } return refWrapper; diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd index e8ff040a26d..c018fa0a7cf 100644 --- a/infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd +++ b/infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd @@ -523,9 +523,9 @@ range of roles - assuming that runtime resolution is used.

- - c:AbstractRoleType - + + tns:AbstractRoleType + diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java index 59f3d4f32db..74732cb66e1 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java +++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java @@ -711,6 +711,12 @@ public void testConnection(PrismObject resource, Task task, Operat testConnectionConnector(connectorSpec, capabilityMap, task, connectorTestResult); connectorTestResult.computeStatus(); + + if (!connectorTestResult.isAcceptable()) { + //nothing more to do.. if it failed while testing connection, status is set. + // we do not need to continue and waste the time. + return; + } } // === test SCHEMA === diff --git a/testing/longtest/pom.xml b/testing/longtest/pom.xml index 7d554d43367..09941b74de2 100644 --- a/testing/longtest/pom.xml +++ b/testing/longtest/pom.xml @@ -132,6 +132,11 @@ 3.7-SNAPSHOT runtime + + com.evolveum.icf + dummy-resource + 3.7-SNAPSHOT + com.evolveum.midpoint.repo repo-test-util