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

Evolveum · Dec 5, 2017 · 43816ee · 43816ee
2 parents 1649dd4 + fa38d7e
commit 43816ee
Show file tree

Hide file tree

Showing 31 changed files with 216 additions and 1,139 deletions.
diff --git a/config/sql/_all/mysql-3.7-all.sql b/config/sql/_all/mysql-3.7-all.sql
@@ -331,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,
@@ -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
diff --git 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);
+  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
@@ -270,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),
@@ -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;