cassandra-cql 1.2.1 → 1.2.2

data/lib/cassandra-cql.rb

@@ -16,7 +16,7 @@ limitations under the License.
 
 module CassandraCQL; end;
 unless CassandraCQL.respond_to?(:CASSANDRA_VERSION)
-  require "cassandra-cql/1.1"
+  require "cassandra-cql/1.2"
 end
 
 here = File.expand_path(File.dirname(__FILE__))

data/lib/cassandra-cql/database.rb

@@ -36,12 +36,10 @@ module CassandraCQL
       @cql_version = @options[:cql_version]
       @servers = servers
       connect!
-      execute("USE #{@keyspace}")
     end
 
     def use_cql3?
-      (@cql_version.nil? || @cql_version.split('.').first.to_i >= 3) &&
-        CassandraCQL::Thrift::Client.method_defined?(:execute_cql3_query)
+      @use_cql3
     end
 
     def connect!
@@ -53,10 +51,18 @@ module CassandraCQL
 
       obj = self
       @connection.add_callback(:post_connect) do
-        @connection.set_cql_version(@cql_version) if @cql_version
+        if @connection.describe_version >= '19.35.0' && (!@cql_version || @cql_version >= '3.0.0')
+          @use_cql3 = true
+        elsif @cql_version
+          @use_cql3 = false
+          @connection.set_cql_version(@cql_version)
+        else
+          @use_cql3 = false
+        end
         @connection.login(@auth_request) if @auth_request
         execute("USE #{@keyspace}")
       end
+      @connection.connect!
     end
 
     def disconnect!

data/lib/cassandra-cql/statement.rb

@@ -72,19 +72,20 @@ module CassandraCQL
     def self.quote(obj, use_cql3=false)
       if obj.kind_of?(Array)
         obj.map { |member| quote(member, use_cql3) }.join(",")
+      elsif obj.kind_of?(Hash)
+        "{"+obj.map{ |key,val| "#{quote(cast_to_cql(key), use_cql3)}:#{quote(cast_to_cql(val), use_cql3)}" }.join(',')+"}"
       elsif obj.kind_of?(String)
         "'" + obj + "'"
-      elsif obj.kind_of?(BigDecimal) and (!use_cql3 or CASSANDRA_VERSION.to_f < 1.2)
+      elsif obj.kind_of?(BigDecimal) and !use_cql3
         "'" + obj.to_s + "'"
       elsif obj.kind_of?(Numeric)
         obj.to_s
       elsif obj.kind_of?(SimpleUUID::UUID)
         obj.to_guid
-      #elsif obj.kind_of?(TrueClass) or obj.kind_of?(FalseClass) and use_cql3 and CASSANDRA_VERSION.to_f == 1.2
-      #  obj.to_s
-      elsif obj.kind_of?(TrueClass) or obj.kind_of?(FalseClass)
-        #"'" + obj.to_s + "'"
+      elsif obj.kind_of?(TrueClass) or obj.kind_of?(FalseClass) and use_cql3
         obj.to_s
+      elsif obj.kind_of?(TrueClass) or obj.kind_of?(FalseClass)
+        "'" + obj.to_s + "'"
       else
         raise Error::UnescapableObject, "Unable to escape object of class #{obj.class}"
       end
@@ -93,6 +94,8 @@ module CassandraCQL
     def self.cast_to_cql(obj)
       if obj.kind_of?(Array)
         obj.map { |member| cast_to_cql(member) }
+      elsif obj.kind_of?(Hash)
+        obj
       elsif obj.kind_of?(Numeric)
         obj
       elsif obj.kind_of?(Date)
@@ -111,7 +114,7 @@ module CassandraCQL
         RUBY_VERSION >= "1.9" ? escape(obj.to_s.dup.force_encoding('ASCII-8BIT')) : escape(obj.to_s.dup)
       end
     end
-  
+
     def self.sanitize(statement, bind_vars=[], use_cql3=false)
       # If there are no bind variables, return the statement unaltered
       return statement if bind_vars.empty?
