Skip to content

Commit

Permalink
merge branch
Browse files Browse the repository at this point in the history 
# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Aug 18, 2020
2 parents fbb8bcd + 0eea180 commit ecabb32
Show file tree
Hide file tree
Showing 1,059 changed files with 42,668 additions and 24,139 deletions.
2 changes: 1 addition & 1 deletion config/sql/h2-upgrade-4.0-4.2.sql
View file
Expand Up @@ -7,7 +7,7 @@ UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';

-- 2020-06-25 11:35

ALTER TABLE m_acc_cert_campaign ALTER COLUMN ownerRef_type RENAME TO ownerRef_targetType;
ALTER TABLE m_acc_cert_campaign ALTER COLUMN definitionRef_type RENAME TO definitionRef_targetType;
ALTER TABLE m_acc_cert_campaign ALTER COLUMN ownerRef_type RENAME TO ownerRef_targetType;
ALTER TABLE m_acc_cert_definition ALTER COLUMN ownerRef_type RENAME TO ownerRef_targetType;
ALTER TABLE m_connector ALTER COLUMN connectorHostRef_type RENAME TO connectorHostRef_targetType;
Expand Down
99 changes: 64 additions & 35 deletions config/sql/sqlserver-upgrade-4.0-4.2.sql
View file
Expand Up @@ -3,43 +3,72 @@
CREATE INDEX iOpExecTimestampValue
ON m_operation_execution (timestampValue);

BEGIN TRANSACTION
UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
COMMIT;
GO

-- 2020-06-25 11:35

UPDATE m_acc_cert_campaign SET definitionRef_type = convert(INT, definitionRef_targetType) where definitionRef_targetType is not null;
UPDATE m_acc_cert_campaign SET ownerRef_type = convert(INT, ownerRef_targetType) where ownerRef_targetType is not null;
UPDATE m_acc_cert_definition SET ownerRef_type = convert(INT, ownerRef_targetType) where ownerRef_targetType is not null;
UPDATE m_connector SET connectorHostRef_type = convert(INT, connectorHostRef_targetType) where connectorHostRef_targetType is not null;
UPDATE m_object SET creatorRef_type = convert(INT, creatorRef_targetType) where creatorRef_targetType is not null;
UPDATE m_object SET modifierRef_type = convert(INT, modifierRef_targetType) where modifierRef_targetType is not null;
UPDATE m_object SET tenantRef_type = convert(INT, tenantRef_targetType) where tenantRef_targetType is not null;
UPDATE m_report_output SET reportRef_type = convert(INT, reportRef_targetType) where reportRef_targetType is not null;
UPDATE m_resource SET connectorRef_type = convert(INT, connectorRef_targetType) where connectorRef_targetType is not null;
UPDATE m_shadow SET resourceRef_type = convert(INT, resourceRef_targetType) where resourceRef_targetType is not null;
UPDATE m_acc_cert_case SET objectRef_type = convert(INT, objectRef_targetType) where objectRef_targetType is not null;
UPDATE m_acc_cert_case SET orgRef_type = convert(INT, orgRef_targetType) where orgRef_targetType is not null;
UPDATE m_acc_cert_case SET targetRef_type = convert(INT, targetRef_targetType) where targetRef_targetType is not null;
UPDATE m_acc_cert_case SET tenantRef_type = convert(INT, tenantRef_targetType) where tenantRef_targetType is not null;
UPDATE m_acc_cert_wi SET performerRef_type = convert(INT, performerRef_targetType) where performerRef_targetType is not null;
UPDATE m_assignment SET creatorRef_type = convert(INT, creatorRef_targetType) where creatorRef_targetType is not null;
UPDATE m_assignment SET modifierRef_type = convert(INT, modifierRef_targetType) where modifierRef_targetType is not null;
UPDATE m_assignment SET orgRef_type = convert(INT, orgRef_targetType) where orgRef_targetType is not null;
UPDATE m_assignment SET resourceRef_type = convert(INT, resourceRef_targetType) where resourceRef_targetType is not null;
UPDATE m_assignment SET targetRef_type = convert(INT, targetRef_targetType) where targetRef_targetType is not null;
UPDATE m_assignment SET tenantRef_type = convert(INT, tenantRef_targetType) where tenantRef_targetType is not null;
UPDATE m_case_wi SET originalAssigneeRef_type = convert(INT, originalAssigneeRef_targetType) where originalAssigneeRef_targetType is not null;
UPDATE m_case_wi SET performerRef_type = convert(INT, performerRef_targetType) where performerRef_targetType is not null;
UPDATE m_operation_execution SET initiatorRef_type = convert(INT, initiatorRef_targetType) where initiatorRef_targetType is not null;
UPDATE m_operation_execution SET taskRef_type = convert(INT, taskRef_targetType) where taskRef_targetType is not null;
UPDATE m_task SET objectRef_type = convert(INT, objectRef_targetType) where objectRef_targetType is not null;
UPDATE m_task SET ownerRef_type = convert(INT, ownerRef_targetType) where ownerRef_targetType is not null;
UPDATE m_abstract_role SET ownerRef_type = convert(INT, ownerRef_targetType) where ownerRef_targetType is not null;
UPDATE m_case SET objectRef_type = convert(INT, objectRef_targetType) where objectRef_targetType is not null;
UPDATE m_case SET parentRef_type = convert(INT, parentRef_targetType) where parentRef_targetType is not null;
UPDATE m_case SET requestorRef_type = convert(INT, requestorRef_targetType) where requestorRef_targetType is not null;
UPDATE m_case SET targetRef_type = convert(INT, targetRef_targetType) where targetRef_targetType is not null;

