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

Evolveum · Sep 2, 2019 · 031673c · 031673c
2 parents 8447c0e + bb410a7
commit 031673c
Show file tree

Hide file tree

Showing 57 changed files with 1,039 additions and 282 deletions.
diff --git a/config/sql/_all/h2-4.0-all.sql b/config/sql/_all/h2-4.0-all.sql
@@ -180,12 +180,6 @@ CREATE TABLE m_assignment_ext_string (
 CREATE TABLE m_assignment_extension (
   owner_id        INTEGER     NOT NULL,
   owner_owner_oid VARCHAR(36) NOT NULL,
-  booleansCount   SMALLINT,
-  datesCount      SMALLINT,
-  longsCount      SMALLINT,
-  polysCount      SMALLINT,
-  referencesCount SMALLINT,
-  stringsCount    SMALLINT,
   PRIMARY KEY (owner_owner_oid, owner_id)
 );
 CREATE TABLE m_assignment_policy_situation (
@@ -293,10 +287,11 @@ CREATE TABLE m_case_wi (
 CREATE TABLE m_case_wi_reference (
   owner_id        INTEGER      NOT NULL,
   owner_owner_oid VARCHAR(36)  NOT NULL,
+  reference_type  INTEGER      NOT NULL,
   relation        VARCHAR(157) NOT NULL,
   targetOid       VARCHAR(36)  NOT NULL,
   targetType      INTEGER,
-  PRIMARY KEY (owner_owner_oid, owner_id, targetOid, relation)
+  PRIMARY KEY (owner_owner_oid, owner_id, reference_type, targetOid, relation)
 );
 CREATE TABLE m_connector_target_system (
   connector_oid    VARCHAR(36) NOT NULL,
@@ -320,16 +315,13 @@ CREATE TABLE m_focus_policy_situation (
 );
 CREATE TABLE m_object (
   oid                   VARCHAR(36) NOT NULL,
-  booleansCount         SMALLINT,
   createChannel         VARCHAR(255),
   createTimestamp       TIMESTAMP,
   creatorRef_relation   VARCHAR(157),
   creatorRef_targetOid  VARCHAR(36),
   creatorRef_type       INTEGER,
-  datesCount            SMALLINT,
   fullObject            BLOB,
   lifecycleState        VARCHAR(255),
-  longsCount            SMALLINT,
   modifierRef_relation  VARCHAR(157),
   modifierRef_targetOid VARCHAR(36),
   modifierRef_type      INTEGER,
@@ -338,9 +330,6 @@ CREATE TABLE m_object (
   name_norm             VARCHAR(255),
   name_orig             VARCHAR(255),
   objectTypeClass       INTEGER,
-  polysCount            SMALLINT,
-  referencesCount       SMALLINT,
-  stringsCount          SMALLINT,
   tenantRef_relation    VARCHAR(157),
   tenantRef_targetOid   VARCHAR(36),
   tenantRef_type        INTEGER,

diff --git a/config/sql/_all/h2-upgrade-3.9-4.0.sql b/config/sql/_all/h2-upgrade-3.9-4.0.sql
@@ -98,3 +98,29 @@ ALTER TABLE m_audit_resource
 -- 2019-07-30 11:30
 
 ALTER TABLE m_audit_item ALTER COLUMN changedItemPath VARCHAR(900);
+
+-- 2019-08-30 12:32
+
+ALTER TABLE m_case_wi_reference ADD COLUMN reference_type  INTEGER;
+UPDATE m_case_wi_reference SET reference_type = 0 WHERE reference_type IS NULL;
+ALTER TABLE m_case_wi_reference ALTER COLUMN reference_type  INTEGER NOT NULL;
+
+ALTER TABLE m_case_wi_reference DROP CONSTRAINT fk_case_wi_reference_owner;
+ALTER TABLE m_case_wi_reference DROP PRIMARY KEY;
+ALTER TABLE m_case_wi_reference ADD PRIMARY KEY (owner_owner_oid, owner_id, reference_type, targetOid, relation);
+ALTER TABLE m_case_wi_reference
+  ADD CONSTRAINT fk_case_wi_reference_owner FOREIGN KEY (owner_owner_oid, owner_id) REFERENCES m_case_wi (owner_oid, id);
+
+ALTER TABLE m_assignment_extension DROP COLUMN IF EXISTS booleansCount;
+ALTER TABLE m_assignment_extension DROP COLUMN IF EXISTS datesCount;
+ALTER TABLE m_assignment_extension DROP COLUMN IF EXISTS longsCount;
+ALTER TABLE m_assignment_extension DROP COLUMN IF EXISTS polysCount;
+ALTER TABLE m_assignment_extension DROP COLUMN IF EXISTS referencesCount;
+ALTER TABLE m_assignment_extension DROP COLUMN IF EXISTS stringsCount;
+
+ALTER TABLE m_object DROP COLUMN IF EXISTS booleansCount;
+ALTER TABLE m_object DROP COLUMN IF EXISTS datesCount;
+ALTER TABLE m_object DROP COLUMN IF EXISTS longsCount;
+ALTER TABLE m_object DROP COLUMN IF EXISTS polysCount;
+ALTER TABLE m_object DROP COLUMN IF EXISTS referencesCount;
+ALTER TABLE m_object DROP COLUMN IF EXISTS stringsCount;
diff --git a/config/sql/_all/mysql-4.0-all-utf8mb4.sql b/config/sql/_all/mysql-4.0-all-utf8mb4.sql
@@ -214,12 +214,6 @@ CREATE TABLE m_assignment_ext_string (
 CREATE TABLE m_assignment_extension (
   owner_id        INTEGER     NOT NULL,
   owner_owner_oid VARCHAR(36) CHARSET utf8 COLLATE utf8_bin  NOT NULL,
-  booleansCount   SMALLINT,
-  datesCount      SMALLINT,
-  longsCount      SMALLINT,
-  polysCount      SMALLINT,
-  referencesCount SMALLINT,
-  stringsCount    SMALLINT,
   PRIMARY KEY (owner_owner_oid, owner_id)
 )
   DEFAULT CHARACTER SET utf8mb4
@@ -358,10 +352,11 @@ CREATE TABLE m_case_wi (
 CREATE TABLE m_case_wi_reference (
   owner_id        INTEGER      NOT NULL,
   owner_owner_oid VARCHAR(36)  CHARSET utf8 COLLATE utf8_bin NOT NULL,
+  reference_type  INTEGER      NOT NULL,
   relation        VARCHAR(157) NOT NULL,
   targetOid       VARCHAR(36)  CHARSET utf8 COLLATE utf8_bin NOT NULL,
   targetType      INTEGER,
-  PRIMARY KEY (owner_owner_oid, owner_id, targetOid, relation)
+  PRIMARY KEY (owner_owner_oid, owner_id, reference_type, targetOid, relation)
 )
   DEFAULT CHARACTER SET utf8mb4
   COLLATE utf8mb4_bin
@@ -400,16 +395,13 @@ CREATE TABLE m_focus_policy_situation (
   ENGINE = InnoDB;
 CREATE TABLE m_object (
   oid                   VARCHAR(36) CHARSET utf8 COLLATE utf8_bin  NOT NULL,
-  booleansCount         SMALLINT,
   createChannel         VARCHAR(255),
   createTimestamp       DATETIME(6),
   creatorRef_relation   VARCHAR(157),
   creatorRef_targetOid  VARCHAR(36) CHARSET utf8 COLLATE utf8_bin ,
   creatorRef_type       INTEGER,
-  datesCount            SMALLINT,
   fullObject            LONGBLOB,
   lifecycleState        VARCHAR(191),
-  longsCount            SMALLINT,
   modifierRef_relation  VARCHAR(157),
   modifierRef_targetOid VARCHAR(36) CHARSET utf8 COLLATE utf8_bin ,
   modifierRef_type      INTEGER,
@@ -418,9 +410,6 @@ CREATE TABLE m_object (
   name_norm             VARCHAR(191),
   name_orig             VARCHAR(191),
   objectTypeClass       INTEGER,
-  polysCount            SMALLINT,
-  referencesCount       SMALLINT,
-  stringsCount          SMALLINT,
   tenantRef_relation    VARCHAR(157),
   tenantRef_targetOid   VARCHAR(36) CHARSET utf8 COLLATE utf8_bin ,
   tenantRef_type        INTEGER,

diff --git a/config/sql/_all/mysql-4.0-all.sql b/config/sql/_all/mysql-4.0-all.sql
@@ -214,12 +214,6 @@ CREATE TABLE m_assignment_ext_string (
 CREATE TABLE m_assignment_extension (
   owner_id        INTEGER     NOT NULL,
   owner_owner_oid VARCHAR(36) NOT NULL,
-  booleansCount   SMALLINT,
-  datesCount      SMALLINT,
-  longsCount      SMALLINT,
-  polysCount      SMALLINT,
-  referencesCount SMALLINT,
-  stringsCount    SMALLINT,
   PRIMARY KEY (owner_owner_oid, owner_id)
 )
   DEFAULT CHARACTER SET utf8
@@ -357,10 +351,11 @@ CREATE TABLE m_case_wi (
 CREATE TABLE m_case_wi_reference (
   owner_id        INTEGER      NOT NULL,
   owner_owner_oid VARCHAR(36)  NOT NULL,
+  reference_type  INTEGER      NOT NULL,
   relation        VARCHAR(157) NOT NULL,
   targetOid       VARCHAR(36)  NOT NULL,
   targetType      INTEGER,
-  PRIMARY KEY (owner_owner_oid, owner_id, targetOid, relation)
+  PRIMARY KEY (owner_owner_oid, owner_id, reference_type, targetOid, relation)
 )
   DEFAULT CHARACTER SET utf8
   COLLATE utf8_bin
@@ -399,16 +394,13 @@ CREATE TABLE m_focus_policy_situation (
   ENGINE = InnoDB;
 CREATE TABLE m_object (
   oid                   VARCHAR(36) NOT NULL,
-  booleansCount         SMALLINT,
   createChannel         VARCHAR(255),
   createTimestamp       DATETIME(6),
   creatorRef_relation   VARCHAR(157),
   creatorRef_targetOid  VARCHAR(36),
   creatorRef_type       INTEGER,
-  datesCount            SMALLINT,
   fullObject            LONGBLOB,
   lifecycleState        VARCHAR(255),
-  longsCount            SMALLINT,
   modifierRef_relation  VARCHAR(157),
   modifierRef_targetOid VARCHAR(36),
   modifierRef_type      INTEGER,
@@ -417,9 +409,6 @@ CREATE TABLE m_object (
   name_norm             VARCHAR(255),
   name_orig             VARCHAR(255),
   objectTypeClass       INTEGER,
-  polysCount            SMALLINT,
-  referencesCount       SMALLINT,
-  stringsCount          SMALLINT,
   tenantRef_relation    VARCHAR(157),
   tenantRef_targetOid   VARCHAR(36),
   tenantRef_type        INTEGER,

diff --git a/config/sql/_all/mysql-upgrade-3.9-4.0-utf8mb4.sql b/config/sql/_all/mysql-upgrade-3.9-4.0-utf8mb4.sql
@@ -108,3 +108,49 @@ CREATE INDEX iAuditResourceOidRecordId
   ON m_audit_resource (record_id);
 ALTER TABLE m_audit_resource
   ADD CONSTRAINT fk_audit_resource FOREIGN KEY (record_id) REFERENCES m_audit_event (id);
+
+-- 2019-08-30 12:32
+
+ALTER TABLE m_case_wi_reference ADD COLUMN reference_type  INTEGER NOT NULL DEFAULT 0;
+
+ALTER TABLE m_case_wi_reference DROP PRIMARY KEY, ADD PRIMARY KEY(owner_owner_oid, owner_id, reference_type, targetOid, relation);
+
+ALTER TABLE m_assignment_extension DROP COLUMN booleansCount;
+ALTER TABLE m_assignment_extension DROP COLUMN datesCount;
+ALTER TABLE m_assignment_extension DROP COLUMN longsCount;
+ALTER TABLE m_assignment_extension DROP COLUMN polysCount;
+ALTER TABLE m_assignment_extension DROP COLUMN referencesCount;
+ALTER TABLE m_assignment_extension DROP COLUMN stringsCount;
+
+ALTER TABLE m_object DROP COLUMN booleansCount;
+ALTER TABLE m_object DROP COLUMN datesCount;
+ALTER TABLE m_object DROP COLUMN longsCount;
+ALTER TABLE m_object DROP COLUMN polysCount;
+ALTER TABLE m_object DROP COLUMN referencesCount;
+ALTER TABLE m_object DROP COLUMN stringsCount;
+
+DROP TABLE act_evt_log;
+DROP TABLE act_ge_property;
+DROP TABLE act_hi_actinst;
+DROP TABLE act_hi_attachment;
+DROP TABLE act_hi_comment;
+DROP TABLE act_hi_detail;
+DROP TABLE act_hi_identitylink;
+DROP TABLE act_hi_procinst;
+DROP TABLE act_hi_taskinst;
+DROP TABLE act_hi_varinst;
+DROP TABLE act_id_info;
+DROP TABLE act_id_membership;
+DROP TABLE act_id_group;
+DROP TABLE act_id_user;
+DROP TABLE act_procdef_info;
+DROP TABLE act_re_model;
+DROP TABLE act_ru_event_subscr;
+DROP TABLE act_ru_identitylink;
+DROP TABLE act_ru_job;
+DROP TABLE act_ru_task;
+DROP TABLE act_ru_variable;
+DROP TABLE act_ge_bytearray;
+DROP TABLE act_re_deployment;
+DROP TABLE act_ru_execution;
+DROP TABLE act_re_procdef;
diff --git a/config/sql/_all/mysql-upgrade-3.9-4.0.sql b/config/sql/_all/mysql-upgrade-3.9-4.0.sql
@@ -108,3 +108,49 @@ CREATE INDEX iAuditResourceOidRecordId
   ON m_audit_resource (record_id);
 ALTER TABLE m_audit_resource
   ADD CONSTRAINT fk_audit_resource FOREIGN KEY (record_id) REFERENCES m_audit_event (id);
+
+-- 2019-08-30 12:32
+
+ALTER TABLE m_case_wi_reference ADD COLUMN reference_type  INTEGER NOT NULL DEFAULT 0;
+
+ALTER TABLE m_case_wi_reference DROP PRIMARY KEY, ADD PRIMARY KEY(owner_owner_oid, owner_id, reference_type, targetOid, relation);
+
+ALTER TABLE m_assignment_extension DROP COLUMN booleansCount;
+ALTER TABLE m_assignment_extension DROP COLUMN datesCount;
+ALTER TABLE m_assignment_extension DROP COLUMN longsCount;
+ALTER TABLE m_assignment_extension DROP COLUMN polysCount;
+ALTER TABLE m_assignment_extension DROP COLUMN referencesCount;
+ALTER TABLE m_assignment_extension DROP COLUMN stringsCount;
+
+ALTER TABLE m_object DROP COLUMN booleansCount;
+ALTER TABLE m_object DROP COLUMN datesCount;
+ALTER TABLE m_object DROP COLUMN longsCount;
+ALTER TABLE m_object DROP COLUMN polysCount;
+ALTER TABLE m_object DROP COLUMN referencesCount;
+ALTER TABLE m_object DROP COLUMN stringsCount;
+
+DROP TABLE act_evt_log;
+DROP TABLE act_ge_property;
+DROP TABLE act_hi_actinst;
+DROP TABLE act_hi_attachment;
+DROP TABLE act_hi_comment;
+DROP TABLE act_hi_detail;
+DROP TABLE act_hi_identitylink;
+DROP TABLE act_hi_procinst;
+DROP TABLE act_hi_taskinst;
+DROP TABLE act_hi_varinst;
+DROP TABLE act_id_info;
+DROP TABLE act_id_membership;
+DROP TABLE act_id_group;
+DROP TABLE act_id_user;
+DROP TABLE act_procdef_info;
+DROP TABLE act_re_model;
+DROP TABLE act_ru_event_subscr;
+DROP TABLE act_ru_identitylink;
+DROP TABLE act_ru_job;
+DROP TABLE act_ru_task;
+DROP TABLE act_ru_variable;
+DROP TABLE act_ge_bytearray;
+DROP TABLE act_re_deployment;
+DROP TABLE act_ru_execution;
+DROP TABLE act_re_procdef;
diff --git a/config/sql/_all/oracle-4.0-all.sql b/config/sql/_all/oracle-4.0-all.sql
@@ -176,12 +176,6 @@ CREATE TABLE m_assignment_ext_string (
 CREATE TABLE m_assignment_extension (
   owner_id        NUMBER(10, 0)     NOT NULL,
   owner_owner_oid VARCHAR2(36 CHAR) NOT NULL,
-  booleansCount   NUMBER(5, 0),
-  datesCount      NUMBER(5, 0),
-  longsCount      NUMBER(5, 0),
-  polysCount      NUMBER(5, 0),
-  referencesCount NUMBER(5, 0),
-  stringsCount    NUMBER(5, 0),
   PRIMARY KEY (owner_owner_oid, owner_id)
 ) INITRANS 30;
 CREATE TABLE m_assignment_policy_situation (
@@ -289,10 +283,11 @@ CREATE TABLE m_case_wi (
 CREATE TABLE m_case_wi_reference (
   owner_id        NUMBER(10, 0)      NOT NULL,
   owner_owner_oid VARCHAR2(36 CHAR)  NOT NULL,
+  reference_type  NUMBER(10, 0)      NOT NULL,
   relation        VARCHAR2(157 CHAR) NOT NULL,
   targetOid       VARCHAR2(36 CHAR)  NOT NULL,
   targetType      NUMBER(10, 0),
-  PRIMARY KEY (owner_owner_oid, owner_id, targetOid, relation)
+  PRIMARY KEY (owner_owner_oid, owner_id, reference_type, targetOid, relation)
 ) INITRANS 30;
 CREATE TABLE m_connector_target_system (
   connector_oid    VARCHAR2(36 CHAR) NOT NULL,
@@ -316,16 +311,13 @@ CREATE TABLE m_focus_policy_situation (
 ) INITRANS 30;
 CREATE TABLE m_object (
   oid                   VARCHAR2(36 CHAR) NOT NULL,
-  booleansCount         NUMBER(5, 0),
   createChannel         VARCHAR2(255 CHAR),
   createTimestamp       TIMESTAMP,
   creatorRef_relation   VARCHAR2(157 CHAR),
   creatorRef_targetOid  VARCHAR2(36 CHAR),
   creatorRef_type       NUMBER(10, 0),
-  datesCount            NUMBER(5, 0),
   fullObject            BLOB,
   lifecycleState        VARCHAR2(255 CHAR),
-  longsCount            NUMBER(5, 0),
   modifierRef_relation  VARCHAR2(157 CHAR),
   modifierRef_targetOid VARCHAR2(36 CHAR),
   modifierRef_type      NUMBER(10, 0),
@@ -334,9 +326,6 @@ CREATE TABLE m_object (
   name_norm             VARCHAR2(255 CHAR),
   name_orig             VARCHAR2(255 CHAR),
   objectTypeClass       NUMBER(10, 0),
-  polysCount            NUMBER(5, 0),
-  referencesCount       NUMBER(5, 0),
-  stringsCount          NUMBER(5, 0),
   tenantRef_relation    VARCHAR2(157 CHAR),
   tenantRef_targetOid   VARCHAR2(36 CHAR),
   tenantRef_type        NUMBER(10, 0),

diff --git a/config/sql/_all/oracle-upgrade-3.9-4.0.sql b/config/sql/_all/oracle-upgrade-3.9-4.0.sql
@@ -125,3 +125,50 @@ ALTER TABLE m_audit_resource
 -- 2019-07-30 11:30
 
 ALTER TABLE m_audit_item MODIFY changedItemPath VARCHAR2(900 CHAR);
+
+-- 2019-08-30 12:32
+
+ALTER TABLE m_case_wi_reference ADD reference_type NUMBER(10, 0) DEFAULT 0 NOT NULL;
+
+ALTER TABLE m_case_wi_reference DROP PRIMARY KEY;
+ALTER TABLE m_case_wi_reference ADD PRIMARY KEY(owner_owner_oid, owner_id, reference_type, targetOid, relation);
+
+ALTER TABLE m_assignment_extension DROP COLUMN booleansCount;
+ALTER TABLE m_assignment_extension DROP COLUMN datesCount;
+ALTER TABLE m_assignment_extension DROP COLUMN longsCount;
+ALTER TABLE m_assignment_extension DROP COLUMN polysCount;
+ALTER TABLE m_assignment_extension DROP COLUMN referencesCount;
+ALTER TABLE m_assignment_extension DROP COLUMN stringsCount;
+
+ALTER TABLE m_object DROP COLUMN booleansCount;
+ALTER TABLE m_object DROP COLUMN datesCount;
+ALTER TABLE m_object DROP COLUMN longsCount;
+ALTER TABLE m_object DROP COLUMN polysCount;
+ALTER TABLE m_object DROP COLUMN referencesCount;
+ALTER TABLE m_object DROP COLUMN stringsCount;
+
+DROP TABLE act_evt_log;
+DROP TABLE act_ge_property;
+DROP TABLE act_hi_actinst;
+DROP TABLE act_hi_attachment;
+DROP TABLE act_hi_comment;
+DROP TABLE act_hi_detail;
+DROP TABLE act_hi_identitylink;
+DROP TABLE act_hi_procinst;
+DROP TABLE act_hi_taskinst;
+DROP TABLE act_hi_varinst;
+DROP TABLE act_id_info;
+DROP TABLE act_id_membership;
+DROP TABLE act_id_group;
+DROP TABLE act_id_user;
+DROP TABLE act_procdef_info;
+DROP TABLE act_re_model;
+DROP TABLE act_ru_event_subscr;
+DROP TABLE act_ru_identitylink;
+DROP TABLE act_ru_job;
+DROP TABLE act_ru_task;
+DROP TABLE act_ru_variable;
+DROP TABLE act_ge_bytearray;
+DROP TABLE act_re_deployment;
+DROP TABLE act_ru_execution;
+DROP TABLE act_re_procdef;