@@ -120,7 +123,7 @@ module CassandraCQL
       expected_bind_vars = statement.count("?")
 
       raise Error::InvalidBindVariable, "Wrong number of bound variables (statement expected #{expected_bind_vars}, was #{bind_vars.size})" if expected_bind_vars != bind_vars.size
-    
+
       statement.gsub(/\?/) {
         quote(cast_to_cql(bind_vars.shift), use_cql3)
       }

data/lib/cassandra-cql/types/date_type.rb

@@ -23,5 +23,7 @@ module CassandraCQL
         raise Error::CastException.new("Unable to convert bytes to Date", value)
       end
     end
+
+    TimestampType = DateType
   end
 end

data/lib/cassandra-cql/version.rb

@@ -15,5 +15,5 @@ limitations under the License.
 =end
 
 module CassandraCQL
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/row_spec.rb

@@ -25,14 +25,14 @@ describe "basic methods" do
         @row.column_values.size.should eq(@row.column_names.size)
       end
     end
-      
+
     context "columns" do
       it "should equal the number of columns" do
         @row.column_names.size.should eq(@row.column_values.size)
         @row.columns.should eq(@row.column_names.size)
       end
     end
-    
+
     context "checking casting" do
       it "should return column_values for to_a" do
         @row.to_a.should eq(@row.column_values)
@@ -83,7 +83,8 @@ describe "basic methods" do
           key text PRIMARY KEY,
           mylist LIST <int>,
           myset SET <varchar>,
-          mymap MAP <uuid,timestamp>
+          mymap MAP <uuid,timestamp>,
+          myflattenmap MAP <uuid,timestamp>
         )
       CQL
 
@@ -93,8 +94,8 @@ describe "basic methods" do
       }
 
       @connection.execute(
-        "INSERT INTO collections (key, mylist, myset, mymap) VALUES (?, [?], {?}, {?:?,?:?})",
-        'test', [1, 2, 3], ['some', 'set'], *@map.to_a.flatten)
+        "INSERT INTO collections (key, mylist, myset, mymap, myflattenmap) VALUES (?, [?], {?}, ?, {?:?,?:?})",
+        'test', [1, 2, 3], ['some', 'set'], @map, *@map.to_a.flatten)
 
       @row = @connection.execute("SELECT * FROM collections WHERE key=?", "test").fetch
     end

data/spec/spec_helper.rb

@@ -10,9 +10,9 @@ Bundler.setup(:default, :test)
 require 'yaml'
 require 'rspec'
 
-CASSANDRA_VERSION = ENV['CASSANDRA_VERSION'] || '1.1' unless defined?(CASSANDRA_VERSION)
-CQL_VERSION = ENV['CQL_VERSION'] || '2.0.0'
-USE_CQL3 = CQL_VERSION.split('.').first.to_i == 3
+CASSANDRA_VERSION = ENV['CASSANDRA_VERSION'] || '1.2' unless defined?(CASSANDRA_VERSION)
+CQL_VERSION = ENV['CQL_VERSION'] || '3.0.0'
+USE_CQL3 = CQL_VERSION.split('.').first.to_i == 3 && CASSANDRA_VERSION >= '1.2'
 
 require "cassandra-cql/#{CASSANDRA_VERSION}"
 

data/spec/statement_spec.rb

@@ -30,13 +30,13 @@ describe "execute" do
       stmt.execute([], :compression => true).should be_nil
       @connection.keyspace.should eq('system')
     end
-    
+
     it "should set keyspace to nil when deleting keyspace" do
       @connection.execute("DROP KEYSPACE #{@connection.keyspace}").should be_nil
       @connection.keyspace.should be_nil
     end
   end
-  
+
   context "when performing void-returning column_family operations" do
     before(:each) do
       @connection = setup_cassandra_connection
@@ -70,13 +70,21 @@ describe "escape" do
 end
 
 describe "quote" do
-  
+
   context "with a string" do
     it "should add quotes" do
       Statement.quote("test", USE_CQL3).should eq("'test'")
     end
   end
 
