You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/07/01 21:49:33 UTC
svn commit: r1142046 - in /cassandra/drivers/java: CHANGES.txt
src/org/apache/cassandra/cql/jdbc/CassandraDriver.java
Author: jbellis
Date: Fri Jul 1 19:49:33 2011
New Revision: 1142046
URL: http://svn.apache.org/viewvc?rev=1142046&view=rev
Log:
cooperate with other jdbc drivers
patch by Rick Shaw; reviewed by jbellis for CASSANDRA-2842
Modified:
cassandra/drivers/java/CHANGES.txt
cassandra/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDriver.java
Modified: cassandra/drivers/java/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/drivers/java/CHANGES.txt?rev=1142046&r1=1142045&r2=1142046&view=diff
==============================================================================
--- cassandra/drivers/java/CHANGES.txt (original)
+++ cassandra/drivers/java/CHANGES.txt Fri Jul 1 19:49:33 2011
@@ -1,2 +1,3 @@
1.0.4
* improve JDBC spec compliance (CASSANDRA-2720, 2754)
+ * cooperate with other jdbc drivers (CASSANDRA-2842)
Modified: cassandra/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDriver.java
URL: http://svn.apache.org/viewvc/cassandra/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDriver.java?rev=1142046&r1=1142045&r2=1142046&view=diff
==============================================================================
--- cassandra/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDriver.java (original)
+++ cassandra/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDriver.java Fri Jul 1 19:49:33 2011
@@ -20,6 +20,8 @@
*/
package org.apache.cassandra.cql.jdbc;
+import static org.apache.cassandra.cql.jdbc.Utils.*;
+
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
@@ -39,12 +41,7 @@ import java.util.Properties;
/** The Constant MINOR_VERSION. */
private static final int MINOR_VERSION = 0;
-
- private static final String BAD_URL = "Invalid connection url: '%s'. it should start with 'jdbc:cassandra:'";
- /** The ACCEPT s_ url. */
- public static final String ACCEPTS_URL = "jdbc:cassandra:";
-
// private static final Logger logger = LoggerFactory.getLogger(CassandraDriver.class);
static
@@ -66,7 +63,7 @@ import java.util.Properties;
*/
public boolean acceptsURL(String url) throws SQLException
{
- return url.startsWith(ACCEPTS_URL);
+ return url.startsWith(PROTOCOL);
}
/**
@@ -80,7 +77,7 @@ import java.util.Properties;
}
else
{
- throw new SQLNonTransientConnectionException(String.format(BAD_URL, url));
+ return null; // signal it is the wrong driver for this protocol:subprotocol
}
}