Merge branch 'master' into feature/metadata-serialization

Evolveum · Jun 25, 2020 · f32998e · f32998e
2 parents a43635d + 2ee8f55
commit f32998e
Show file tree

Hide file tree

Showing 199 changed files with 2,423 additions and 3,682 deletions.
diff --git a/config/sql/h2-4.2-all.sql b/config/sql/h2-4.2-all.sql
@@ -3,21 +3,21 @@
 -- If you want to add Quartz-related tables, please use files from quartz directory.
 
 CREATE TABLE m_acc_cert_campaign (
-  definitionRef_relation  VARCHAR(157),
-  definitionRef_targetOid VARCHAR(36),
-  definitionRef_type      INTEGER,
-  endTimestamp            TIMESTAMP,
-  handlerUri              VARCHAR(255),
-  iteration               INTEGER     NOT NULL,
-  name_norm               VARCHAR(255),
-  name_orig               VARCHAR(255),
-  ownerRef_relation       VARCHAR(157),
-  ownerRef_targetOid      VARCHAR(36),
-  ownerRef_type           INTEGER,
-  stageNumber             INTEGER,
-  startTimestamp          TIMESTAMP,
-  state                   INTEGER,
-  oid                     VARCHAR(36) NOT NULL,
+  definitionRef_relation    VARCHAR(157),
+  definitionRef_targetOid   VARCHAR(36),
+  definitionRef_targetType  INTEGER,
+  endTimestamp              TIMESTAMP,
+  handlerUri                VARCHAR(255),
+  iteration                 INTEGER     NOT NULL,
+  name_norm                 VARCHAR(255),
+  name_orig                 VARCHAR(255),
+  ownerRef_relation         VARCHAR(157),
+  ownerRef_targetOid        VARCHAR(36),
+  ownerRef_type             INTEGER,
+  stageNumber               INTEGER,
+  startTimestamp            TIMESTAMP,
+  state                     INTEGER,
+  oid                       VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 );
 CREATE TABLE m_acc_cert_case (
@@ -1184,6 +1184,6 @@ ALTER TABLE m_user
 ALTER TABLE m_value_policy
   ADD CONSTRAINT fk_value_policy FOREIGN KEY (oid) REFERENCES m_object;
 
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.0');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.2');
 
 COMMIT;
diff --git a/config/sql/h2-upgrade-4.0-4.2.sql b/config/sql/h2-upgrade-4.0-4.2.sql
@@ -0,0 +1,12 @@
+-- 2020-05-29 09:20
+
+CREATE INDEX iOpExecTimestampValue
+  ON m_operation_execution (timestampValue);
+
+UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
+
+-- 2020-06-25 11:35
+
+ALTER TABLE m_acc_cert_campaign ALTER COLUMN definitionRef_type RENAME TO definitionRef_targetType;
+
+COMMIT;
diff --git a/config/sql/h2-upgrade-4.1-4.2.sql b/config/sql/h2-upgrade-4.1-4.2.sql
diff --git a/config/sql/mysql-4.2-all-utf8mb4.sql b/config/sql/mysql-4.2-all-utf8mb4.sql
@@ -1,21 +1,21 @@
 -- remove iAncestor and iDescendant index, they are the same as FK for that fields
 
 CREATE TABLE m_acc_cert_campaign (
-  definitionRef_relation  VARCHAR(157),
-  definitionRef_targetOid VARCHAR(36) CHARSET utf8 COLLATE utf8_bin,
-  definitionRef_type      INTEGER,
-  endTimestamp            DATETIME(6),
-  handlerUri              VARCHAR(255),
-  iteration               INTEGER     NOT NULL,
-  name_norm               VARCHAR(191),
-  name_orig               VARCHAR(191),
-  ownerRef_relation       VARCHAR(157),
-  ownerRef_targetOid      VARCHAR(36) CHARSET utf8 COLLATE utf8_bin ,
-  ownerRef_type           INTEGER,
-  stageNumber             INTEGER,
-  startTimestamp          DATETIME(6),
-  state                   INTEGER,
-  oid                     VARCHAR(36) CHARSET utf8 COLLATE utf8_bin NOT NULL,
+  definitionRef_relation    VARCHAR(157),
+  definitionRef_targetOid   VARCHAR(36) CHARSET utf8 COLLATE utf8_bin,
+  definitionRef_targetType  INTEGER,
+  endTimestamp              DATETIME(6),
+  handlerUri                VARCHAR(255),
+  iteration                 INTEGER     NOT NULL,
+  name_norm                 VARCHAR(191),
+  name_orig                 VARCHAR(191),
+  ownerRef_relation         VARCHAR(157),
+  ownerRef_targetOid        VARCHAR(36) CHARSET utf8 COLLATE utf8_bin ,
+  ownerRef_type             INTEGER,
+  stageNumber               INTEGER,
+  startTimestamp            DATETIME(6),
+  state                     INTEGER,
+  oid                       VARCHAR(36) CHARSET utf8 COLLATE utf8_bin NOT NULL,
   PRIMARY KEY (oid)
 )
   DEFAULT CHARACTER SET utf8mb4
