Author: eevans
Date: Mon Jul 18 23:38:50 2011
New Revision: 1148099
URL: http://svn.apache.org/viewvc?rev=1148099&view=rev
Log:
make test urls consistent with url parsing
Modified:
cassandra/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java
cassandra/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
cassandra/drivers/java/test/org/apache/cassandra/cql/jdbc/PreparedStatementTest.java
Modified:
cassandra/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java
URL:
http://svn.apache.org/viewvc/cassandra/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java?rev=1148099&r1=1148098&r2=1148099&view=diff
==============================================================================
---
cassandra/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java
(original)
+++
cassandra/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java
Mon Jul 18 23:38:50 2011
@@ -88,7 +88,7 @@ class CassandraConnection extends Abstra
String[] s = new String[0];
if ((userInfo != null) && (!userInfo.isEmpty()))
- s = userInfo.split(";");
+ s = userInfo.split(":");
// use user and password from the properties file( which takes
precedence over url values)
String username = props.getProperty("user", (s.length > 0) ? s[0]
: null);
Modified:
cassandra/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
URL:
http://svn.apache.org/viewvc/cassandra/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java?rev=1148099&r1=1148098&r2=1148099&view=diff
==============================================================================
--- cassandra/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
(original)
+++ cassandra/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
Mon Jul 18 23:38:50 2011
@@ -59,7 +59,7 @@ public class JdbcDriverTest extends Embe
{
startCassandraServer();
Class.forName("org.apache.cassandra.cql.jdbc.CassandraDriver");
- con =
DriverManager.getConnection("jdbc:cassandra:root/root@localhost:9170/Keyspace1");
+ con =
DriverManager.getConnection("jdbc:cassandra://root:root@localhost:9170/Keyspace1");
String[] inserts =
{
String.format("UPDATE Standard1 SET '%s' = '%s', '%s' = '%s' WHERE
KEY = '%s'", first, firstrec, last, lastrec, jsmith),
Modified:
cassandra/drivers/java/test/org/apache/cassandra/cql/jdbc/PreparedStatementTest.java
URL:
http://svn.apache.org/viewvc/cassandra/drivers/java/test/org/apache/cassandra/cql/jdbc/PreparedStatementTest.java?rev=1148099&r1=1148098&r2=1148099&view=diff
==============================================================================
---
cassandra/drivers/java/test/org/apache/cassandra/cql/jdbc/PreparedStatementTest.java
(original)
+++
cassandra/drivers/java/test/org/apache/cassandra/cql/jdbc/PreparedStatementTest.java
Mon Jul 18 23:38:50 2011
@@ -44,7 +44,7 @@ public class PreparedStatementTest exten
{
startCassandraServer();
Class.forName("org.apache.cassandra.cql.jdbc.CassandraDriver");
- con =
DriverManager.getConnection("jdbc:cassandra:root/root@localhost:9170/Keyspace1");
+ con =
DriverManager.getConnection("jdbc:cassandra://root:root@localhost:9170/Keyspace1");
}
@Test
