summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorptmcg <ptmcg@9bf210a0-9d2d-494c-87cf-cfb32e7dff7b>2016-08-18 12:58:31 +0000
committerptmcg <ptmcg@9bf210a0-9d2d-494c-87cf-cfb32e7dff7b>2016-08-18 12:58:31 +0000
commitc9e2a078029d2aa17ef7f6cd85c54bf297a403c4 (patch)
tree0768704549869fab7a224556828acb8d3bab453c
parentf1fc1015646028bee1a8c5052e85def25847324f (diff)
downloadpyparsing-c9e2a078029d2aa17ef7f6cd85c54bf297a403c4.tar.gz
Fix 'from' results name to include all join elements.
git-svn-id: svn://svn.code.sf.net/p/pyparsing/code/trunk@426 9bf210a0-9d2d-494c-87cf-cfb32e7dff7b
-rw-r--r--src/examples/select_parser.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/examples/select_parser.py b/src/examples/select_parser.py
index da106ac..5b823a4 100644
--- a/src/examples/select_parser.py
+++ b/src/examples/select_parser.py
@@ -99,7 +99,7 @@ join_source << (Group(single_source + OneOrMore(join_op + single_source + join_c
result_column = "*" | table_name + "." + "*" | Group(expr + Optional(Optional(AS) + column_alias))
select_core = (SELECT + Optional(DISTINCT | ALL) + Group(delimitedList(result_column))("columns") +
- Optional(FROM + join_source("from")) +
+ Optional(FROM + join_source("from*")) +
Optional(WHERE + expr("where_expr")) +
Optional(GROUP + BY + Group(delimitedList(ordering_term)("group_by_terms")) +
Optional(HAVING + expr("having_expr"))))