Skip to content

Commit

Permalink
Merge branch 'master' into search-panel-refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
KaterynaHonchar committed Feb 13, 2022
2 parents 99ed978 + 7726b5a commit 73a6c9b
Show file tree
Hide file tree
Showing 198 changed files with 7,497 additions and 4,330 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,12 @@ CREATE TABLE m_value_policy (
oid VARCHAR(36) NOT NULL,
PRIMARY KEY (oid)
);
CREATE TABLE m_message_template (
name_norm VARCHAR(255),
name_orig VARCHAR(255),
oid VARCHAR(36) NOT NULL,
PRIMARY KEY (oid)
);
CREATE INDEX iCertCampaignNameOrig
ON m_acc_cert_campaign (name_orig);
ALTER TABLE m_acc_cert_campaign
Expand Down Expand Up @@ -1022,6 +1028,10 @@ CREATE INDEX iValuePolicyNameOrig
ON m_value_policy (name_orig);
ALTER TABLE m_value_policy
ADD CONSTRAINT uc_value_policy_name UNIQUE (name_norm);
CREATE INDEX iMessageTemplateNameOrig
ON m_message_template (name_orig);
ALTER TABLE m_message_template
ADD CONSTRAINT uc_message_template_name UNIQUE (name_norm);
ALTER TABLE m_acc_cert_campaign
ADD CONSTRAINT fk_acc_cert_campaign FOREIGN KEY (oid) REFERENCES m_object;
ALTER TABLE m_acc_cert_case
Expand Down Expand Up @@ -1194,7 +1204,9 @@ ALTER TABLE m_user
ADD CONSTRAINT fk_user FOREIGN KEY (oid) REFERENCES m_focus;
ALTER TABLE m_value_policy
ADD CONSTRAINT fk_value_policy FOREIGN KEY (oid) REFERENCES m_object;
ALTER TABLE m_message_template
ADD CONSTRAINT fk_message_template FOREIGN KEY (oid) REFERENCES m_object;

INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.4');
INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.5');

COMMIT;
77 changes: 0 additions & 77 deletions config/sql/generic-old/h2-upgrade-4.0-4.4.sql

This file was deleted.

7 changes: 0 additions & 7 deletions config/sql/generic-old/h2-upgrade-4.3-4.4.sql

This file was deleted.

16 changes: 16 additions & 0 deletions config/sql/generic-old/h2-upgrade-4.4-4.5.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
-- MID-7484
CREATE TABLE m_message_template (
name_norm VARCHAR(255),
name_orig VARCHAR(255),
oid VARCHAR(36) NOT NULL,
PRIMARY KEY (oid)
);
CREATE INDEX iMessageTemplateNameOrig
ON m_message_template (name_orig);
ALTER TABLE m_message_template
ADD CONSTRAINT uc_message_template_name UNIQUE (name_norm);
ALTER TABLE m_message_template
ADD CONSTRAINT fk_message_template FOREIGN KEY (oid) REFERENCES m_object;

-- WRITE CHANGES ABOVE ^^
UPDATE m_global_metadata SET value = '4.5' WHERE name = 'databaseSchemaVersion';
82 changes: 0 additions & 82 deletions config/sql/generic-old/mysql-upgrade-4.0-4.4-utf8mb4.sql

This file was deleted.

84 changes: 0 additions & 84 deletions config/sql/generic-old/mysql-upgrade-4.0-4.4.sql

This file was deleted.

13 changes: 0 additions & 13 deletions config/sql/generic-old/mysql-upgrade-4.3-4.4-utf8mb4.sql

This file was deleted.

13 changes: 0 additions & 13 deletions config/sql/generic-old/mysql-upgrade-4.3-4.4.sql

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,12 @@ CREATE TABLE m_value_policy (
oid VARCHAR2(36 CHAR) NOT NULL,
PRIMARY KEY (oid)
) INITRANS 30;
CREATE TABLE m_message_template (
name_norm VARCHAR2(255 CHAR),
name_orig VARCHAR2(255 CHAR),
oid VARCHAR2(36 CHAR) NOT NULL,
PRIMARY KEY (oid)
) INITRANS 30;
CREATE INDEX iCertCampaignNameOrig
ON m_acc_cert_campaign (name_orig) INITRANS 30;
ALTER TABLE m_acc_cert_campaign
Expand Down Expand Up @@ -1019,6 +1025,10 @@ CREATE INDEX iValuePolicyNameOrig
ON m_value_policy (name_orig) INITRANS 30;
ALTER TABLE m_value_policy
ADD CONSTRAINT uc_value_policy_name UNIQUE (name_norm);
CREATE INDEX iMessageTemplateNameOrig
ON m_message_template (name_orig) INITRANS 30;
ALTER TABLE m_message_template
ADD CONSTRAINT uc_message_template_name UNIQUE (name_norm);
ALTER TABLE m_acc_cert_campaign
ADD CONSTRAINT fk_acc_cert_campaign FOREIGN KEY (oid) REFERENCES m_object;
ALTER TABLE m_acc_cert_case
Expand Down Expand Up @@ -1191,6 +1201,8 @@ ALTER TABLE m_user
ADD CONSTRAINT fk_user FOREIGN KEY (oid) REFERENCES m_focus;
ALTER TABLE m_value_policy
ADD CONSTRAINT fk_value_policy FOREIGN KEY (oid) REFERENCES m_object;
ALTER TABLE m_message_template
ADD CONSTRAINT fk_message_template FOREIGN KEY (oid) REFERENCES m_object;

-- Indices for foreign keys; maintained manually
CREATE INDEX iUserEmployeeTypeOid ON M_USER_EMPLOYEE_TYPE(USER_OID) INITRANS 30;
Expand Down Expand Up @@ -1221,7 +1233,7 @@ CREATE INDEX iTaskDependentOid ON M_TASK_DEPENDENT(TASK_OID) INITRANS 30;
CREATE UNIQUE INDEX uc_connector_type_version_host
ON m_connector (connectorType, connectorVersion, nvl(connectorHostRef_targetOid,0));

INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.4');
INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.5');

--
-- A hint submitted by a user: Oracle DB MUST be created as "shared" and the
Expand Down

0 comments on commit 73a6c9b

Please sign in to comment.