From commits-return-12717-archive-asf-public=cust-asf.ponee.io@syncope.apache.org Mon Dec 10 15:39:15 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id F0A4B180648 for ; Mon, 10 Dec 2018 15:39:14 +0100 (CET) Received: (qmail 40641 invoked by uid 500); 10 Dec 2018 14:39:14 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 40616 invoked by uid 99); 10 Dec 2018 14:39:14 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Dec 2018 14:39:14 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 853AF82F19; Mon, 10 Dec 2018 14:39:13 +0000 (UTC) Date: Mon, 10 Dec 2018 14:39:15 +0000 To: "commits@syncope.apache.org" Subject: [syncope] 02/04: [SYNCOPE-1412] changes in order to avoid null_attr views MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: fmartelli@apache.org In-Reply-To: <154445275341.20617.8691374741100812031@gitbox.apache.org> References: <154445275341.20617.8691374741100812031@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: syncope X-Git-Refname: refs/heads/2_1_X X-Git-Reftype: branch X-Git-Rev: 497d6fcc03ffc304df58dfdfe93922d88fca275a X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20181210143913.853AF82F19@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. fmartelli pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git commit 497d6fcc03ffc304df58dfdfe93922d88fca275a Author: fmartelli AuthorDate: Mon Dec 10 14:37:22 2018 +0100 [SYNCOPE-1412] changes in order to avoid null_attr views --- .../syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java index 02e2535..942cc95 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java @@ -877,15 +877,17 @@ public class JPAAnySearchDAO extends AbstractAnySearchDAO { StringBuilder query = new StringBuilder("SELECT DISTINCT any_id FROM "); switch (cond.getType()) { case ISNOTNULL: - query.append(svs.field().name). - append(" WHERE any_id NOT IN (SELECT any_id FROM "). - append(svs.asSearchViewSupport().nullAttr().name). - append(" WHERE schema_id='").append(checked.getLeft().getKey()).append("')"); + query.append(svs.attr().name).append(" WHERE schema_id="). + append("'").append(checked.getLeft().getKey()).append("'"); break; case ISNULL: - query.append(svs.asSearchViewSupport().nullAttr().name). - append(" WHERE schema_id='").append(checked.getLeft().getKey()).append("'"); + query.append(svs.field().name). + append(" WHERE any_id NOT IN "). + append("("). + append("SELECT DISTINCT any_id FROM ").append(svs.attr().name).append(" WHERE schema_id="). + append("'").append(checked.getLeft().getKey()).append("'"). + append(")"); break; default: