Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 733321834A for ; Fri, 24 Jul 2015 02:19:18 +0000 (UTC) Received: (qmail 76809 invoked by uid 500); 24 Jul 2015 02:18:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 76779 invoked by uid 500); 24 Jul 2015 02:18:44 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 76769 invoked by uid 99); 24 Jul 2015 02:18:44 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jul 2015 02:18:43 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 723C1C0708 for ; Fri, 24 Jul 2015 02:18:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id oFTvGGE5JOxS for ; Fri, 24 Jul 2015 02:18:42 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id D9C2A50634 for ; Fri, 24 Jul 2015 02:18:30 +0000 (UTC) Received: (qmail 76113 invoked by uid 99); 24 Jul 2015 02:18:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jul 2015 02:18:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1AF4DE6840; Fri, 24 Jul 2015 02:18:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 24 Jul 2015 02:18:57 -0000 Message-Id: In-Reply-To: <9c88714d786748c380f054c95b280701@git.apache.org> References: <9c88714d786748c380f054c95b280701@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [29/50] incubator-ignite git commit: ignite-1015 - HAVING alias fix ignite-1015 - HAVING alias fix Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cbdc6143 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cbdc6143 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cbdc6143 Branch: refs/heads/ignite-gg-10576 Commit: cbdc6143a7df7a7c39c11ef073c64de300414360 Parents: 1486aea Author: S.Vladykin Authored: Wed Jul 22 06:09:33 2015 +0300 Committer: S.Vladykin Committed: Wed Jul 22 06:09:33 2015 +0300 ---------------------------------------------------------------------- .../processors/query/h2/sql/GridSqlSelect.java | 25 +++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cbdc6143/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java index 84b0031..08304aa 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java @@ -84,19 +84,17 @@ public class GridSqlSelect extends GridSqlQuery { buff.resetCount(); for (int grpCol : grpCols) { - GridSqlElement expression = allExprs.get(grpCol); - buff.appendExceptFirst(", "); - if (expression instanceof GridSqlAlias) - buff.append(StringUtils.unEnclose((expression.child().getSQL()))); - else - buff.append(StringUtils.unEnclose(expression.getSQL())); + addAlias(buff, allExprs.get(grpCol)); } } - if (havingCol >= 0) - buff.append("\nHAVING ").append(StringUtils.unEnclose(allExprs.get(havingCol).getSQL())); + if (havingCol >= 0) { + buff.append("\nHAVING "); + + addAlias(buff, allExprs.get(havingCol)); + } getSortLimitSQL(buff); @@ -104,6 +102,17 @@ public class GridSqlSelect extends GridSqlQuery { } /** + * @param buff Statement builder. + * @param expression Alias expression. + */ + private static void addAlias(StatementBuilder buff, GridSqlElement expression) { + if (expression instanceof GridSqlAlias) + expression = expression.child(); + + buff.append(StringUtils.unEnclose(expression.getSQL())); + } + + /** * @param visibleOnly If only visible expressions needed. * @return Select phrase expressions. */