Repository: metamodel Updated Branches: refs/heads/master 491ab5161 -> c1cc5d803
Allow empty spaces before AS keyword. This closes #METAMODEL-138 Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/c1cc5d80 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/c1cc5d80 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/c1cc5d80 Branch: refs/heads/master Commit: c1cc5d803f4cc9579d87c5f257d2072a855d12d3 Parents: 491ab51 Author: Alberto Rodriguez <[email protected]> Authored: Tue May 5 15:29:07 2015 +0200 Committer: Alberto Rodriguez <[email protected]> Committed: Tue May 5 15:29:07 2015 +0200 ---------------------------------------------------------------------- .../org/apache/metamodel/query/parser/SelectItemParser.java | 2 +- .../java/org/apache/metamodel/query/parser/QueryParserTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/c1cc5d80/core/src/main/java/org/apache/metamodel/query/parser/SelectItemParser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/parser/SelectItemParser.java b/core/src/main/java/org/apache/metamodel/query/parser/SelectItemParser.java index b2401c0..37c59f2 100644 --- a/core/src/main/java/org/apache/metamodel/query/parser/SelectItemParser.java +++ b/core/src/main/java/org/apache/metamodel/query/parser/SelectItemParser.java @@ -62,7 +62,7 @@ public final class SelectItemParser implements QueryPartProcessor { final int indexOfAlias = itemToken.toUpperCase().lastIndexOf(" AS "); if (indexOfAlias != -1) { alias = itemToken.substring(indexOfAlias + " AS ".length()); - itemToken = itemToken.substring(0, indexOfAlias); + itemToken = itemToken.substring(0, indexOfAlias).trim(); } try { http://git-wip-us.apache.org/repos/asf/metamodel/blob/c1cc5d80/core/src/test/java/org/apache/metamodel/query/parser/QueryParserTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/metamodel/query/parser/QueryParserTest.java b/core/src/test/java/org/apache/metamodel/query/parser/QueryParserTest.java index a6c2e9e..401dcf7 100644 --- a/core/src/test/java/org/apache/metamodel/query/parser/QueryParserTest.java +++ b/core/src/test/java/org/apache/metamodel/query/parser/QueryParserTest.java @@ -113,6 +113,11 @@ public class QueryParserTest extends TestCase { assertEquals("SELECT MIN(tbl.foo) FROM sch.tbl", q.toSql()); } + public void testSelectEmptySpacesBeforeAs() throws Exception { + Query q = MetaModelHelper.parseQuery(dc, "SELECT tbl.foo AS alias FROM sch.tbl"); + assertEquals("SELECT tbl.foo AS alias FROM sch.tbl", q.toSql()); + } + public void testSelectAvgInLowerCase() throws Exception { Query q = MetaModelHelper.parseQuery(dc, "SELECT avg(tbl.foo) FROM sch.tbl"); assertEquals("SELECT AVG(tbl.foo) FROM sch.tbl", q.toSql());
