From 8589d04739e1c8161f34b5ac95787979f49c9cb6 Mon Sep 17 00:00:00 2001
From: Philip Thompson <ptnapoleon@gmail.com>
Date: Fri, 19 Sep 2014 16:01:30 -0500
Subject: [PATCH] cqlsh: Fix UDT field selection

Patch by Philip Thompson; reviewed by Tyler Hobbs for CASSANDRA-7891
---
 CHANGES.txt                    | 1 +
 pylib/cqlshlib/cql3handling.py | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index f55e5d27c1..ee313a850c 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)
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 43882dec5f..994f358062 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>