Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8EF5D95DE for ; Thu, 19 Apr 2012 20:54:44 +0000 (UTC) Received: (qmail 25431 invoked by uid 500); 19 Apr 2012 20:54:43 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 25369 invoked by uid 500); 19 Apr 2012 20:54:43 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 25055 invoked by uid 99); 19 Apr 2012 20:54:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Apr 2012 20:54:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7F4F5D914; Thu, 19 Apr 2012 20:54:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [8/9] git commit: fix recognizing uppercase SELECT keyword patch by Jonas Dohse and pcannon for CASSANDRA-4161 Message-Id: <20120419205442.7F4F5D914@tyr.zones.apache.org> Date: Thu, 19 Apr 2012 20:54:42 +0000 (UTC) fix recognizing uppercase SELECT keyword patch by Jonas Dohse and pcannon for CASSANDRA-4161 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc975e8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc975e8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc975e8a Branch: refs/heads/cassandra-1.1.0 Commit: dc975e8ac3c6fc557e8b2b3ad83742bd259f91ac Parents: 43a472e Author: Jonathan Ellis Authored: Thu Apr 19 14:00:32 2012 -0500 Committer: Jonathan Ellis Committed: Thu Apr 19 14:00:32 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc975e8a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c6fa3d3..8a9d924 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.1-dev + * (cqlsh) fix recognizing uppercase SELECT keyword (CASSANDRA-4161) * average a reduced liveRatio estimate with the previous one (CASSANDRA-4065) * Allow KS and CF names up to 48 characters (CASSANDRA-4157) * Add support for CL.TWO and CL.THREE in CQL (CASSANDRA-4156) http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc975e8a/bin/cqlsh ---------------------------------------------------------------------- diff --git a/bin/cqlsh b/bin/cqlsh index 505b705..c26324a 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -804,7 +804,7 @@ class Shell(cmd.Cmd): return self.perform_statement(cqlhandling.cql_extract_orig(tokens, srcstr)) def handle_parse_error(self, cmdword, tokens, parsed, srcstr): - if cmdword == 'select': + if cmdword.lower() == 'select': # hey, maybe they know about some new syntax we don't. type # assumptions won't work, but maybe the query will. return self.perform_statement(cqlhandling.cql_extract_orig(tokens, srcstr))