@@ -1406,7 +1406,7 @@ ALTER TABLE m_user
 ALTER TABLE m_value_policy
   ADD CONSTRAINT fk_value_policy FOREIGN KEY (oid) REFERENCES m_object (oid);
 
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.0');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.2');
 
 # By: Ron Cordell - roncordell
 #  I didn't see this anywhere, so I thought I'd post it here. This is the script from Quartz to create the tables in a MySQL database, modified to use INNODB instead of MYISAM.

diff --git a/config/sql/mysql-4.2-all.sql b/config/sql/mysql-4.2-all.sql
@@ -1,21 +1,21 @@
 -- remove iAncestor and iDescendant index, they are the same as FK for that fields
 
 CREATE TABLE m_acc_cert_campaign (
-  definitionRef_relation  VARCHAR(157),
-  definitionRef_targetOid VARCHAR(36),
-  definitionRef_type      INTEGER,
-  endTimestamp            DATETIME(6),
-  handlerUri              VARCHAR(255),
-  iteration               INTEGER     NOT NULL,
-  name_norm               VARCHAR(255),
-  name_orig               VARCHAR(255),
-  ownerRef_relation       VARCHAR(157),
-  ownerRef_targetOid      VARCHAR(36),
-  ownerRef_type           INTEGER,
-  stageNumber             INTEGER,
-  startTimestamp          DATETIME(6),
-  state                   INTEGER,
-  oid                     VARCHAR(36) NOT NULL,
+  definitionRef_relation    VARCHAR(157),
+  definitionRef_targetOid   VARCHAR(36),
+  definitionRef_targetType  INTEGER,
+  endTimestamp              DATETIME(6),
+  handlerUri                VARCHAR(255),
+  iteration                 INTEGER     NOT NULL,
+  name_norm                 VARCHAR(255),
+  name_orig                 VARCHAR(255),
+  ownerRef_relation         VARCHAR(157),
+  ownerRef_targetOid        VARCHAR(36),
+  ownerRef_type             INTEGER,
+  stageNumber               INTEGER,
+  startTimestamp            DATETIME(6),
+  state                     INTEGER,
+  oid                       VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 )
   DEFAULT CHARACTER SET utf8
@@ -1406,7 +1406,7 @@ ALTER TABLE m_user
 ALTER TABLE m_value_policy
   ADD CONSTRAINT fk_value_policy FOREIGN KEY (oid) REFERENCES m_object (oid);
 
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.0');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.2');
 
 # By: Ron Cordell - roncordell
 #  I didn't see this anywhere, so I thought I'd post it here. This is the script from Quartz to create the tables in a MySQL database, modified to use INNODB instead of MYISAM.

