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

Evolveum · Dec 6, 2016 · 2eb41ec · 2eb41ec
2 parents 8828685 + 8280df6
commit 2eb41ec
Show file tree

Hide file tree

Showing 121 changed files with 2,244 additions and 1,156 deletions.
diff --git a/config/sql/_all/h2-3.4.1-all.sql → config/sql/_all/h2-3.5-all.sql b/config/sql/_all/h2-3.4.1-all.sql → config/sql/_all/h2-3.5-all.sql
@@ -125,6 +125,7 @@ CREATE TABLE m_assignment (
   creatorRef_relation     VARCHAR(157),
   creatorRef_targetOid    VARCHAR(36),
   creatorRef_type         INTEGER,
+  lifecycleState          VARCHAR(255),
   modifierRef_relation    VARCHAR(157),
   modifierRef_targetOid   VARCHAR(36),
   modifierRef_type        INTEGER,
@@ -235,6 +236,12 @@ CREATE TABLE m_assignment_extension (
   PRIMARY KEY (owner_id, owner_owner_oid)
 );
 
+CREATE TABLE m_assignment_policy_situation (
+  assignment_id   INTEGER     NOT NULL,
+  assignment_oid  VARCHAR(36) NOT NULL,
+  policySituation VARCHAR(255)
+);
+
 CREATE TABLE m_assignment_reference (
   owner_id        INTEGER      NOT NULL,
   owner_owner_oid VARCHAR(36)  NOT NULL,
@@ -286,6 +293,12 @@ CREATE TABLE m_audit_event (
   PRIMARY KEY (id)
 );
 
+CREATE TABLE m_audit_item (
+  changedItemPath VARCHAR(900) NOT NULL,
+  record_id       BIGINT       NOT NULL,
+  PRIMARY KEY (changedItemPath, record_id)
+);
+
 CREATE TABLE m_connector (
   connectorBundle            VARCHAR(255),
   connectorHostRef_relation  VARCHAR(157),
@@ -346,6 +359,11 @@ CREATE TABLE m_focus_photo (
   PRIMARY KEY (owner_oid)
 );
 
+CREATE TABLE m_focus_policy_situation (
+  focus_oid       VARCHAR(36) NOT NULL,
+  policySituation VARCHAR(255)
+);
+
 CREATE TABLE m_generic_object (
   name_norm  VARCHAR(255),
   name_orig  VARCHAR(255),
@@ -779,6 +797,8 @@ CREATE INDEX iAssignmentReferenceTargetOid ON m_assignment_reference (targetOid)
 
 CREATE INDEX iTimestampValue ON m_audit_event (timestampValue);
 
+CREATE INDEX iChangedItemPath ON m_audit_item (changedItemPath);
+
 ALTER TABLE m_connector_host
 ADD CONSTRAINT uc_connector_host_name UNIQUE (name_norm);
 
@@ -969,6 +989,11 @@ ADD CONSTRAINT fk_assignment_ext_string
 FOREIGN KEY (anyContainer_owner_id, anyContainer_owner_owner_oid)
 REFERENCES m_assignment_extension;
 
+ALTER TABLE m_assignment_policy_situation
+  ADD CONSTRAINT fk_assignment_policy_situation
+FOREIGN KEY (assignment_id, assignment_oid)
+REFERENCES m_assignment;
+
 ALTER TABLE m_assignment_reference
 ADD CONSTRAINT fk_assignment_reference
 FOREIGN KEY (owner_id, owner_owner_oid)
@@ -979,6 +1004,11 @@ ADD CONSTRAINT fk_audit_delta
 FOREIGN KEY (record_id)
 REFERENCES m_audit_event;
 
+ALTER TABLE m_audit_item
+  ADD CONSTRAINT fk_audit_item
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event;
+
 ALTER TABLE m_connector
 ADD CONSTRAINT fk_connector
 FOREIGN KEY (oid)
@@ -1009,6 +1039,11 @@ ADD CONSTRAINT fk_focus_photo
 FOREIGN KEY (owner_oid)
 REFERENCES m_focus;
 
+ALTER TABLE m_focus_policy_situation
+  ADD CONSTRAINT fk_focus_policy_situation
+FOREIGN KEY (focus_oid)
+REFERENCES m_focus;
+
 ALTER TABLE m_generic_object
 ADD CONSTRAINT fk_generic_object
 FOREIGN KEY (oid)

diff --git a/config/sql/_all/h2-upgrade-3.4-3.5.sql b/config/sql/_all/h2-upgrade-3.4-3.5.sql
@@ -26,11 +26,13 @@ FOREIGN KEY (focus_oid)
 REFERENCES m_focus;
 
 CREATE TABLE m_audit_item (
-  changedItemPath VARCHAR(255) NOT NULL,
+  changedItemPath VARCHAR(900) NOT NULL,
   record_id       BIGINT       NOT NULL,
   PRIMARY KEY (changedItemPath, record_id)
 );
 
+CREATE INDEX iChangedItemPath ON m_audit_item (changedItemPath);
+
 ALTER TABLE m_audit_item
   ADD CONSTRAINT fk_audit_item
 FOREIGN KEY (record_id)