Liran Zelkha has uploaded a new change for review. Change subject: core: Support search of Templates: Users = * ......................................................................
core: Support search of Templates: Users = * Templates: Users = * was broken (searched by fields that are not in the DB). This patch fixes it. Change-Id: I8aa5f9d9fbf462c64639f4f8f2865cf064e960ab Bug-Url: https://bugzilla.redhat.com/1187703 Signed-off-by: lzel...@redhat.com <lzel...@redhat.com> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/40535/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java index da867c4..7dec499 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdcUserConditionFieldAutoCompleter.java @@ -55,8 +55,7 @@ columnNameDict.put("LOGIN", "username"); columnNameDict.put("DIRECTORY", "domain"); columnNameDict.put("DEPARTMENT", "department"); - columnNameDict.put("TITLE", "role"); - columnNameDict.put(GROUP, "groups"); + columnNameDict.put(GROUP, "user_group"); columnNameDict.put("ACTIVE", "active"); columnNameDict.put("ROLE", "mla_role"); columnNameDict.put("TAG", "tag_name"); diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java index 061631e..7fe7e4b 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java @@ -240,12 +240,18 @@ } @Test - public void testTemplateUsers() { + public void testTemplateUsersUserName() { testValidSql("Templates: Users.usrname = *", "SELECT * FROM ((SELECT distinct vm_templates_view.* FROM vm_templates_view LEFT OUTER JOIN vms_with_tags ON vm_templates_view.vmt_guid=vms_with_tags.vmt_guid LEFT OUTER JOIN vdc_users_with_tags ON vms_with_tags.vm_guid=vdc_users_with_tags.vm_guid WHERE vdc_users_with_tags.username LIKE % ) ORDER BY name ASC ) as T1 OFFSET (1 -1) LIMIT 0"); } @Test + public void testTemplateUsersAnyField() { + testValidSql("Templates: Users = *", + "SELECT * FROM (SELECT * FROM vm_templates_view WHERE ( vmt_guid IN (SELECT distinct vm_templates_storage_domain.vmt_guid FROM vm_templates_storage_domain LEFT OUTER JOIN vms_with_tags ON vm_templates_storage_domain.vmt_guid=vms_with_tags.vmt_guid LEFT OUTER JOIN vdc_users_with_tags ON vms_with_tags.vm_guid=vdc_users_with_tags.vm_guid WHERE ( vdc_users_with_tags.department LIKE '%%%' OR vdc_users_with_tags.domain LIKE '%%%' OR vdc_users_with_tags.mla_role LIKE '%%%' OR vdc_users_with_tags.name LIKE '%%%' OR vdc_users_with_tags.surname LIKE '%%%' OR vdc_users_with_tags.tag_name LIKE '%%%' OR vdc_users_with_tags.user_group LIKE '%%%' OR vdc_users_with_tags.username LIKE '%%%' OR vdc_users_with_tags.vm_pool_name LIKE '%%%' ) )) ORDER BY name ASC ) as T1 OFFSET (1 -1) LIMIT 0"); + } + + @Test public void testUser() { testValidSql("User:", "SELECT * FROM (SELECT * FROM vdc_users WHERE ( user_id IN (SELECT distinct vdc_users_with_tags.user_id FROM vdc_users_with_tags )) ORDER BY name ASC ) as T1 OFFSET (1 -1) LIMIT 0"); -- To view, visit https://gerrit.ovirt.org/40535 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8aa5f9d9fbf462c64639f4f8f2865cf064e960ab Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liran Zelkha <lzel...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
