Laszlo Hornyak has uploaded a new change for review. Change subject: engine: remove unused roles_relations ......................................................................
engine: remove unused roles_relations remove unused 'roles_relations' - table and related stored procedures - class Change-Id: I84315ad536e841d188aa12db530143e518b672cd Signed-off-by: Laszlo Hornyak <lhorn...@redhat.com> --- M backend/manager/dbscripts/multi_level_administration_sp.sql A backend/manager/dbscripts/upgrade/03_03_0040_drop_roles_relations.sql D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/roles_relations.java 3 files changed, 3 insertions(+), 127 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/13940/1 diff --git a/backend/manager/dbscripts/multi_level_administration_sp.sql b/backend/manager/dbscripts/multi_level_administration_sp.sql index 0559339..f7f37f7 100644 --- a/backend/manager/dbscripts/multi_level_administration_sp.sql +++ b/backend/manager/dbscripts/multi_level_administration_sp.sql @@ -323,95 +323,6 @@ LANGUAGE plpgsql; - ----------------------------------------------------------------- --- [roles_relations] Table --- - - -Create or replace FUNCTION Insertroles_relations(v_role_container_id UUID, - v_role_id UUID) -RETURNS VOID - AS $procedure$ -BEGIN -INSERT INTO roles_relations(role_container_id, role_id) - VALUES(v_role_container_id, v_role_id); -END; $procedure$ -LANGUAGE plpgsql; - - - - - -Create or replace FUNCTION Updateroles_relations(v_role_container_id UUID, - v_role_id UUID) -RETURNS VOID - - --The [roles_relations] table doesn't have a timestamp column. Optimistic concurrency logic cannot be generated - AS $procedure$ -BEGIN -END; $procedure$ -LANGUAGE plpgsql; - - - - - -Create or replace FUNCTION Deleteroles_relations(v_role_container_id UUID, - v_role_id UUID) -RETURNS VOID - AS $procedure$ -BEGIN - - DELETE FROM roles_relations - WHERE role_container_id = v_role_container_id AND role_id = v_role_id; - -END; $procedure$ -LANGUAGE plpgsql; - - - - - -Create or replace FUNCTION GetAllFromroles_relations() RETURNS SETOF roles_relations - AS $procedure$ -BEGIN - RETURN QUERY SELECT * - FROM roles_relations; - -END; $procedure$ -LANGUAGE plpgsql; - - - - - -Create or replace FUNCTION Getroles_relationsByrole_container_idAndByrole_id(v_role_container_id UUID, v_role_id UUID) RETURNS SETOF roles_relations - AS $procedure$ -BEGIN - RETURN QUERY SELECT * - FROM roles_relations - WHERE role_container_id = v_role_container_id AND role_id = v_role_id; - -END; $procedure$ -LANGUAGE plpgsql; - - - - - -Create or replace FUNCTION Getrole_children(v_role_id UUID) RETURNS SETOF roles_relations - AS $procedure$ -BEGIN - RETURN QUERY SELECT * - FROM roles_relations - WHERE role_container_id = v_role_id; - -END; $procedure$ -LANGUAGE plpgsql; - - - ---------------------------------------------------------------- -- [user_action_map] Table -- diff --git a/backend/manager/dbscripts/upgrade/03_03_0040_drop_roles_relations.sql b/backend/manager/dbscripts/upgrade/03_03_0040_drop_roles_relations.sql new file mode 100644 index 0000000..c1379ce --- /dev/null +++ b/backend/manager/dbscripts/upgrade/03_03_0040_drop_roles_relations.sql @@ -0,0 +1,3 @@ + +drop table if exists roles_relations; + diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/roles_relations.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/roles_relations.java deleted file mode 100644 index 8ceddf4..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/roles_relations.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ovirt.engine.core.common.businessentities; - -import java.io.Serializable; - -import org.ovirt.engine.core.compat.*; - -public class roles_relations implements Serializable { - private static final long serialVersionUID = -8518717766990373742L; - - public roles_relations() { - } - - public roles_relations(Guid role_container_id, Guid role_id) { - this.role_container_idField = role_container_id; - this.role_idField = role_id; - } - - private Guid role_container_idField = new Guid(); - - public Guid getrole_container_id() { - return this.role_container_idField; - } - - public void setrole_container_id(Guid value) { - this.role_container_idField = value; - } - - private Guid role_idField = new Guid(); - - public Guid getrole_id() { - return this.role_idField; - } - - public void setrole_id(Guid value) { - this.role_idField = value; - } - -} -- To view, visit http://gerrit.ovirt.org/13940 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84315ad536e841d188aa12db530143e518b672cd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <lhorn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches