Martin Peřina has posted comments on this change. Change subject: core: Adding saveOrUpdate to DbUserDao ......................................................................
Patch Set 2: (2 comments) http://gerrit.ovirt.org/#/c/28429/2/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbUserDAOTest.java File backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbUserDAOTest.java: Line 227: public void testSaveOrUpdateExisting() { Line 228: int sizeBeforeSave = dao.getAll().size(); Line 229: existingUser.setFirstName("changedname"); Line 230: existingUser.setLastName("changedsurname"); Line 231: int sizeAfterSave = dao.getAll().size(); Shouldn't this be executed after dao.saveOrUpdate()? Line 232: dao.saveOrUpdate(existingUser); Line 233: DbUser result = dao.get(existingUser.getId()); Line 234: assertEquals(existingUser, result); Line 235: assertEquals(0, sizeAfterSave - sizeBeforeSave); http://gerrit.ovirt.org/#/c/28429/2/packaging/dbscripts/user_sp.sql File packaging/dbscripts/user_sp.sql: Line 114: BEGIN Line 115: IF NOT EXISTS (SELECT 1 from USERS where USERS.user_id = v_user_id) THEN Line 116: PERFORM InsertUser(v_department, v_domain, v_email, v_groups, v_name, v_note, v_role, v_active, v_surname, v_user_id, v_username, v_group_ids, v_external_id, v_namespace); Line 117: ELSE Line 118: PERFORM UpdateUserImpl(v_department, v_domain, v_email, v_groups, v_name, v_note, v_role, v_active, v_surname, v_user_id, v_username, v_group_ids, v_external_id, v_namespace); SELECT is unnecessary, just execute update and if not updated any row, execute insert. Take a look at UpsertKdumpStatus in http://gerrit.ovirt.org/#/c/27200/14/packaging/dbscripts/vds_kdump_status_sp.sql,cm Line 119: End IF; Line 120: END; $procedure$ Line 121: LANGUAGE plpgsql; Line 122: -- To view, visit http://gerrit.ovirt.org/28429 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4b6add7cbbe0a3055b6eb11ebf67cc77fec4bf53 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com> Gerrit-Reviewer: Martin Peřina <mper...@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzasl...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
