Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
1azyman committed Nov 20, 2017
2 parents 25cc046 + a3e9d73 commit 056b547
Show file tree
Hide file tree
Showing 96 changed files with 3,933 additions and 1,148 deletions.
28 changes: 28 additions & 0 deletions config/sql/midpoint/3.6/h2/h2-3.6.sql
@@ -1,5 +1,6 @@
CREATE TABLE m_abstract_role (
approvalProcess VARCHAR(255),
autoassign_enabled BOOLEAN,
displayName_norm VARCHAR(255),
displayName_orig VARCHAR(255),
identifier VARCHAR(255),
Expand Down Expand Up @@ -266,13 +267,16 @@ 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,
eventType INTEGER,
hostIdentifier VARCHAR(255),
initiatorName VARCHAR(255),
initiatorOid VARCHAR(36),
initiatorType INTEGER,
message VARCHAR(1024),
nodeIdentifier VARCHAR(255),
outcome INTEGER,
Expand Down Expand Up @@ -395,6 +399,13 @@ CREATE TABLE m_form (
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),
Expand Down Expand Up @@ -802,6 +813,9 @@ CREATE INDEX iAbstractRoleIdentifier ON m_abstract_role (identifier);

CREATE INDEX iRequestable ON m_abstract_role (requestable);

CREATE INDEX iAutoassignEnabled
ON m_abstract_role (autoassign_enabled);

ALTER TABLE m_acc_cert_campaign
ADD CONSTRAINT uc_acc_cert_campaign_name UNIQUE (name_norm);

Expand Down Expand Up @@ -867,6 +881,9 @@ CREATE INDEX iFocusEffective ON m_focus (effectiveStatus);
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);

Expand Down Expand Up @@ -925,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);

Expand Down Expand Up @@ -974,6 +994,9 @@ CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount);
ALTER TABLE m_system_configuration
ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm);

ALTER TABLE m_task
ADD CONSTRAINT uc_task_identifier UNIQUE (taskIdentifier);

CREATE INDEX iParent ON m_task (parent);

CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId);
Expand Down Expand Up @@ -1146,6 +1169,11 @@ ALTER TABLE m_form
FOREIGN KEY (oid)
REFERENCES m_object;

ALTER TABLE m_function_library
ADD CONSTRAINT fk_function_library
FOREIGN KEY (oid)
REFERENCES m_object;

ALTER TABLE m_generic_object
ADD CONSTRAINT fk_generic_object
FOREIGN KEY (oid)
Expand Down
31 changes: 31 additions & 0 deletions config/sql/midpoint/3.6/mysql/mysql-3.6.sql
Expand Up @@ -13,6 +13,7 @@

CREATE TABLE m_abstract_role (
approvalProcess VARCHAR(255),
autoassign_enabled BIT,
displayName_norm VARCHAR(255),
displayName_orig VARCHAR(255),
identifier VARCHAR(255),
Expand Down Expand Up @@ -330,13 +331,16 @@ 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,
eventType INTEGER,
hostIdentifier VARCHAR(255),
initiatorName VARCHAR(255),
initiatorOid VARCHAR(36),
initiatorType INTEGER,
message VARCHAR(1024),
nodeIdentifier VARCHAR(255),
outcome INTEGER,
Expand Down Expand Up @@ -498,6 +502,16 @@ CREATE TABLE m_form (
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),
Expand Down Expand Up @@ -1013,6 +1027,9 @@ CREATE INDEX iAbstractRoleIdentifier ON m_abstract_role (identifier);

CREATE INDEX iRequestable ON m_abstract_role (requestable);

CREATE INDEX iAutoassignEnabled
ON m_abstract_role (autoassign_enabled);

ALTER TABLE m_acc_cert_campaign
ADD CONSTRAINT uc_acc_cert_campaign_name UNIQUE (name_norm);

Expand Down Expand Up @@ -1078,6 +1095,9 @@ CREATE INDEX iFocusEffective ON m_focus (effectiveStatus);
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);

Expand Down Expand Up @@ -1136,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);

Expand Down Expand Up @@ -1187,6 +1210,9 @@ CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount);
ALTER TABLE m_system_configuration
ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm);

ALTER TABLE m_task
ADD CONSTRAINT uc_task_identifier UNIQUE (taskIdentifier);

CREATE INDEX iParent ON m_task (parent);

CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId);
Expand Down Expand Up @@ -1359,6 +1385,11 @@ ALTER TABLE m_form
FOREIGN KEY (oid)
REFERENCES m_object (oid);

ALTER TABLE m_function_library
ADD CONSTRAINT fk_function_library
FOREIGN KEY (oid)
REFERENCES m_object (oid);

ALTER TABLE m_generic_object
ADD CONSTRAINT fk_generic_object
FOREIGN KEY (oid)
Expand Down
28 changes: 28 additions & 0 deletions config/sql/midpoint/3.6/oracle/oracle-3.6.sql
Expand Up @@ -3,6 +3,7 @@

