cql-rb 2.0.5 → 2.1.0.pre0

data/spec/cql/protocol/type_converter_spec.rb

@@ -66,6 +66,18 @@ module Cql
           end
         end
 
+        context 'when encoding user defined type values' do
+          it 'encodes a null value' do
+            converter.to_bytes(buffer, [:udt, {'name' => :string, 'shoe_size' => :int}], nil, 4).should eql_bytes("\xff\xff\xff\xff")
+          end
+        end
+
+        context 'when encoding custom values' do
+          it 'encodes a null value' do
+            converter.to_bytes(buffer, [:custom, 'com.example.CustomType'], nil, 4).should eql_bytes("\xff\xff\xff\xff")
+          end
+        end
+
         context 'when encoding and decoding negative numbers' do
           numeric_types.each do |type|
             it "encodes and decodes a -1 #{type.upcase}" do

data/spec/integration/client_spec.rb

@@ -19,7 +19,7 @@ describe 'A CQL client' do
     client.close rescue nil
   end
 
-  def create_keyspace_and_table
+  def create_keyspace
     begin
       client.execute(%(DROP KEYSPACE cql_rb_client_spec))
     rescue Cql::QueryError => e
@@ -27,6 +27,10 @@ describe 'A CQL client' do
     end
     client.execute(%(CREATE KEYSPACE cql_rb_client_spec WITH REPLICATION = {'class': 'SimpleStrategy', 'replication_factor': 1}))
     client.use('cql_rb_client_spec')
+  end
+
+  def create_keyspace_and_table
+    create_keyspace
     client.execute(%(CREATE TABLE users (user_id VARCHAR PRIMARY KEY, first VARCHAR, last VARCHAR, age INT)))
     client.execute(%(CREATE TABLE counters (id VARCHAR PRIMARY KEY, count COUNTER)))
   end
@@ -108,13 +112,6 @@ describe 'A CQL client' do
       counters = result.each_with_object({}) { |row, acc| acc[row['id']] = row['count'] }
       counters.should eql('foo' => 11, 'bar' => 3)
     end
-
-    it 'handles altered tables' do
-      result1 = statement.execute('sue')
-      client.execute('ALTER TABLE users ADD password VARCHAR')
-      result2 = statement.execute('sue')
-      result2.to_a.should eql(result1.to_a)
-    end
   end
 
   context 'with multiple connections' do
@@ -445,6 +442,61 @@ describe 'A CQL client' do
     end
   end
 
+  context 'with user defined types' do
+    before do
+      release_version = client.execute('SELECT release_version FROM system.local').first['release_version']
+      pending 'User defined types are not available in C* before 2.1.0' unless release_version[0, 5] >= '2.1.0'
+      create_keyspace
+      client.execute(%(CREATE TYPE address (street TEXT, city TEXT, zip INT)))
+      client.execute(%(CREATE TYPE company (name TEXT, addresses LIST<address>)))
+      client.execute(%(CREATE TABLE users (id VARCHAR PRIMARY KEY, primary_address address, secondary_addresses MAP<TEXT, address>, employers SET<company>)))
+    end
+
+    it 'inserts records into a table with a user defined type' do
+      statement = client.prepare(%(INSERT INTO users (id, primary_address) VALUES (?, ?)))
+      statement.execute('sue', {'street' => '123 Some St.', 'city' => 'Frans Sanisco', 'zip' => 76543})
+      result = client.execute(%(SELECT primary_address.street AS street FROM users WHERE id = 'sue'))
+      result.first['street'].should == '123 Some St.'
+    end
+
+    it 'reads records from a table with a user defined type' do
+      client.execute(%(INSERT INTO users (id, primary_address) VALUES ('sue', {street: '123 Some St.', city: 'Frans Sanisco', zip: 76543})))
+      result = client.execute(%(SELECT primary_address FROM users WHERE id = 'sue'))
+      result.first['primary_address'].should eql('street' => '123 Some St.', 'city' => 'Frans Sanisco', 'zip' => 76543)
+    end
+
+    it 'reads records from a table with a user defined type in a collection' do
+      client.execute(<<-CQL)
+      INSERT INTO users (id, primary_address, secondary_addresses)
+      VALUES (
+        'sue',
+        {street: '123 Some St.', city: 'Frans Sanisco', zip: 76543},
+        {'secret_lair': {street: '4 Some Other St.', city: 'Gos Latos', zip: 87654}}
+      )
+      CQL
+      result = client.execute(%(SELECT secondary_addresses FROM users WHERE id = 'sue'))
+      result.first['secondary_addresses'].should eql('secret_lair' => {'street' => '4 Some Other St.', 'city' => 'Gos Latos', 'zip' => 87654})
+    end
+
+    it 'reads records from a table with user defined types nested in other user defined types, and collections' do
+      client.execute(<<-CQL)
+      INSERT INTO users (id, employers)
+      VALUES (
+        'sue',
+        {
+          {name: 'Acme Corp', addresses: [{street: '1 St.', city: '1 City', zip: 11111}, {street: '2 St.', city: '2 City', zip: 22222}]},
+          {name: 'Foo Inc.', addresses: [{street: '3 St.', city: '3 City', zip: 33333}]}
+        }
+      )
+      CQL
+      result = client.execute(%(SELECT employers FROM users WHERE id = 'sue'))
+      result.first['employers'].should eql(Set.new([
+        {'name' => 'Acme Corp', 'addresses' => [{'street' => '1 St.', 'city' => '1 City', 'zip' => 11111}, {'street' => '2 St.', 'city' => '2 City', 'zip' => 22222}]},
+        {'name' => 'Foo Inc.', 'addresses' => [{'street' => '3 St.', 'city' => '3 City', 'zip' => 33333}]}
+      ]))
+    end
+  end
+
   context 'with error conditions' do
     it 'raises an error for CQL syntax errors' do
       expect { client.execute('BAD cql') }.to raise_error(Cql::CqlError)