diff --git a/config/sql/mysql-upgrade-4.0-4.2-utf8mb4.sql b/config/sql/mysql-upgrade-4.0-4.2-utf8mb4.sql
@@ -0,0 +1,12 @@
+-- 2020-05-29 09:20
+
+CREATE INDEX iOpExecTimestampValue
+  ON m_operation_execution (timestampValue);
+
+UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
+
+-- 2020-06-25 11:35
+
+ALTER TABLE m_acc_cert_campaign CHANGE definitionRef_type definitionRef_targetType INTEGER;
+
+COMMIT;
diff --git a/config/sql/mysql-upgrade-4.0-4.2.sql b/config/sql/mysql-upgrade-4.0-4.2.sql
@@ -0,0 +1,12 @@
+-- 2020-05-29 09:20
+
+CREATE INDEX iOpExecTimestampValue
+  ON m_operation_execution (timestampValue);
+
+UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
+
+-- 2020-06-25 11:35
+
+ALTER TABLE m_acc_cert_campaign CHANGE definitionRef_type definitionRef_targetType INTEGER;
+
+COMMIT;
diff --git a/config/sql/mysql-upgrade-4.1-4.2-utf8mb4.sql b/config/sql/mysql-upgrade-4.1-4.2-utf8mb4.sql
diff --git a/config/sql/mysql-upgrade-4.1-4.2.sql b/config/sql/mysql-upgrade-4.1-4.2.sql
diff --git a/config/sql/oracle-4.0-all.sql → config/sql/oracle-4.2-all.sql b/config/sql/oracle-4.0-all.sql → config/sql/oracle-4.2-all.sql
@@ -1,19 +1,19 @@
 CREATE TABLE m_acc_cert_campaign (
-  definitionRef_relation  VARCHAR2(157 CHAR),
-  definitionRef_targetOid VARCHAR2(36 CHAR),
-  definitionRef_type      NUMBER(10, 0),
-  endTimestamp            TIMESTAMP,
-  handlerUri              VARCHAR2(255 CHAR),
-  iteration               NUMBER(10, 0)     NOT NULL,
-  name_norm               VARCHAR2(255 CHAR),
-  name_orig               VARCHAR2(255 CHAR),
-  ownerRef_relation       VARCHAR2(157 CHAR),
-  ownerRef_targetOid      VARCHAR2(36 CHAR),
-  ownerRef_type           NUMBER(10, 0),
-  stageNumber             NUMBER(10, 0),
-  startTimestamp          TIMESTAMP,
-  state                   NUMBER(10, 0),
-  oid                     VARCHAR2(36 CHAR) NOT NULL,
+  definitionRef_relation    VARCHAR2(157 CHAR),
+  definitionRef_targetOid   VARCHAR2(36 CHAR),
+  definitionRef_targetType  NUMBER(10, 0),
+  endTimestamp              TIMESTAMP,
+  handlerUri                VARCHAR2(255 CHAR),
+  iteration                 NUMBER(10, 0)     NOT NULL,
+  name_norm                 VARCHAR2(255 CHAR),
+  name_orig                 VARCHAR2(255 CHAR),
+  ownerRef_relation         VARCHAR2(157 CHAR),
+  ownerRef_targetOid        VARCHAR2(36 CHAR),
+  ownerRef_type             NUMBER(10, 0),
+  stageNumber               NUMBER(10, 0),
+  startTimestamp            TIMESTAMP,
+  state                     NUMBER(10, 0),
+  oid                       VARCHAR2(36 CHAR) NOT NULL,
   PRIMARY KEY (oid)
 ) INITRANS 30;
 CREATE TABLE m_acc_cert_case (
@@ -1208,7 +1208,7 @@ CREATE INDEX iOrgOrgTypeOid ON M_ORG_ORG_TYPE(ORG_OID) INITRANS 30;
 CREATE INDEX iServiceTypeOid ON M_SERVICE_TYPE(SERVICE_OID) INITRANS 30;
 CREATE INDEX iTaskDependentOid ON M_TASK_DEPENDENT(TASK_OID) INITRANS 30;
 
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.0');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.2');
 
 --
 -- A hint submitted by a user: Oracle DB MUST be created as "shared" and the

diff --git a/config/sql/oracle-upgrade-4.0-4.2.sql b/config/sql/oracle-upgrade-4.0-4.2.sql
@@ -0,0 +1,12 @@
+-- 2020-05-29 09:20
+
+CREATE INDEX iOpExecTimestampValue
+  ON m_operation_execution (timestampValue) INITRANS 30;
+
+UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
+
+-- 2020-06-25 11:35
+
+ALTER TABLE m_acc_cert_campaign RENAME COLUMN definitionRef_type TO definitionRef_targetType;
+
+COMMIT;
diff --git a/config/sql/oracle-upgrade-4.1-4.2.sql b/config/sql/oracle-upgrade-4.1-4.2.sql
diff --git a/config/sql/postgresql-4.0-all.sql → config/sql/postgresql-4.2-all.sql b/config/sql/postgresql-4.0-all.sql → config/sql/postgresql-4.2-all.sql
@@ -1,19 +1,19 @@
 CREATE TABLE m_acc_cert_campaign (
-  definitionRef_relation  VARCHAR(157),
-  definitionRef_targetOid VARCHAR(36),
-  definitionRef_type      INT4,
-  endTimestamp            TIMESTAMP,
-  handlerUri              VARCHAR(255),
-  iteration               INT4        NOT NULL,
-  name_norm               VARCHAR(255),
-  name_orig               VARCHAR(255),
-  ownerRef_relation       VARCHAR(157),
-  ownerRef_targetOid      VARCHAR(36),
-  ownerRef_type           INT4,
-  stageNumber             INT4,
-  startTimestamp          TIMESTAMP,
-  state                   INT4,
-  oid                     VARCHAR(36) NOT NULL,
+  definitionRef_relation    VARCHAR(157),
+  definitionRef_targetOid   VARCHAR(36),
+  definitionRef_targetType  INT4,
+  endTimestamp              TIMESTAMP,
+  handlerUri                VARCHAR(255),
+  iteration                 INT4        NOT NULL,
+  name_norm                 VARCHAR(255),
+  name_orig                 VARCHAR(255),
+  ownerRef_relation         VARCHAR(157),
+  ownerRef_targetOid        VARCHAR(36),
+  ownerRef_type             INT4,
+  stageNumber               INT4,
+  startTimestamp            TIMESTAMP,
+  state                     INT4,
+  oid                       VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 );
 CREATE TABLE m_acc_cert_case (
@@ -1203,7 +1203,7 @@ CREATE INDEX iOrgOrgTypeOid ON M_ORG_ORG_TYPE(ORG_OID);
 CREATE INDEX iServiceTypeOid ON M_SERVICE_TYPE(SERVICE_OID);
 CREATE INDEX iTaskDependentOid ON M_TASK_DEPENDENT(TASK_OID);
 
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.0');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.2');
 
 -- Thanks to Patrick Lightbody for submitting this...
 --

