From cdec74a809d8a29dc46da4a1247bdf29e77e2b4d Mon Sep 17 00:00:00 2001 From: Adam Heath Date: Tue, 22 Dec 2009 06:08:15 +0000 Subject: [PATCH] Fix alias-based fielddef parsing. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@893076 13f79535-47bb-0310-9956-ffa450edef68 --- framework/sql/src/org/ofbiz/sql/Parser.jj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/sql/src/org/ofbiz/sql/Parser.jj b/framework/sql/src/org/ofbiz/sql/Parser.jj index dff5aa22bb..477e086cba 100644 --- a/framework/sql/src/org/ofbiz/sql/Parser.jj +++ b/framework/sql/src/org/ofbiz/sql/Parser.jj @@ -551,7 +551,7 @@ private void FieldDef(Map fieldDefs, List fieldAlls, )? { fieldAlls.add(new FieldAll(n, excludeList)); return; } - | fieldName=NamePart() ( fieldAlias=NamePart() )? { def = new FieldDefValue(new FieldValue(n, fieldName), fieldAlias); } + | fieldName=NamePart() ( fieldAlias=NamePart() )? { def = new FieldDefFieldValue(new FieldValue(n, fieldName), fieldAlias); } ) | v=FunctionCallRest(n) fieldAlias=NamePart() { def = new FieldDefValue(v, fieldAlias); } | ( fieldAlias=NamePart() )? { def = new FieldDefFieldValue(new FieldValue(null, n), fieldAlias); }