CREATE TABLE m_abstract_role (
approvalProcess VARCHAR2(255 CHAR),
autoassign_enabled NUMBER(1, 0),
displayName_norm VARCHAR2(255 CHAR),
displayName_orig VARCHAR2(255 CHAR),
identifier VARCHAR2(255 CHAR),
Expand Down Expand Up @@ -269,13 +270,16 @@ 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),
eventType NUMBER(10, 0),
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),
Expand Down Expand Up @@ -398,6 +402,13 @@ CREATE TABLE m_form (
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),
Expand Down Expand Up @@ -812,6 +823,9 @@ CREATE INDEX iAbstractRoleIdentifier ON m_abstract_role (identifier) INITRANS 30

CREATE INDEX iRequestable ON m_abstract_role (requestable) INITRANS 30;

CREATE INDEX iAutoassignEnabled
ON m_abstract_role (autoassign_enabled) INITRANS 30;

ALTER TABLE m_acc_cert_campaign
ADD CONSTRAINT uc_acc_cert_campaign_name UNIQUE (name_norm) INITRANS 30;

Expand Down Expand Up @@ -877,6 +891,9 @@ CREATE INDEX iFocusEffective ON m_focus (effectiveStatus) INITRANS 30;
ALTER TABLE m_form
ADD CONSTRAINT uc_form_name UNIQUE (name_norm) INITRANS 30;

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;

Expand Down Expand Up @@ -935,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;

Expand Down Expand Up @@ -984,6 +1004,9 @@ CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount) IN
ALTER TABLE m_system_configuration
ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm) INITRANS 30;

ALTER TABLE m_task
ADD CONSTRAINT uc_task_identifier UNIQUE (taskIdentifier) INITRANS 30;

CREATE INDEX iParent ON m_task (parent) INITRANS 30;

CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId) INITRANS 30;
Expand Down Expand Up @@ -1156,6 +1179,11 @@ ALTER TABLE m_form
FOREIGN KEY (oid)
REFERENCES m_object;

ALTER TABLE m_function_library
ADD CONSTRAINT fk_function_library
FOREIGN KEY (oid)
REFERENCES m_object;

ALTER TABLE m_generic_object
ADD CONSTRAINT fk_generic_object
FOREIGN KEY (oid)
Expand Down
28 changes: 28 additions & 0 deletions config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
@@ -1,5 +1,6 @@
CREATE TABLE m_abstract_role (
approvalProcess VARCHAR(255),
autoassign_enabled BOOLEAN,
displayName_norm VARCHAR(255),
displayName_orig VARCHAR(255),
identifier VARCHAR(255),
Expand Down Expand Up @@ -266,13 +267,16 @@ CREATE TABLE m_audit_delta (

CREATE TABLE m_audit_event (
id INT8 NOT NULL,
attorneyName VARCHAR(255),
attorneyOid VARCHAR(36),
channel VARCHAR(255),
eventIdentifier VARCHAR(255),
eventStage INT4,
eventType INT4,
hostIdentifier VARCHAR(255),
initiatorName VARCHAR(255),
initiatorOid VARCHAR(36),
initiatorType INT4,
message VARCHAR(1024),
nodeIdentifier VARCHAR(255),
outcome INT4,
Expand Down Expand Up @@ -395,6 +399,13 @@ CREATE TABLE m_form (
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),
Expand Down Expand Up @@ -802,6 +813,9 @@ CREATE INDEX iAbstractRoleIdentifier ON m_abstract_role (identifier);

CREATE INDEX iRequestable ON m_abstract_role (requestable);

CREATE INDEX iAutoassignEnabled
ON m_abstract_role (autoassign_enabled);

ALTER TABLE m_acc_cert_campaign
ADD CONSTRAINT uc_acc_cert_campaign_name UNIQUE (name_norm);

Expand Down Expand Up @@ -867,6 +881,9 @@ CREATE INDEX iFocusEffective ON m_focus (effectiveStatus);
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);

Expand Down Expand Up @@ -925,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);

Expand Down Expand Up @@ -974,6 +994,9 @@ CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount);
ALTER TABLE m_system_configuration
ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm);

ALTER TABLE m_task
ADD CONSTRAINT uc_task_identifier UNIQUE (taskIdentifier);

CREATE INDEX iParent ON m_task (parent);

CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId);
Expand Down Expand Up @@ -1146,6 +1169,11 @@ ALTER TABLE m_form
FOREIGN KEY (oid)
REFERENCES m_object;

ALTER TABLE m_function_library
ADD CONSTRAINT fk_function_library
FOREIGN KEY (oid)
REFERENCES m_object;

ALTER TABLE m_generic_object
ADD CONSTRAINT fk_generic_object
FOREIGN KEY (oid)
Expand Down

0 comments on commit 056b547

Please sign in to comment.