data/spec/support/fake_io_reactor.rb

@@ -26,13 +26,13 @@ class FakeIoReactor
     @before_startup_handler = handler
   end
 
-  def connect(host, port, timeout)
+  def connect(host, port, options)
     if host == '0.0.0.0'
       Cql::Future.failed(Cql::Io::ConnectionError.new('Can\'t connect to 0.0.0.0'))
     elsif @down_nodes.include?(host)
       Cql::Future.failed(Cql::Io::ConnectionError.new('Node down'))
     else
-      connection = FakeConnection.new(host, port, timeout)
+      connection = FakeConnection.new(host, port, options)
       @connections << connection
       @connection_listeners.each do |listener|
         listener.call(connection)
@@ -71,12 +71,13 @@ class FakeIoReactor
 end
 
 class FakeConnection
-  attr_reader :host, :port, :timeout, :requests, :keyspace
+  attr_reader :host, :port, :timeout, :options, :requests, :keyspace
 
-  def initialize(host, port, timeout, data={})
+  def initialize(host, port, options={}, data={})
     @host = host
     @port = port
-    @timeout = timeout
+    @options = options || {}
+    @timeout = @options[:timeout]
     @requests = []
     @responses = []
     @closed = false

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0.pre0
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.2.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.2.0.pre3
 description: A pure Ruby CQL3 driver for Cassandra
 email:
 - theo@iconara.net
@@ -54,10 +54,10 @@ files:
 - lib/cql/compression.rb
 - lib/cql/compression/lz4_compressor.rb
 - lib/cql/compression/snappy_compressor.rb
-- lib/cql/error_codes.rb
 - lib/cql/protocol.rb
 - lib/cql/protocol/cql_byte_buffer.rb
 - lib/cql/protocol/cql_protocol_handler.rb
+- lib/cql/protocol/custom_type_parser.rb
 - lib/cql/protocol/frame_decoder.rb
 - lib/cql/protocol/frame_encoder.rb
 - lib/cql/protocol/request.rb
@@ -111,6 +111,7 @@ files:
 - spec/cql/compression/snappy_compressor_spec.rb
 - spec/cql/protocol/cql_byte_buffer_spec.rb
 - spec/cql/protocol/cql_protocol_handler_spec.rb
+- spec/cql/protocol/custom_type_parser_spec.rb
 - spec/cql/protocol/frame_decoder_spec.rb
 - spec/cql/protocol/frame_encoder_spec.rb
 - spec/cql/protocol/requests/auth_response_request_spec.rb
@@ -166,9 +167,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -194,6 +195,7 @@ test_files:
 - spec/cql/compression/snappy_compressor_spec.rb
 - spec/cql/protocol/cql_byte_buffer_spec.rb
 - spec/cql/protocol/cql_protocol_handler_spec.rb
