Liran Zelkha has uploaded a new change for review. Change subject: core: Fix search for templates on username ......................................................................
core: Fix search for templates on username [search] Templates: Users.usrname = causes PSQLException: ERROR: missing FROM-clause entry for table "vms" This patch fixes this behavior Change-Id: Ia3051c13fce1a7e1733624e078bad28fa7e0dfb7 Bug-Url: https://bugzilla.redhat.com/1187703 Signed-off-by: [email protected] <[email protected]> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/38511/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java index fb690e8..07c041a 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java @@ -711,7 +711,7 @@ } if (refObjList.contains(SearchObjects.VDC_USER_OBJ_NAME)) { innerJoins.addLast(mSearchObjectAC.getInnerJoin(SearchObjects.VM_OBJ_NAME, - SearchObjects.VDC_USER_OBJ_NAME, useTags)); + SearchObjects.VDC_USER_OBJ_NAME, true)); refObjList.remove(SearchObjects.VDC_USER_OBJ_NAME); } if (refObjList.contains(SearchObjects.VDS_OBJ_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 ec4bdd8..f481d60 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 @@ -235,6 +235,12 @@ } @Test + public void testTemplateUsers() { + 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 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/38511 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3051c13fce1a7e1733624e078bad28fa7e0dfb7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liran Zelkha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
