Yair Zaslavsky has uploaded a new change for review. Change subject: Revert "core: Add foreign keys from async_tasks to command_entities" ......................................................................
Revert "core: Add foreign keys from async_tasks to command_entities" This reverts commit cff91e9211234966692c43a1dfc211858d72a2b7. Change-Id: Icf54510178460095b09f529b2c5d26eee9efdeec Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AsyncTaskDAOTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java M backend/manager/modules/dal/src/test/resources/fixtures.xml A packaging/dbscripts/upgrade/03_06_0570_revert_async_tasks_fk.sql 4 files changed, 8 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/35387/1 diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AsyncTaskDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AsyncTaskDAOTest.java index 0105f75..b50c70f 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AsyncTaskDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AsyncTaskDAOTest.java @@ -62,8 +62,8 @@ newAsyncTask.setresult(AsyncTaskResultEnum.success); newAsyncTask.setActionParameters(params); newAsyncTask.setTaskParameters(taskParams); - newAsyncTask.setCommandId(FixturesTool.COMMAND_ID); - newAsyncTask.setRootCommandId(FixturesTool.ROOT_COMMAND_ID); + newAsyncTask.setCommandId(Guid.newGuid()); + newAsyncTask.setRootCommandId(Guid.newGuid()); newAsyncTask.setTaskType(AsyncTaskType.copyImage); newAsyncTask.setStoragePoolId(Guid.newGuid()); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java index 3c4019e..0e0cc66 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java @@ -665,7 +665,4 @@ public static final Guid CPU_PROFILE_1 = new Guid("fd81f1e1-785b-4579-ab75-1419ebb87052"); public static final Guid CPU_PROFILE_2 = new Guid("fd81f1e1-785b-4579-ab75-1419ebb87053"); - - public static final Guid COMMAND_ID = new Guid("340fd52b-3400-4cdd-8d3f-c9d03704b0a1"); - public static final Guid ROOT_COMMAND_ID = new Guid("440fd52b-3400-4cdd-8d3f-c9d03704b0aa"); } diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index 6dfd07b..eb0ded5 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -121,14 +121,6 @@ <column>command_parameters</column> <column>status</column> <row> - <value>440fd52b-3400-4cdd-8d3f-c9d03704b0aa</value> - <value>230</value> - <null/> - <value>2010-11-29 15:57:10</value> - <null/> - <value>ACTIVE</value> - </row> - <row> <value>340fd52b-3400-4cdd-8d3f-c9d03704b0a1</value> <value>230</value> <null/> @@ -153,7 +145,7 @@ <value>ACTIVE</value> </row> <row> - <value>340fd52b-3400-4cdd-8d3f-c9d03704b0aa</value> + <value>440fd52b-3400-4cdd-8d3f-c9d03704b0aa</value> <value>1</value> <null/> <value>2010-11-29 15:57:10</value> @@ -161,7 +153,7 @@ <value>ACTIVE</value> </row> <row> - <value>340fd52b-3400-4cdd-8d3f-c9d03704b0ab</value> + <value>440fd52b-3400-4cdd-8d3f-c9d03704b0ab</value> <value>1</value> <null/> <value>2010-11-29 15:57:10</value> @@ -199,7 +191,7 @@ <value>2</value> <!-- Running --> <value>0</value> <!-- Success --> <value>340fd52b-3400-4cdd-8d3f-c9d03704b0ab</value> - <value>440fd52b-3400-4cdd-8d3f-c9d03704b0aa</value> + <value>440fd52b-3400-4cdd-8d3f-c9d03704b0ab</value> <value>2010-12-01 14:13:07</value> <value>6d849ebf-755f-4552-ad09-9a090cda105d</value> <value>3</value> diff --git a/packaging/dbscripts/upgrade/03_06_0570_revert_async_tasks_fk.sql b/packaging/dbscripts/upgrade/03_06_0570_revert_async_tasks_fk.sql new file mode 100644 index 0000000..a57eccb --- /dev/null +++ b/packaging/dbscripts/upgrade/03_06_0570_revert_async_tasks_fk.sql @@ -0,0 +1,3 @@ +SELECT fn_db_drop_constraint('async_tasks', 'fk_async_tasks_command_entities_command_id'); +SELECT fn_db_drop_constraint('async_tasks', 'fk_async_tasks_command_entities_root_command_id'); + -- To view, visit http://gerrit.ovirt.org/35387 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf54510178460095b09f529b2c5d26eee9efdeec Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
