Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into registration
- Loading branch information
Showing
15 changed files
with
325 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,26 @@ | ||
ALTER TABLE m_object ADD lifecycleState VARCHAR(157); | ||
ALTER TABLE m_object ADD lifecycleState VARCHAR(255); | ||
|
||
CREATE INDEX iObjectLifecycleState ON m_object (lifecycleState); | ||
CREATE INDEX iObjectLifecycleState ON m_object (lifecycleState); | ||
|
||
ALTER TABLE m_assignment ADD lifecycleState VARCHAR(255); | ||
|
||
CREATE TABLE m_assignment_policy_situation ( | ||
assignment_id INTEGER NOT NULL, | ||
assignment_oid VARCHAR(36) NOT NULL, | ||
policySituation VARCHAR(255) | ||
); | ||
|
||
CREATE TABLE m_focus_policy_situation ( | ||
focus_oid VARCHAR(36) NOT NULL, | ||
policySituation VARCHAR(255) | ||
); | ||
|
||
ALTER TABLE m_assignment_policy_situation | ||
ADD CONSTRAINT fk_assignment_policy_situation | ||
FOREIGN KEY (assignment_id, assignment_oid) | ||
REFERENCES m_assignment; | ||
|
||
ALTER TABLE m_focus_policy_situation | ||
ADD CONSTRAINT fk_focus_policy_situation | ||
FOREIGN KEY (focus_oid) | ||
REFERENCES m_focus; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,26 @@ | ||
ALTER TABLE m_object ADD (lifecycleState VARCHAR2(255 CHAR)); | ||
|
||
CREATE INDEX iObjectLifecycleState ON m_object (lifecycleState) INITRANS 30; | ||
CREATE INDEX iObjectLifecycleState ON m_object (lifecycleState) INITRANS 30; | ||
|
||
ALTER TABLE m_assignment ADD (lifecycleState VARCHAR2(255 CHAR)); | ||
|
||
CREATE TABLE m_assignment_policy_situation ( | ||
assignment_id NUMBER(10, 0) NOT NULL, | ||
assignment_oid VARCHAR2(36 CHAR) NOT NULL, | ||
policySituation VARCHAR2(255 CHAR) | ||
) INITRANS 30; | ||
|
||
CREATE TABLE m_focus_policy_situation ( | ||
focus_oid VARCHAR2(36 CHAR) NOT NULL, | ||
policySituation VARCHAR2(255 CHAR) | ||
) INITRANS 30; | ||
|
||
ALTER TABLE m_assignment_policy_situation | ||
ADD CONSTRAINT fk_assignment_policy_situation | ||
FOREIGN KEY (assignment_id, assignment_oid) | ||
REFERENCES m_assignment; | ||
|
||
ALTER TABLE m_focus_policy_situation | ||
ADD CONSTRAINT fk_focus_policy_situation | ||
FOREIGN KEY (focus_oid) | ||
REFERENCES m_focus; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 24 additions & 1 deletion
25
config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,26 @@ | ||
ALTER TABLE m_object ADD lifecycleState VARCHAR(255); | ||
|
||
CREATE INDEX iObjectLifecycleState ON m_object (lifecycleState); | ||
CREATE INDEX iObjectLifecycleState ON m_object (lifecycleState); | ||
|
||
ALTER TABLE m_assignment ADD lifecycleState VARCHAR(255); | ||
|
||
CREATE TABLE m_assignment_policy_situation ( | ||
assignment_id INT4 NOT NULL, | ||
assignment_oid VARCHAR(36) NOT NULL, | ||
policySituation VARCHAR(255) | ||
); | ||
|
||
CREATE TABLE m_focus_policy_situation ( | ||
focus_oid VARCHAR(36) NOT NULL, | ||
policySituation VARCHAR(255) | ||
); | ||
|
||
ALTER TABLE m_assignment_policy_situation | ||
ADD CONSTRAINT fk_assignment_policy_situation | ||
FOREIGN KEY (assignment_id, assignment_oid) | ||
REFERENCES m_assignment; | ||
|
||
ALTER TABLE m_focus_policy_situation | ||
ADD CONSTRAINT fk_focus_policy_situation | ||
FOREIGN KEY (focus_oid) | ||
REFERENCES m_focus; |
Oops, something went wrong.