Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Apr 27, 2017 · e265a81 · e265a81
2 parents d6e8f13 + 614bce2
commit e265a81
Show file tree

Hide file tree

Showing 55 changed files with 1,729 additions and 249 deletions.
diff --git a/config/sql/midpoint/3.6/h2/h2-3.6.sql b/config/sql/midpoint/3.6/h2/h2-3.6.sql
@@ -540,6 +540,19 @@ CREATE TABLE m_object_text_info (
   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,
+  PRIMARY KEY (id, owner_oid)
+);
+
 CREATE TABLE m_org (
   costCenter       VARCHAR(255),
   displayOrder     INTEGER,
@@ -900,6 +913,15 @@ CREATE INDEX iExtensionStringDef ON m_object_ext_string (owner_oid, ownerType);
 ALTER TABLE m_object_template
 ADD CONSTRAINT uc_object_template_name UNIQUE (name_norm);
 
+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_org
 ADD CONSTRAINT uc_org_name UNIQUE (name_norm);
 
@@ -1181,6 +1203,11 @@ ALTER TABLE m_object_text_info
 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
 ADD CONSTRAINT fk_org
 FOREIGN KEY (oid)

diff --git a/config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql b/config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
@@ -142,3 +142,30 @@ 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,
+  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;
diff --git a/config/sql/midpoint/3.6/mysql/mysql-3.6.sql b/config/sql/midpoint/3.6/mysql/mysql-3.6.sql
@@ -682,6 +682,22 @@ CREATE TABLE m_object_text_info (
   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,
+  PRIMARY KEY (id, owner_oid)
+)
+  DEFAULT CHARACTER SET utf8
+  COLLATE utf8_bin
+  ENGINE = InnoDB;
+
 CREATE TABLE m_org (
   costCenter       VARCHAR(255),
   displayOrder     INTEGER,
@@ -1108,6 +1124,15 @@ CREATE INDEX iExtensionStringDef ON m_object_ext_string (owner_oid, ownerType);
 ALTER TABLE m_object_template
 ADD CONSTRAINT uc_object_template_name UNIQUE (name_norm);
 
+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_org
 ADD CONSTRAINT uc_org_name UNIQUE (name_norm);
 
@@ -1391,6 +1416,11 @@ ALTER TABLE m_object_text_info
 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
 ADD CONSTRAINT fk_org
 FOREIGN KEY (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
@@ -164,3 +164,33 @@ 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,
+  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);
diff --git a/config/sql/midpoint/3.6/oracle/oracle-3.6.sql b/config/sql/midpoint/3.6/oracle/oracle-3.6.sql
@@ -543,6 +543,19 @@ CREATE TABLE m_object_text_info (
   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),
+  PRIMARY KEY (id, owner_oid)
+) INITRANS 30;
+
 CREATE TABLE m_org (
   costCenter       VARCHAR2(255 CHAR),
   displayOrder     NUMBER(10, 0),
@@ -908,7 +921,16 @@ CREATE INDEX iExtensionString ON m_object_ext_string (ownerType, eName, stringVa
 CREATE INDEX iExtensionStringDef ON m_object_ext_string (owner_oid, ownerType) INITRANS 30;
 
 ALTER TABLE m_object_template
-ADD CONSTRAINT uc_object_template_name UNIQUE (name_norm) INITRANS 30;
+  ADD CONSTRAINT uc_object_template_name UNIQUE (name_norm) 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_org
 ADD CONSTRAINT uc_org_name UNIQUE (name_norm) INITRANS 30;
@@ -1191,6 +1213,11 @@ ALTER TABLE m_object_text_info
 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
 ADD CONSTRAINT fk_org
 FOREIGN KEY (oid)

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
@@ -143,4 +143,31 @@ CREATE INDEX iShadowFailedOperationType ON m_shadow (failedOperationType) INITRA
 
 CREATE INDEX iShadowSyncSituation ON m_shadow (synchronizationSituation) INITRANS 30;
 
-CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount) 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),
+  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;
diff --git a/config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql b/config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
@@ -540,6 +540,19 @@ CREATE TABLE m_object_text_info (
   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,
+  PRIMARY KEY (id, owner_oid)
+);
+
 CREATE TABLE m_org (
   costCenter       VARCHAR(255),
   displayOrder     INT4,
@@ -900,6 +913,15 @@ CREATE INDEX iExtensionStringDef ON m_object_ext_string (owner_oid, ownerType);
 ALTER TABLE m_object_template
 ADD CONSTRAINT uc_object_template_name UNIQUE (name_norm);
 
+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_org
 ADD CONSTRAINT uc_org_name UNIQUE (name_norm);
 
@@ -1181,6 +1203,11 @@ ALTER TABLE m_object_text_info
 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
 ADD CONSTRAINT fk_org
 FOREIGN KEY (oid)

diff --git a/config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql b/config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
@@ -143,3 +143,30 @@ 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                     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,
+  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;
diff --git a/config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql b/config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
@@ -540,6 +540,19 @@ CREATE TABLE m_object_text_info (
   PRIMARY KEY (owner_oid, text)
 );
 
+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,
+  PRIMARY KEY (id, owner_oid)
+);
+
 CREATE TABLE m_org (
   costCenter       NVARCHAR(255) COLLATE database_default,
   displayOrder     INT,
@@ -900,6 +913,15 @@ CREATE INDEX iExtensionStringDef ON m_object_ext_string (owner_oid, ownerType);
 ALTER TABLE m_object_template
 ADD CONSTRAINT uc_object_template_name UNIQUE (name_norm);
 
+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_org
 ADD CONSTRAINT uc_org_name UNIQUE (name_norm);
 
@@ -1181,6 +1203,11 @@ ALTER TABLE m_object_text_info
 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
 ADD CONSTRAINT fk_org
 FOREIGN KEY (oid)