Skip to content

Commit

Permalink
Merge branch 'master' into feature/manual-connectors
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Apr 20, 2017
2 parents 7af9faf + bbbbc85 commit 7333f8b
Show file tree
Hide file tree
Showing 247 changed files with 9,430 additions and 6,783 deletions.
100 changes: 55 additions & 45 deletions config/sql/midpoint/3.6/h2/h2-3.6.sql
View file
Expand Up @@ -43,19 +43,19 @@ CREATE TABLE m_acc_cert_case (
validTo TIMESTAMP,
validityChangeTimestamp TIMESTAMP,
validityStatus INTEGER,
currentStageNumber INTEGER,
currentStageOutcome INTEGER,
currentStageOutcome VARCHAR(255),
fullObject BLOB,
objectRef_relation VARCHAR(157),
objectRef_targetOid VARCHAR(36),
objectRef_type INTEGER,
orgRef_relation VARCHAR(157),
orgRef_targetOid VARCHAR(36),
orgRef_type INTEGER,
overallOutcome INTEGER,
outcome VARCHAR(255),
remediedTimestamp TIMESTAMP,
reviewDeadline TIMESTAMP,
reviewRequestedTimestamp TIMESTAMP,
stageNumber INTEGER,
targetRef_relation VARCHAR(157),
targetRef_targetOid VARCHAR(36),
targetRef_type INTEGER,
Expand All @@ -65,30 +65,6 @@ CREATE TABLE m_acc_cert_case (
PRIMARY KEY (id, owner_oid)
);

CREATE TABLE m_acc_cert_case_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,
containerType INTEGER,
PRIMARY KEY (owner_id, owner_owner_oid, reference_type, relation, targetOid)
);

CREATE TABLE m_acc_cert_decision (
id INTEGER NOT NULL,
owner_id INTEGER NOT NULL,
owner_owner_oid VARCHAR(36) NOT NULL,
reviewerComment VARCHAR(255),
response INTEGER,
reviewerRef_relation VARCHAR(157),
reviewerRef_targetOid VARCHAR(36),
reviewerRef_type INTEGER,
stageNumber INTEGER NOT NULL,
timestamp TIMESTAMP,
PRIMARY KEY (id, owner_id, owner_owner_oid)
);

