cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Fix testing CQL2 key aliases
Date Thu, 04 Jul 2013 13:32:48 GMT
Updated Branches:
  refs/heads/trunk 67ccdabfe -> b7e49b3ab


Fix testing CQL2 key aliases


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7e49b3a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7e49b3a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7e49b3a

Branch: refs/heads/trunk
Commit: b7e49b3ab16ad601df76b57ba47a6c685f28578d
Parents: 67ccdab
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Jul 4 15:32:41 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Jul 4 15:32:41 2013 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cql/QueryProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7e49b3a/src/java/org/apache/cassandra/cql/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/QueryProcessor.java b/src/java/org/apache/cassandra/cql/QueryProcessor.java
index 9e437b1..e68aa7f 100644
--- a/src/java/org/apache/cassandra/cql/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql/QueryProcessor.java
@@ -270,7 +270,7 @@ public class QueryProcessor
     public static void validateKeyAlias(CFMetaData cfm, String key) throws InvalidRequestException
     {
         assert key.toUpperCase().equals(key); // should always be uppercased by caller
-        String realKeyAlias = cfm.getCQL2KeyName();
+        String realKeyAlias = cfm.getCQL2KeyName().toUpperCase();
         if (!realKeyAlias.equals(key))
             throw new InvalidRequestException(String.format("Expected key '%s' to be present
in WHERE clause for '%s'", realKeyAlias, cfm.cfName));
     }


Mime
View raw message