+- spec/cql/protocol/custom_type_parser_spec.rb
 - spec/cql/protocol/frame_decoder_spec.rb
 - spec/cql/protocol/frame_encoder_spec.rb
 - spec/cql/protocol/requests/auth_response_request_spec.rb

data/lib/cql/error_codes.rb

@@ -1,96 +0,0 @@
-# encoding: utf-8
-
-module Cql
-  module ErrorCodes
-    # Something unexpected happened. This indicates a server-side bug.
-    SERVER_ERROR = 0x0000
-
-    # Some client message triggered a protocol violation (for instance a QUERY
-    # message is sent before a STARTUP one has been sent).
-    PROTOCOL_ERROR = 0x000A
-
-    # CREDENTIALS request failed because Cassandra did not accept the provided credentials.
-    BAD_CREDENTIALS = 0x0100
-
-    # Unavailable exception.
-    #
-    # Details:
-    #
-    # * `:cl` - The consistency level of the query having triggered the exception.
-    # * `:required` - An int representing the number of nodes that should be alive to respect `:cl`.
-    # * `:alive` - An int representing the number of replica that were known to be
-    #   alive when the request has been processed (since an unavailable
-    #   exception has been triggered, there will be `:alive` < `:required`.
-    UNAVAILABLE = 0x1000
-
-    # The request cannot be processed because the coordinator node is overloaded.
-    OVERLOADED = 0x1001
-
-    # The request was a read request but the coordinator node is bootstrapping.
-    IS_BOOTSTRAPPING = 0x1002
-
-    # Error during a truncation error.
-    TRUNCATE_ERROR = 0x1003
-
-    # Timeout exception during a write request.
-    #
-    # Details:
-    #
-    # * `:cl` - The consistency level of the query having triggered the exception.
-    # * `:received` - An int representing the number of nodes having acknowledged the request.
-    # * `:blockfor` - The number of replica whose acknowledgement is required to achieve `:cl`.
-    # * `:write_type` - A string that describe the type of the write that timeouted. The value of that string can be one of:
-    #   - `"SIMPLE"`: the write was a non-batched non-counter write.
-    #   - `"BATCH"`: the write was a (logged) batch write. If this type is received, it means the batch log
-    #     has been successfully written (otherwise a `"BATCH_LOG"` type would have been send instead).
-    #   - `"UNLOGGED_BATCH"`: the write was an unlogged batch. Not batch log write has been attempted.
-    #   - `"COUNTER"`: the write was a counter write (batched or not).
-    #   - `"BATCH_LOG"`: the timeout occured during the write to the batch log when a (logged) batch write was requested.
-    WRITE_TIMEOUT = 0x1100
-
-    # Timeout exception during a read request.
-    #
-    # Details:
-    #
-    # * `:cl` - The consistency level of the query having triggered the exception
-    # * `:received` -  An int representing the number of nodes having answered the request.
-    # * `:blockfor` -  The number of replica whose response is required to achieve `:cl`.
-    #   Please note that it is possible to have `:received` >= `:blockfor` if
-    #   `:data_present` is false. And also in the (unlikely) case were `:cl` is
-    #   achieved but the coordinator node timeout while waiting for read-repair
-    #   acknowledgement.
-    # * `:data_present` - If `true`, it means the replica that was asked for data has not responded.
-    READ_TIMEOUT = 0x1200
-
-    # The submitted query has a syntax error.
-    SYNTAX_ERROR = 0x2000
-
-    # The logged user doesn't have the right to perform the query.
-    UNAUTHORIZED = 0x2100
-
-    # The query is syntactically correct but invalid.
-    INVALID = 0x2200
-
-    # The query is invalid because of some configuration issue.
-    CONFIG_ERROR = 0x2300
-
-    # The query attempted to create a keyspace or a table that was already existing.
-    #
-    # Details:
-    #
-    # * `:ks` - A string representing either the keyspace that already exists, or the
-    #   keyspace in which the table that already exists is.
-    # * `:table` -  A string representing the name of the table that already exists. If the
-    #   query was attempting to create a keyspace, `:table` will be present but
-    #   will be the empty string.
-    ALREADY_EXISTS = 0x2400
-
-    # Can be thrown while a prepared statement tries to be executed if the
-    # provide prepared statement ID is not known by this host.
-    #
-    # Details:
-    #
-    # * `:id` - The unknown ID.
-    UNPREPARED = 0x2500
-  end
-end