diff --git a/config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql b/config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql index ee4213b0140..5fa8af93cd3 100644 --- a/config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql +++ b/config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql @@ -6,7 +6,7 @@ CREATE TABLE m_abstract_role ( ); CREATE TABLE m_assignment ( - id SMALLINT NOT NULL, + id INTEGER NOT NULL, owner_oid VARCHAR(36) NOT NULL, administrativeStatus INTEGER, archiveTimestamp TIMESTAMP, @@ -36,14 +36,14 @@ CREATE TABLE m_assignment ( tenantRef_relation VARCHAR(157), tenantRef_targetOid VARCHAR(36), tenantRef_type INTEGER, - extId SMALLINT, + extId INTEGER, extOid VARCHAR(36), PRIMARY KEY (id, owner_oid) ); CREATE TABLE m_assignment_ext_date ( eName VARCHAR(157) NOT NULL, - anyContainer_owner_id SMALLINT NOT NULL, + anyContainer_owner_id INTEGER NOT NULL, anyContainer_owner_owner_oid VARCHAR(36) NOT NULL, dateValue TIMESTAMP NOT NULL, extensionType INTEGER, @@ -55,7 +55,7 @@ CREATE TABLE m_assignment_ext_date ( CREATE TABLE m_assignment_ext_long ( eName VARCHAR(157) NOT NULL, - anyContainer_owner_id SMALLINT NOT NULL, + anyContainer_owner_id INTEGER NOT NULL, anyContainer_owner_owner_oid VARCHAR(36) NOT NULL, longValue BIGINT NOT NULL, extensionType INTEGER, @@ -67,7 +67,7 @@ CREATE TABLE m_assignment_ext_long ( CREATE TABLE m_assignment_ext_poly ( eName VARCHAR(157) NOT NULL, - anyContainer_owner_id SMALLINT NOT NULL, + anyContainer_owner_id INTEGER NOT NULL, anyContainer_owner_owner_oid VARCHAR(36) NOT NULL, orig VARCHAR(255) NOT NULL, extensionType INTEGER, @@ -80,7 +80,7 @@ CREATE TABLE m_assignment_ext_poly ( CREATE TABLE m_assignment_ext_reference ( eName VARCHAR(157) NOT NULL, - anyContainer_owner_id SMALLINT NOT NULL, + anyContainer_owner_id INTEGER NOT NULL, anyContainer_owner_owner_oid VARCHAR(36) NOT NULL, targetoid VARCHAR(36) NOT NULL, extensionType INTEGER, @@ -94,7 +94,7 @@ CREATE TABLE m_assignment_ext_reference ( CREATE TABLE m_assignment_ext_string ( eName VARCHAR(157) NOT NULL, - anyContainer_owner_id SMALLINT NOT NULL, + anyContainer_owner_id INTEGER NOT NULL, anyContainer_owner_owner_oid VARCHAR(36) NOT NULL, stringValue VARCHAR(255) NOT NULL, extensionType INTEGER, @@ -105,7 +105,7 @@ CREATE TABLE m_assignment_ext_string ( ); CREATE TABLE m_assignment_extension ( - owner_id SMALLINT NOT NULL, + owner_id INTEGER NOT NULL, owner_owner_oid VARCHAR(36) NOT NULL, datesCount SMALLINT, longsCount SMALLINT, @@ -116,7 +116,7 @@ CREATE TABLE m_assignment_extension ( ); CREATE TABLE m_assignment_reference ( - owner_id SMALLINT NOT NULL, + owner_id INTEGER NOT NULL, owner_owner_oid VARCHAR(36) NOT NULL, reference_type INTEGER NOT NULL, relation VARCHAR(157) NOT NULL, @@ -190,7 +190,7 @@ CREATE TABLE m_connector_target_system ( ); CREATE TABLE m_exclusion ( - id SMALLINT NOT NULL, + id INTEGER NOT NULL, owner_oid VARCHAR(36) NOT NULL, policy INTEGER, targetRef_relation VARCHAR(157), @@ -230,7 +230,7 @@ CREATE TABLE m_lookup_table ( ); CREATE TABLE m_lookup_table_row ( - id SMALLINT NOT NULL, + id INTEGER NOT NULL, owner_oid VARCHAR(36) NOT NULL, row_key VARCHAR(255), label_norm VARCHAR(255), @@ -488,7 +488,7 @@ CREATE TABLE m_task_dependent ( ); CREATE TABLE m_trigger ( - id SMALLINT NOT NULL, + id INTEGER NOT NULL, owner_oid VARCHAR(36) NOT NULL, handlerUri VARCHAR(255), timestampValue TIMESTAMP, @@ -590,6 +590,9 @@ ADD CONSTRAINT uc_generic_object_name UNIQUE (name_norm); ALTER TABLE m_lookup_table ADD CONSTRAINT uc_lookup_name UNIQUE (name_norm); +ALTER TABLE m_lookup_table_row +ADD CONSTRAINT uc_row_key unique (row_key); + ALTER TABLE m_node ADD CONSTRAINT uc_node_name UNIQUE (name_norm); diff --git a/config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql b/config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql index bd00b6260e7..18ed73c1950 100644 --- a/config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql +++ b/config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql @@ -6,7 +6,7 @@ CREATE TABLE m_lookup_table ( ); CREATE TABLE m_lookup_table_row ( - id SMALLINT NOT NULL, + id INTEGER NOT NULL, owner_oid VARCHAR(36) NOT NULL, row_key VARCHAR(255), label_norm VARCHAR(255), @@ -29,6 +29,9 @@ ADD CONSTRAINT fk_lookup_table_owner FOREIGN KEY (owner_oid) REFERENCES m_lookup_table; +ALTER TABLE m_lookup_table_row +ADD CONSTRAINT uc_row_key unique (row_key); + ALTER TABLE m_assignment_reference DROP PRIMARY KEY; @@ -39,4 +42,16 @@ ALTER TABLE m_reference DROP PRIMARY KEY; ALTER TABLE m_reference -ADD PRIMARY KEY (owner_oid, reference_type, relation, targetOid); \ No newline at end of file +ADD PRIMARY KEY (owner_oid, reference_type, relation, targetOid); + +ALTER TABLE m_assignment ALTER COLUMN id TYPE INTEGER; +ALTER TABLE m_assignment ALTER COLUMN extId TYPE INTEGER; +ALTER TABLE m_assignment_ext_date ALTER COLUMN anyContainer_owner_id TYPE INTEGER; +ALTER TABLE m_assignment_ext_long ALTER COLUMN anyContainer_owner_id TYPE INTEGER; +ALTER TABLE m_assignment_ext_poly ALTER COLUMN anyContainer_owner_id TYPE INTEGER; +ALTER TABLE m_assignment_ext_reference ALTER COLUMN anyContainer_owner_id TYPE INTEGER; +ALTER TABLE m_assignment_ext_string ALTER COLUMN anyContainer_owner_id TYPE INTEGER; +ALTER TABLE m_assignment_extension ALTER COLUMN owner_id TYPE INTEGER; +ALTER TABLE m_assignment_reference ALTER COLUMN owner_id TYPE INTEGER; +ALTER TABLE m_exclusion ALTER COLUMN id TYPE INTEGER; +ALTER TABLE m_trigger ALTER COLUMN id TYPE INTEGER; diff --git a/config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql b/config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql index 45e29ca8d5c..242a663223d 100644 --- a/config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql +++ b/config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql @@ -29,6 +29,9 @@ ADD CONSTRAINT fk_lookup_table_owner FOREIGN KEY (owner_oid) REFERENCES m_lookup_table; +ALTER TABLE m_lookup_table_row +ADD CONSTRAINT uc_row_key UNIQUE (row_key); + ALTER TABLE m_assignment_reference DROP CONSTRAINT m_assignment_reference_pkey, ADD CONSTRAINT m_assignment_reference_pkey PRIMARY KEY (owner_id, owner_owner_oid, reference_type, relation, targetOid);