You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/01/07 21:29:57 UTC
[1/2] cassandra git commit: Ninja: fix minor unit test regression
from CASSANDRA-8365
Repository: cassandra
Updated Branches:
refs/heads/trunk 65ffc39b1 -> 2b7522f66
Ninja: fix minor unit test regression from CASSANDRA-8365
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96365bf5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96365bf5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96365bf5
Branch: refs/heads/trunk
Commit: 96365bf551d4b0397e7689fc2bed33b86532f500
Parents: bdbb071
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jan 7 14:29:07 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jan 7 14:29:07 2015 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/Cql.g | 2 +-
test/unit/org/apache/cassandra/cql3/UseStatementTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96365bf5/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Cql.g b/src/java/org/apache/cassandra/cql3/Cql.g
index 1fcdb71..eda0529 100644
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@ -854,7 +854,7 @@ ksName[KeyspaceElementName name]
: t=IDENT { $name.setKeyspace($t.text, false);}
| t=QUOTED_NAME { $name.setKeyspace($t.text, true);}
| k=unreserved_keyword { $name.setKeyspace(k, false);}
- | QMARK {addRecognitionError("Bind variables cannot be used for keyspace");}
+ | QMARK {addRecognitionError("Bind variables cannot be used for keyspace names");}
;
cfName[CFName name]
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96365bf5/test/unit/org/apache/cassandra/cql3/UseStatementTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/UseStatementTest.java b/test/unit/org/apache/cassandra/cql3/UseStatementTest.java
index 77ac8a7..66b4b42 100644
--- a/test/unit/org/apache/cassandra/cql3/UseStatementTest.java
+++ b/test/unit/org/apache/cassandra/cql3/UseStatementTest.java
@@ -24,6 +24,6 @@ public class UseStatementTest extends CQLTester
@Test
public void testUseStatementWithBindVariable() throws Throwable
{
- assertInvalidSyntaxMessage("Bind variables cannot be used for keyspace or table names", "USE ?");
+ assertInvalidSyntaxMessage("Bind variables cannot be used for keyspace names", "USE ?");
}
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2b7522f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b7522f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b7522f6
Branch: refs/heads/trunk
Commit: 2b7522f6678d45b6d9aa207c617cfafac4d5d591
Parents: 65ffc39 96365bf
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jan 7 14:29:46 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jan 7 14:29:46 2015 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/Cql.g | 2 +-
test/unit/org/apache/cassandra/cql3/UseStatementTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b7522f6/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------