sp_rename 'm_acc_cert_campaign.definitionRef_type', 'definitionRef_targetType', 'COLUMN';
GO
sp_rename 'm_acc_cert_campaign.ownerRef_type', 'ownerRef_targetType', 'COLUMN';
GO
sp_rename 'm_acc_cert_definition.ownerRef_type', 'ownerRef_targetType', 'COLUMN';
GO
sp_rename 'm_connector.connectorHostRef_type', 'connectorHostRef_targetType', 'COLUMN';
GO
sp_rename 'm_object.creatorRef_type', 'creatorRef_targetType', 'COLUMN';
GO
sp_rename 'm_object.modifierRef_type', 'modifierRef_targetType', 'COLUMN';
GO
sp_rename 'm_object.tenantRef_type', 'tenantRef_targetType', 'COLUMN';
GO
sp_rename 'm_report_output.reportRef_type', 'reportRef_targetType', 'COLUMN';
GO
sp_rename 'm_resource.connectorRef_type', 'connectorRef_targetType', 'COLUMN';
GO
sp_rename 'm_shadow.resourceRef_type', 'resourceRef_targetType', 'COLUMN';
GO
sp_rename 'm_acc_cert_case.objectRef_type', 'objectRef_targetType', 'COLUMN';
GO
sp_rename 'm_acc_cert_case.orgRef_type', 'orgRef_targetType', 'COLUMN';
GO
sp_rename 'm_acc_cert_case.targetRef_type', 'targetRef_targetType', 'COLUMN';
GO
sp_rename 'm_acc_cert_case.tenantRef_type', 'tenantRef_targetType', 'COLUMN';
GO
sp_rename 'm_acc_cert_wi.performerRef_type', 'performerRef_targetType', 'COLUMN';
GO
sp_rename 'm_assignment.creatorRef_type', 'creatorRef_targetType', 'COLUMN';
GO
sp_rename 'm_assignment.modifierRef_type', 'modifierRef_targetType', 'COLUMN';
GO
sp_rename 'm_assignment.orgRef_type', 'orgRef_targetType', 'COLUMN';
GO
sp_rename 'm_assignment.resourceRef_type', 'resourceRef_targetType', 'COLUMN';
GO
sp_rename 'm_assignment.targetRef_type', 'targetRef_targetType', 'COLUMN';
GO
sp_rename 'm_assignment.tenantRef_type', 'tenantRef_targetType', 'COLUMN';
GO
sp_rename 'm_case_wi.originalAssigneeRef_type', 'originalAssigneeRef_targetType', 'COLUMN';
GO
sp_rename 'm_case_wi.performerRef_type', 'performerRef_targetType', 'COLUMN';
GO
sp_rename 'm_operation_execution.initiatorRef_type', 'initiatorRef_targetType', 'COLUMN';
GO
sp_rename 'm_operation_execution.taskRef_type', 'taskRef_targetType', 'COLUMN';
GO
sp_rename 'm_task.objectRef_type', 'objectRef_targetType', 'COLUMN';
GO
sp_rename 'm_task.ownerRef_type', 'ownerRef_targetType', 'COLUMN';
GO
sp_rename 'm_abstract_role.ownerRef_type', 'ownerRef_targetType', 'COLUMN';
GO
sp_rename 'm_case.objectRef_type', 'objectRef_targetType', 'COLUMN';
GO
sp_rename 'm_case.parentRef_type', 'parentRef_targetType', 'COLUMN';
GO
sp_rename 'm_case.requestorRef_type', 'requestorRef_targetType', 'COLUMN';
GO
sp_rename 'm_case.targetRef_type', 'targetRef_targetType', 'COLUMN';
GO

0 comments on commit ecabb32

Please sign in to comment.