diff --git a/config/sql/postgresql-upgrade-4.0-4.2.sql b/config/sql/postgresql-upgrade-4.0-4.2.sql
@@ -0,0 +1,12 @@
+-- 2020-05-29 09:20
+
+CREATE INDEX iOpExecTimestampValue
+  ON m_operation_execution (timestampValue);
+
+UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
+
+-- 2020-06-25 11:35
+
+ALTER TABLE m_acc_cert_campaign RENAME COLUMN definitionRef_type TO definitionRef_targetType;
+
+COMMIT;
diff --git a/config/sql/postgresql-upgrade-4.1-4.2.sql b/config/sql/postgresql-upgrade-4.1-4.2.sql
diff --git a/config/sql/sqlserver-4.0-all.sql → config/sql/sqlserver-4.2-all.sql b/config/sql/sqlserver-4.0-all.sql → config/sql/sqlserver-4.2-all.sql
@@ -1,19 +1,19 @@
 CREATE TABLE m_acc_cert_campaign (
-  definitionRef_relation  NVARCHAR(157) COLLATE database_default,
-  definitionRef_targetOid NVARCHAR(36) COLLATE database_default,
-  definitionRef_type      INT,
-  endTimestamp            DATETIME2,
-  handlerUri              NVARCHAR(255) COLLATE database_default,
-  iteration               INT                                   NOT NULL,
-  name_norm               NVARCHAR(255) COLLATE database_default,
-  name_orig               NVARCHAR(255) COLLATE database_default,
-  ownerRef_relation       NVARCHAR(157) COLLATE database_default,
-  ownerRef_targetOid      NVARCHAR(36) COLLATE database_default,
-  ownerRef_type           INT,
-  stageNumber             INT,
-  startTimestamp          DATETIME2,
-  state                   INT,
-  oid                     NVARCHAR(36) COLLATE database_default NOT NULL,
+  definitionRef_relation    NVARCHAR(157) COLLATE database_default,
+  definitionRef_targetOid   NVARCHAR(36) COLLATE database_default,
+  definitionRef_targetType  INT,
+  endTimestamp              DATETIME2,
+  handlerUri                NVARCHAR(255) COLLATE database_default,
+  iteration                 INT                                   NOT NULL,
+  name_norm                 NVARCHAR(255) COLLATE database_default,
+  name_orig                 NVARCHAR(255) COLLATE database_default,
+  ownerRef_relation         NVARCHAR(157) COLLATE database_default,
+  ownerRef_targetOid        NVARCHAR(36) COLLATE database_default,
+  ownerRef_type             INT,
+  stageNumber               INT,
+  startTimestamp            DATETIME2,
+  state                     INT,
+  oid                       NVARCHAR(36) COLLATE database_default NOT NULL,
   PRIMARY KEY (oid)
 );
 CREATE TABLE m_acc_cert_case (
@@ -1183,7 +1183,7 @@ ALTER TABLE m_value_policy
   ADD CONSTRAINT fk_value_policy FOREIGN KEY (oid) REFERENCES m_object;
 
 BEGIN TRANSACTION
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.0');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.2');
 COMMIT;
 
 --# thanks to George Papastamatopoulos for submitting this ... and Marko Lahma for

diff --git a/config/sql/sqlserver-upgrade-4.0-4.2.sql b/config/sql/sqlserver-upgrade-4.0-4.2.sql
@@ -0,0 +1,14 @@
+-- 2020-05-29 09:20
+
+CREATE INDEX iOpExecTimestampValue
+  ON m_operation_execution (timestampValue);
+
+BEGIN TRANSACTION
+UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
+COMMIT;
+
+-- 2020-06-25 11:35
+
+UPDATE m_acc_cert_campaign SET definitionRef_type = convert(INT, definitionRef_targetType) where definitionRef_targetType is not null;
+
+GO
diff --git a/config/sql/sqlserver-upgrade-4.1-4.2.sql b/config/sql/sqlserver-upgrade-4.1-4.2.sql
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ItemPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ItemPanel.java
@@ -63,7 +63,7 @@ protected void onInitialize() {
 
     private void initLayout() {
 
-        //ugly hack TODO FIME - prism context is lost during srialization/deserialization.. find better way how to do it.
+        //ugly hack TODO FIME - prism context is lost during serialization/deserialization.. find better way how to do it.
         if (getModelObject() != null) {
             getModelObject().revive(getPrismContext());
         }