CREATE TABLE m_acc_cert_definition (
handlerUri VARCHAR(255),
lastCampaignClosedTimestamp TIMESTAMP,
Expand All @@ -102,6 +78,30 @@ CREATE TABLE m_acc_cert_definition (
PRIMARY KEY (oid)
);

CREATE TABLE m_acc_cert_wi (
id INTEGER NOT NULL,
owner_id INTEGER NOT NULL,
owner_owner_oid VARCHAR(36) NOT NULL,
closeTimestamp TIMESTAMP,
outcome VARCHAR(255),
outputChangeTimestamp TIMESTAMP,
performerRef_relation VARCHAR(157),
performerRef_targetOid VARCHAR(36),
performerRef_type INTEGER,
stageNumber INTEGER,
PRIMARY KEY (id, owner_id, owner_owner_oid)
);

CREATE TABLE m_acc_cert_wi_reference (
owner_id INTEGER NOT NULL,
owner_owner_id INTEGER NOT NULL,
owner_owner_owner_oid VARCHAR(36) NOT NULL,
relation VARCHAR(157) NOT NULL,
targetOid VARCHAR(36) NOT NULL,
targetType INTEGER,
PRIMARY KEY (owner_id, owner_owner_id, owner_owner_owner_oid, relation, targetOid)
);

CREATE TABLE m_assignment (
id INTEGER NOT NULL,
owner_oid VARCHAR(36) NOT NULL,
Expand Down Expand Up @@ -244,7 +244,7 @@ CREATE TABLE m_assignment_reference (
reference_type INTEGER NOT NULL,
relation VARCHAR(157) NOT NULL,
targetOid VARCHAR(36) NOT NULL,
containerType INTEGER,
targetType INTEGER,
PRIMARY KEY (owner_id, owner_owner_oid, reference_type, relation, targetOid)
);

Expand Down Expand Up @@ -569,7 +569,7 @@ CREATE TABLE m_reference (
reference_type INTEGER NOT NULL,
relation VARCHAR(157) NOT NULL,
targetOid VARCHAR(36) NOT NULL,
containerType INTEGER,
targetType INTEGER,
PRIMARY KEY (owner_oid, reference_type, relation, targetOid)
);

Expand Down Expand Up @@ -654,6 +654,7 @@ CREATE TABLE m_shadow (
name_norm VARCHAR(255),
name_orig VARCHAR(255),
objectClass VARCHAR(157),
pendingOperationCount INTEGER,
resourceRef_relation VARCHAR(157),
resourceRef_targetOid VARCHAR(36),
resourceRef_type INTEGER,
Expand Down Expand Up @@ -796,14 +797,11 @@ CREATE INDEX iCaseTenantRefTargetOid ON m_acc_cert_case (tenantRef_targetOid);

CREATE INDEX iCaseOrgRefTargetOid ON m_acc_cert_case (orgRef_targetOid);

CREATE INDEX iCaseReferenceTargetOid ON m_acc_cert_case_reference (targetOid);

ALTER TABLE m_acc_cert_decision
ADD CONSTRAINT uc_case_stage_reviewer UNIQUE (owner_owner_oid, owner_id, stageNumber, reviewerRef_targetOid);

ALTER TABLE m_acc_cert_definition
ADD CONSTRAINT uc_acc_cert_definition_name UNIQUE (name_norm);

CREATE INDEX iCertWorkItemRefTargetOid ON m_acc_cert_wi_reference (targetOid);

CREATE INDEX iAssignmentAdministrative ON m_assignment (administrativeStatus);

CREATE INDEX iAssignmentEffective ON m_assignment (effectiveStatus);
Expand Down Expand Up @@ -936,6 +934,18 @@ CREATE INDEX iShadowResourceRef ON m_shadow (resourceRef_targetOid);

CREATE INDEX iShadowDead ON m_shadow (dead);

CREATE INDEX iShadowKind ON m_shadow (kind);

CREATE INDEX iShadowIntent ON m_shadow (intent);

CREATE INDEX iShadowObjectClass ON m_shadow (objectClass);

CREATE INDEX iShadowFailedOperationType ON m_shadow (failedOperationType);

CREATE INDEX iShadowSyncSituation ON m_shadow (synchronizationSituation);

CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount);

ALTER TABLE m_system_configuration
ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm);

Expand Down Expand Up @@ -984,23 +994,23 @@ ALTER TABLE m_acc_cert_campaign
ALTER TABLE m_acc_cert_case
ADD CONSTRAINT fk_acc_cert_case_owner
FOREIGN KEY (owner_oid)
REFERENCES m_object;

ALTER TABLE m_acc_cert_case_reference
ADD CONSTRAINT fk_acc_cert_case_ref_owner
FOREIGN KEY (owner_id, owner_owner_oid)
REFERENCES m_acc_cert_case;

ALTER TABLE m_acc_cert_decision
ADD CONSTRAINT fk_acc_cert_decision_owner
FOREIGN KEY (owner_id, owner_owner_oid)
REFERENCES m_acc_cert_case;
REFERENCES m_acc_cert_campaign;

ALTER TABLE m_acc_cert_definition
ADD CONSTRAINT fk_acc_cert_definition
FOREIGN KEY (oid)
REFERENCES m_object;

ALTER TABLE m_acc_cert_wi
ADD CONSTRAINT fk_acc_cert_wi_owner
FOREIGN KEY (owner_id, owner_owner_oid)
REFERENCES m_acc_cert_case;

ALTER TABLE m_acc_cert_wi_reference
ADD CONSTRAINT fk_acc_cert_wi_ref_owner
FOREIGN KEY (owner_id, owner_owner_id, owner_owner_owner_oid)
REFERENCES m_acc_cert_wi;

ALTER TABLE m_assignment
ADD CONSTRAINT fk_assignment_owner
FOREIGN KEY (owner_oid)
Expand Down
68 changes: 68 additions & 0 deletions config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
View file
Expand Up @@ -74,3 +74,71 @@ ALTER TABLE m_case
FOREIGN KEY (oid)
REFERENCES m_object;

ALTER TABLE m_assignment_reference ALTER COLUMN containerType RENAME TO targetType;
ALTER TABLE m_reference ALTER COLUMN containerType RENAME TO targetType;

DROP TABLE m_acc_cert_case_reference;

ALTER TABLE m_acc_cert_case ALTER COLUMN currentStageNumber RENAME TO stageNumber;
ALTER TABLE m_acc_cert_case DROP COLUMN currentStageOutcome, overallOutcome;
ALTER TABLE m_acc_cert_case ADD COLUMN currentStageOutcome VARCHAR(255);
ALTER TABLE m_acc_cert_case ADD COLUMN outcome VARCHAR(255);

DROP TABLE m_acc_cert_decision;

CREATE TABLE m_acc_cert_wi (
id INTEGER NOT NULL,
owner_id INTEGER NOT NULL,
owner_owner_oid VARCHAR(36) NOT NULL,
closeTimestamp TIMESTAMP,
outcome VARCHAR(255),
outputChangeTimestamp TIMESTAMP,
performerRef_relation VARCHAR(157),
performerRef_targetOid VARCHAR(36),
performerRef_type INTEGER,
stageNumber INTEGER,
PRIMARY KEY (id, owner_id, owner_owner_oid)
);

CREATE TABLE m_acc_cert_wi_reference (
owner_id INTEGER NOT NULL,
owner_owner_id INTEGER NOT NULL,
owner_owner_owner_oid VARCHAR(36) NOT NULL,
relation VARCHAR(157) NOT NULL,
targetOid VARCHAR(36) NOT NULL,
targetType INTEGER,
PRIMARY KEY (owner_id, owner_owner_id, owner_owner_owner_oid, relation, targetOid)
);

CREATE INDEX iCertWorkItemRefTargetOid ON m_acc_cert_wi_reference (targetOid);

ALTER TABLE m_acc_cert_case DROP CONSTRAINT fk_acc_cert_case_owner;

ALTER TABLE m_acc_cert_case
ADD CONSTRAINT fk_acc_cert_case_owner
FOREIGN KEY (owner_oid)
REFERENCES m_acc_cert_campaign;

ALTER TABLE m_acc_cert_wi
ADD CONSTRAINT fk_acc_cert_wi_owner
FOREIGN KEY (owner_id, owner_owner_oid)
REFERENCES m_acc_cert_case;

ALTER TABLE m_acc_cert_wi_reference
ADD CONSTRAINT fk_acc_cert_wi_ref_owner
FOREIGN KEY (owner_id, owner_owner_id, owner_owner_owner_oid)
REFERENCES m_acc_cert_wi;

ALTER TABLE m_shadow ADD pendingOperationCount INTEGER;

CREATE INDEX iShadowKind ON m_shadow (kind);

CREATE INDEX iShadowIntent ON m_shadow (intent);

CREATE INDEX iShadowObjectClass ON m_shadow (objectClass);

CREATE INDEX iShadowFailedOperationType ON m_shadow (failedOperationType);

CREATE INDEX iShadowSyncSituation ON m_shadow (synchronizationSituation);

CREATE INDEX iShadowPendingOperationCount ON m_shadow (pendingOperationCount);

0 comments on commit 7333f8b

Please sign in to comment.