cassandra-driver 1.1.0-java → 1.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba36bd754db916c52e42130906733192c16ec6fa
-  data.tar.gz: dd30b1f020b3647d686e901638305b93c6286412
+  metadata.gz: 984d90b0ce4b175a04a676dca086bc1ea986326c
+  data.tar.gz: 78893f940c6799e77ee062edc206dfb7b6747801
 SHA512:
-  metadata.gz: e4e143ed5e11f1d2f88fefee54acd0ac3a92ffd2d8f650cf34b2c090041ee1f8e359c3b9c2b93dafd2e6ec8582a691d351e1c8371c4bc376e630273f3e1c0e0e
-  data.tar.gz: bca986745e23c0efc77e24cf2f816e94db79479079dfa2c115476f6d9c14b9c69ad17468f112ea6b65dc4f803f62da14048d25f16ec1eb4f1a073b8e4efb71c7
+  metadata.gz: e9cbe330d6fab7ab4aed5c48345a04f25adb329ba40220d7eaf5e714fb3f4f8695063b6534f487b4f88f5dd6014976152360215a732e1209046a68bc72745344
+  data.tar.gz: 09e4ee074e44063aa14f4766aed0874560368c1c4cca7a353e5db37dda3876baf0b4d73b1a9380ae1705e6dd1905aae7ce198ce138f4f436e66b9a48f5e32c01

data/README.md

@@ -83,7 +83,7 @@ gem install cassandra-driver
 Install via Gemfile
 
 ```ruby
-gem 'cassandra-driver', '~> 1.0.0'
+gem 'cassandra-driver'
 ```
 
 __Note__: if you want to use compression you should also install [snappy](http://rubygems.org/gems/snappy) or [lz4-ruby](http://rubygems.org/gems/lz4-ruby). [Read more about compression.](http://datastax.github.io/ruby-driver/features/#compression)
@@ -93,7 +93,7 @@ __Note__: if you want to use compression you should also install [snappy](http:/
 
 Some of the new features added to the driver have unfortunately led to changes in the original cql-rb API. In the examples directory, you can find [an example of how to wrap the ruby driver to achieve almost complete interface parity with cql-rb](https://github.com/datastax/ruby-driver/blob/master/examples/cql-rb-wrapper.rb) to assist you with gradual upgrade.
 
-## What's new in v1.1.0
+## What's new in v1.1.1
 
 Current release introduces the following new features:
 

data/lib/cassandra/cluster/client.rb

@@ -213,6 +213,8 @@ module Cassandra
       end
 
       def batch(statement, options)
+        return @futures.error(Errors::ClientError.new("Batch statements are not supported by the current version of Apache Cassandra")) if @connection_options.protocol_version < 2
+
         timeout  = options.timeout
         keyspace = @keyspace
         plan     = @load_balancing_policy.plan(keyspace, statement, options)

data/lib/cassandra/cluster/schema.rb

@@ -225,7 +225,7 @@ module Cassandra
           max_index = nil
 
           columns.each do |cl|
-            if cl['type'].upcase == 'CLUSTERING_KEY'
+            if cl['type'].to_s.upcase == 'CLUSTERING_KEY'
               index = cl['component_index'] || 0
 
               if max_index.nil? || index > max_index
@@ -284,7 +284,7 @@ module Cassandra
             next if row['column_name'].empty?
 
             column = create_column(row)
-            type   = row['type']
+            type   = row['type'].to_s
             index  = row['component_index'] || 0
 
             case type.upcase
@@ -321,7 +321,7 @@ module Cassandra
 
         if column['index_type'].nil?
           index   = nil
-        elsif column['index_type'].upcase == 'CUSTOM' || !column['index_options']
+        elsif column['index_type'].to_s.upcase == 'CUSTOM' || !column['index_options']
           index   = Column::Index.new(column['index_name'])
         else
           options = ::JSON.load(column['index_options'])

data/lib/cassandra/future.rb

@@ -201,6 +201,7 @@ module Cassandra
             end
           end
         end
+        promise.future
       end
     end
 
@@ -233,6 +234,11 @@ module Cassandra
       @@factory.all(*futures)
     end
 
+    # Returns a new promise instance
+    def self.promise
+      @@factory.promise
+    end
+
     # @private
     def initialize(signal)
       @signal = signal

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: java
 authors:
 - Theo Hultberg