Merge remote-tracking branch 'origin/master' into feature/hibernate5

Evolveum · Dec 5, 2017 · 0c188e7 · 0c188e7
2 parents 5d81c76 + f276d68
commit 0c188e7
Show file tree

Hide file tree

Showing 129 changed files with 1,957 additions and 9,257 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -76,7 +76,7 @@
         <jdbc.postgres>9.4.1212.jre7</jdbc.postgres>
         <jdbc.mariadb>1.5.5</jdbc.mariadb>
         <jdbc.mysql>6.0.5</jdbc.mysql>
-        <wicket.version>7.8.0</wicket.version>
+        <wicket.version>7.9.0</wicket.version>
         <groovy.version>2.4.0</groovy.version>
         <activiti-engine.version>5.22.0</activiti-engine.version>
         <activiti-spring.version>5.22.0</activiti-spring.version>

diff --git a/config/sql/_all/h2-3.7-all.sql b/config/sql/_all/h2-3.7-all.sql
@@ -271,13 +271,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,
@@ -872,9 +875,6 @@ CREATE INDEX iAuditRefValRecordId
 ALTER TABLE m_case
   ADD CONSTRAINT uc_case_name UNIQUE (name_norm);
 
-ALTER TABLE m_function_library
-  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm);
-
 ALTER TABLE m_connector_host
 ADD CONSTRAINT uc_connector_host_name UNIQUE (name_norm);
 
@@ -885,6 +885,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);
 
@@ -943,6 +946,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);
 
@@ -993,7 +999,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);
 
@@ -1127,11 +1133,6 @@ ALTER TABLE m_case
 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_connector
 ADD CONSTRAINT fk_connector
 FOREIGN KEY (oid)
@@ -1172,6 +1173,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)

diff --git a/config/sql/_all/h2-upgrade-3.5-3.6.sql b/config/sql/_all/h2-upgrade-3.5-3.6.sql
diff --git a/config/sql/_all/h2-upgrade-3.6-3.7-quartz.sql b/config/sql/_all/h2-upgrade-3.6-3.7-quartz.sql
@@ -0,0 +1,2 @@
+ALTER TABLE QRTZ_TRIGGERS ADD COLUMN EXECUTION_GROUP VARCHAR(200) NULL;
+ALTER TABLE QRTZ_FIRED_TRIGGERS ADD COLUMN EXECUTION_GROUP VARCHAR(200) NULL;
diff --git a/config/sql/_all/h2-upgrade-3.6-3.7.sql b/config/sql/_all/h2-upgrade-3.6-3.7.sql
@@ -1,2 +1,29 @@
-ALTER TABLE QRTZ_TRIGGERS ADD COLUMN EXECUTION_GROUP VARCHAR(200) NULL;
-ALTER TABLE QRTZ_FIRED_TRIGGERS ADD COLUMN EXECUTION_GROUP VARCHAR(200) NULL;
+CREATE TABLE m_function_library (
+  name_norm VARCHAR(255),
+  name_orig VARCHAR(255),
+  oid       VARCHAR(36) 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 COLUMN autoassign_enabled BOOLEAN;
+
+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/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);