Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 488e775cc -> 8589d0473
cqlsh: Fix UDT field selection Patch by Philip Thompson; reviewed by Tyler Hobbs for CASSANDRA-7891 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8589d047 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8589d047 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8589d047 Branch: refs/heads/cassandra-2.1 Commit: 8589d04739e1c8161f34b5ac95787979f49c9cb6 Parents: 488e775 Author: Philip Thompson <[email protected]> Authored: Fri Sep 19 16:01:30 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Sep 19 16:02:40 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8589d047/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f55e5d2..ee313a8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.1 + * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891) * Fix resource leak in event of corrupt sstable * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131) * Provide visibility into prepared statements churn (CASSANDRA-7921, CASSANDRA-7930) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8589d047/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py index 43882de..994f358 100644 --- a/pylib/cqlshlib/cql3handling.py +++ b/pylib/cqlshlib/cql3handling.py @@ -605,7 +605,10 @@ syntax_rules += r''' | "*" | "COUNT" "(" star=( "*" | "1" ) ")" ("AS" <cident>)? ; +<udtSubfieldSelection> ::= <identifier> "." <identifier> + ; <selector> ::= [colname]=<cident> + | <udtSubfieldSelection> | "WRITETIME" "(" [colname]=<cident> ")" | "TTL" "(" [colname]=<cident> ")" | <functionName> <selectionFunctionArguments>