+  context "with a JSON string" do
+    #regression test, conflict with Map collection
+    it "should add quotes" do
+      json = '{"foo":"test", "bar":1}'
+      Statement.quote(json, USE_CQL3).should eq("'#{json}'")
+    end
+  end
+
   context "with an integer" do
     it "should not add quotes" do
       Statement.quote(15, USE_CQL3).should eq("15")
@@ -92,24 +100,31 @@ describe "quote" do
 
   context "with a big decimal" do
     let :big_decimal do
-      BigDecimal.new('129182739481237481341234123411.1029348102934810293481039') 
+      BigDecimal.new('129182739481237481341234123411.1029348102934810293481039')
     end
-    let :result do 
+    let :result do
       '0.1291827394812374813412341234111029348102934810293481039E30'
     end
-    
+
     it "should add quotes", cql_version: '2.0.0' do
       Statement.quote(BigDecimal.new(big_decimal), USE_CQL3).should eq("'#{result}'")
     end
 
     it "should not add quotes", cql_version: '3.0.0' do
       Statement.quote(big_decimal, USE_CQL3).should eq(result)
-    end  
+    end
   end
   context "with a boolean" do
-    it "should not add quotes" do
-      Statement.quote(true, USE_CQL3).should eq("true")
-      Statement.quote(false, USE_CQL3).should eq("false")
+    if USE_CQL3
+      it "should not add quotes" do
+        Statement.quote(true, USE_CQL3).should eq("true")
+        Statement.quote(false, USE_CQL3).should eq("false")
+      end
+    else
+      it "should add quotes" do
+        Statement.quote(true, USE_CQL3).should eq("'true'")
+        Statement.quote(false, USE_CQL3).should eq("'false'")
+      end
     end
   end
 
@@ -131,7 +146,7 @@ describe "cast_to_cql" do
       Time.at(long / 1000.0).to_f.should be_within(0.001).of(ts.to_f)
     end
   end
-  
+
   context "with a Date object" do
     it "should return a corresponding Time object" do
       date = Date.today << 1
@@ -139,15 +154,15 @@ describe "cast_to_cql" do
       str.should eq(date.strftime('%Y-%m-%d'))
     end
   end
-  
+
   context "with a Fixnum object" do
     it "should return the same object" do
       Statement.cast_to_cql(15).should eq(15)
     end
   end
-  
+
   context "with a UUID object" do
-    it "should return the a guid" do
+    it "should return the same object" do
       uuid = UUID.new
       guid = Statement.cast_to_cql(uuid)
       guid.should eq(uuid)
@@ -155,7 +170,7 @@ describe "cast_to_cql" do
   end
 
   context "with a SimpleUUID::UUID object" do
-    it "should return the guid" do
+    it "should return the same object" do
       uuid = SimpleUUID::UUID.new
       guid = Statement.cast_to_cql(uuid)
       guid.should eq(uuid)
@@ -170,7 +185,7 @@ describe "cast_to_cql" do
       new_str.object_id.should_not eq(str.object_id)
     end
   end
-  
+
   context "with a String with quotes" do
     it "should return a quoted version" do
       str = "This is a ' string"
@@ -179,7 +194,7 @@ describe "cast_to_cql" do
       new_str.should eq(Statement.escape(str))
     end
   end
-  
+
   context "with binary data" do
     it "should return an unpacked version" do
       bytes = "binary\x00"
@@ -189,14 +204,14 @@ describe "cast_to_cql" do
       [new_data].pack('H*').should eq(bytes)
     end
   end
-  
+
   context "with an array of Fixnums" do
     it "should equal itself" do
       arr = [1, 2, 3]
       Statement.cast_to_cql(arr).should eq(arr)
     end
   end
-  
+
   context "with an array of Strings" do
     it "should return quoted versions of itself" do
       arr = ["test", "'"]
@@ -213,7 +228,7 @@ describe "sanitize" do
       Statement.sanitize("use keyspace", [], USE_CQL3).should eq("use keyspace")
     end
   end
-  
+
   context "when expecting bind vars" do
     it "should raise an exception with bind variable mismatch" do
       expect {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-cql
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler