Merge branch 'release/3.1.0'

Author: adejanovski

README.rst

@@ -1,8 +1,8 @@
 Cassandra JDBC wrapper for the Datastax Java Driver
 ===================================================
 
-This is the jdbc wrapper of the DataStax Java Driver for Apache Cassandra (C*), 
-which offers a simple JDBC compliant API to work with CQL3. 
+This is the jdbc wrapper of the DataStax Java Driver for Apache Cassandra (C*),
+which offers a simple JDBC compliant API to work with CQL3.
 
 
 Features
@@ -23,7 +23,7 @@ The JDBC wrapper offers access to most of the core module features:
     automatically and transparently tries other nodes and schedules
     reconnection to the dead nodes in the background.
   - Convenient schema access: the driver exposes a C* schema in a usable way.
-  
+
 
 Prerequisite
 ------------
@@ -48,11 +48,11 @@ Installing
 
 The last release of the driver is available on Maven Central. You can install
 it in your application using the following Maven dependency::
-    
+
     <dependency>
 		<groupId>com.github.adejanovski</groupId>
 		<artifactId>cassandra-jdbc-wrapper</artifactId>
-		<version>3.0.3</version>
+		<version>3.1.0</version>
 	</dependency>
 
 Or get the `fat jar with all dependencies included <https://drive.google.com/folderview?id=0B7fwX0DqcWSTNzZianJrWDI2bHc&usp=sharing#list>`_.
@@ -66,8 +66,8 @@ Connect to a Cassandra cluster using the following arguments::
     JDBC URL : jdbc:cassandra://host1--host2--host3:9042/keyspace
 
 
-    	
-You can give the driver any number of host you want seperated by "--". 
+
+You can give the driver any number of host you want seperated by "--".
 They will be used as contact points for the driver to discover the entire cluster.
 Give enough hosts taking into account that some nodes may be unavailable upon establishing the JDBC connection.
 
@@ -77,7 +77,7 @@ Java sample::
 
     Class.forName("com.github.adejanovski.cassandra.jdbc.CassandraDriver");
     String URL = "jdbc:cassandra://host1--host2--host3:9042/keyspace1";
-    connection = DriverManager.getConnection(URL); 
+    connection = DriverManager.getConnection(URL);
 
 
 Specifying load balancing policies
@@ -136,7 +136,7 @@ Consistency level defaults to ONE if not specified.
 Using simple statements
 -----------------------
 
-To issue a simple select and get data from it:: 
+To issue a simple select and get data from it::
 
     statement = connection.createStatement();
     ResultSet result = statement.executeQuery("SELECT bValue,iValue FROM test_table WHERE keyname='key0';");
@@ -149,28 +149,28 @@ To issue a simple select and get data from it::
 Using Prepared statements
 -------------------------
 
-Considering the following table:: 
+Considering the following table::
 
-    CREATE TABLE table1 
-        (bigint_col bigint PRIMARY KEY, ascii_col ascii , blob_col blob, boolean_col boolean, 
-        decimal_col decimal, double_col double, float_col float, inet_col inet, int_col int, 
-        text_col text, timestamp_col timestamp, uuid_col uuid, 
+    CREATE TABLE table1
+        (bigint_col bigint PRIMARY KEY, ascii_col ascii , blob_col blob, boolean_col boolean,
+        decimal_col decimal, double_col double, float_col float, inet_col inet, int_col int,
+        text_col text, timestamp_col timestamp, uuid_col uuid,
         timeuuid_col timeuuid, varchar_col varchar, varint_col varint,string_set_col set<text>,
         string_list_col list<text>, string_map_col map<text,text>
         );
 
 
-Prepared statements to insert a record in "table1":: 
+Prepared statements to insert a record in "table1"::
 
     String insert = "INSERT INTO table1(bigint_col , ascii_col , blob_col , boolean_col , decimal_col , double_col , "
                     + "float_col , inet_col , int_col , text_col , timestamp_col , uuid_col , timeuuid_col , varchar_col , varint_col, string_set_col, string_list_col, string_map_col) "
                     + " values(?, ?, ?, ?, ?, ? , ?, ? , ? , ?, ? , ? , now(), ? , ?, ?, ?, ? );";
-    
+
     PreparedStatement pstatement = connection.prepareStatement(insert);
-    
-    
+
+
     pstatement.setObject(1, 1L); // bigint
-    pstatement.setObject(2, "test"); // ascii                             
+    pstatement.setObject(2, "test"); // ascii
     pstatement.setObject(3, new ByteArrayInputStream("test".getBytes("UTF-8"))); // blob
     pstatement.setObject(4, true); // boolean
     pstatement.setObject(5, new BigDecimal(5.1));  // decimal
@@ -184,7 +184,7 @@ Prepared statements to insert a record in "table1"::
     UUID uuid = UUID.randomUUID();
     pstatement.setObject(12, uuid );  // uuid
     pstatement.setObject(13, "test");  // varchar
-    pstatement.setObject(14, 1);        
+    pstatement.setObject(14, 1);
     HashSet<String> mySet = new HashSet<String>();
     mySet.add("test");
     mySet.add("test");
@@ -197,7 +197,7 @@ Prepared statements to insert a record in "table1"::
     myMap.put("1","test");
     myMap.put("2","test");
     pstatement.setObject(17, myMap);
-            
+
     pstatement.execute();
 
 
@@ -215,20 +215,20 @@ With simple statements::
     for(int i=0;i<10;i++){
         statement.addBatch("INSERT INTO testcollection (k,L) VALUES( " + i + ",[1, 3, 12345])");
     }
-       
+
     int[] counts = statement.executeBatch();
     statement.close();
 
 With prepared statements::
 
     PreparedStatement statement = con.prepareStatement("INSERT INTO testcollection (k,L) VALUES(?,?)");
-        
+
     for(int i=0;i<10;i++){
         statement.setInt(1, i);
         statement.setString(2, "[1, 3, 12345]");
         statement.addBatch();
     }
-        
+
     int[] counts = statement.executeBatch();
     statement.close();
 
@@ -237,12 +237,12 @@ With prepared statements::
 The second one is to put all the queries in a single CQL statement, each ended with a semicolon (;)::
 
     Statement statement = con.createStatement();
-            
-    StringBuilder queryBuilder = new StringBuilder();        
+
+    StringBuilder queryBuilder = new StringBuilder();
     for(int i=0;i<10;i++){
         queryBuilder.append("INSERT INTO testcollection (k,L) VALUES( " + i + ",[1, 3, 12345]);");
     }
-        
+
     statement.execute(queryBuilder.toString());
     statement.close();
 
@@ -255,15 +255,15 @@ As JDBC batches do not support returning result sets, there is only one way to s
     for(int i=0;i<10;i++){
         queries.append("SELECT * FROM testcollection where k = "+ i + ";");
     }
-    
+
     //send all select queries at onces
     ResultSet result = statement.executeQuery(queries.toString());
 
     int nbRow = 0;
-    ArrayList<Integer> ids = new ArrayList<Integer>(); 
+    ArrayList<Integer> ids = new ArrayList<Integer>();
 
     // get all results from all the select queries in a single result set
-    while(result.next()){        
+    while(result.next()){
         ids.add(result.getInt("k"));
     }
 
@@ -274,32 +274,32 @@ Working with Tuples and UDTs
 ----------------------------
 
 To create a new Tuple object in Java, use the TupleType.of().newValue() method.
-UDT fields cannot be instantiated outside of the Datastax Java driver core. If you want to use prepared statements, you must proceed as in the following example:: 
+UDT fields cannot be instantiated outside of the Datastax Java driver core. If you want to use prepared statements, you must proceed as in the following example::
 
 	String createUDT = "CREATE TYPE IF NOT EXISTS fieldmap (key text, value text )";
-    
+
 	String createCF = "CREATE COLUMNFAMILY t_udt (id bigint PRIMARY KEY, field_values frozen<fieldmap>, the_tuple frozen<tuple<int, text, float>>, the_other_tuple frozen<tuple<int, text, float>>);";
 	stmt.execute(createUDT);
 	stmt.execute(createCF);
 	stmt.close();
-		        
-	
+
+
 	String insert = "INSERT INTO t_udt(id, field_values, the_tuple, the_other_tuple) values(?,{key : ?, value : ?}, (?,?,?),?);";
-	
-	
+
+
 	TupleValue t = TupleType.of(DataType.cint(), DataType.text(), DataType.cfloat()).newValue();
-	t.setInt(0, 1).setString(1, "midVal").setFloat(2, (float)2.0);	        
-    	
-	PreparedStatement pstatement = con.prepareStatement(insert);    
-	
-	pstatement.setLong(1, 1L); 	
-	pstatement.setString(2, "key1");        
+	t.setInt(0, 1).setString(1, "midVal").setFloat(2, (float)2.0);
+
+	PreparedStatement pstatement = con.prepareStatement(insert);
+
+	pstatement.setLong(1, 1L);
+	pstatement.setString(2, "key1");
 	pstatement.setString(3, "value1");
 	pstatement.setInt(4, 1);
 	pstatement.setString(5, "midVal");
 	pstatement.setFloat(6, (float) 2.0);
 	pstatement.setObject(7, (Object)t);
-	
+
 	pstatement.execute();
 	pstatement.close();
 
@@ -311,15 +311,12 @@ When working on collections of UDT types, it is not possible to use prepared sta
 	stmt.execute(createUDT);
 	stmt.execute(createCF);
 	stmt.close();
-	
+
 	System.out.println("con.getMetaData().getDatabaseProductName() = " + con.getMetaData().getDatabaseProductName());
 	System.out.println("con.getMetaData().getDatabaseProductVersion() = " + con.getMetaData().getDatabaseProductVersion());
 	System.out.println("con.getMetaData().getDriverName() = " + con.getMetaData().getDriverName());
-	Statement statement = con.createStatement();	
-	
+	Statement statement = con.createStatement();
+
 	String insert = "INSERT INTO t_udt_tuple_coll(id,field_values,the_tuple, field_values_map, tuple_map) values(1,{{key : 'key1', value : 'value1'},{key : 'key2', value : 'value2'}}, [(1, 'midVal1', 1.0),(2, 'midVal2', 2.0)], {'map_key1':{key : 'key1', value : 'value1'},'map_key2':{key : 'key2', value : 'value2'}}, {'tuple1':(1, 2),'tuple2':(2,3)} );";
 	statement.execute(insert);
 	statement.close();
-
-
-	

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.github.adejanovski</groupId>
 	<artifactId>cassandra-jdbc-wrapper</artifactId>
-	<version>3.0.3</version>
+	<version>3.1.0</version>
 
 	<packaging>jar</packaging>
 	<name>Cassandra JDBC Wrapper</name>

src/main/java/com/github/adejanovski/cassandra/jdbc/AbstractResultSet.java

@@ -56,7 +56,7 @@ public InputStream getAsciiStream(String arg0) throws SQLException
     }
 
 
-    public Blob getBlob(int arg0) throws SQLException
+    /*public Blob getBlob(int arg0) throws SQLException
     {
         throw new SQLFeatureNotSupportedException(NOT_SUPPORTED);
     }
@@ -65,7 +65,7 @@ public Blob getBlob(String arg0) throws SQLException
     {
         throw new SQLFeatureNotSupportedException(NOT_SUPPORTED);
     }
-
+*/
     public Reader getCharacterStream(int arg0) throws SQLException
     {
         throw new SQLFeatureNotSupportedException(NOT_SUPPORTED);

src/main/java/com/github/adejanovski/cassandra/jdbc/AbstractStatement.java

@@ -127,11 +127,7 @@ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLExce
         throw new SQLFeatureNotSupportedException(NOT_SUPPORTED);
     }
 
-    public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException
-    {
-        throw new SQLFeatureNotSupportedException(NOT_SUPPORTED);
-    }
-
+    
     public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException
     {
         throw new SQLFeatureNotSupportedException(NOT_SUPPORTED);

src/main/java/com/github/adejanovski/cassandra/jdbc/CassandraMetadataResultSet.java

@@ -1258,5 +1258,19 @@ public InputStream getBinaryStream(String columnLabel) throws SQLException {
 		return new ByteArrayInputStream(bytes);
 	}
 
+	@Override
+	public Blob getBlob(int index) throws SQLException {
+		checkIndex(index);
+		
+		return new javax.sql.rowset.serial.SerialBlob(currentRow.getBytes(index-1).array());
+	}
+
+	@Override
+	public Blob getBlob(String columnName) throws SQLException {
+		checkName(columnName);
+		
+		return new javax.sql.rowset.serial.SerialBlob(currentRow.getBytes(columnName).array());
+	}
+
 
 }