vertica 0.9.6 → 0.10.0

data/Gemfile.lock

@@ -2,14 +2,14 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
-    jeweler (1.8.3)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.3)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.7.7)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.10.0

data/lib/vertica/connection.rb

@@ -23,10 +23,7 @@ class Vertica::Connection
     @options[:read_timeout] ||= 30
 
     @row_style = @options[:row_style] ? @options[:row_style] : :hash
-    unless options[:skip_startup]
-      startup_connection
-      initialize_connection
-    end
+    boot_connection unless options[:skip_startup]
   end
   
   def on_notice(&block)
@@ -76,24 +73,35 @@ class Vertica::Connection
     raise ArgumentError, "invalid message: (#{message.inspect})" unless message.respond_to?(:to_bytes)
     puts "=> #{message.inspect}" if @debug
     socket.write message.to_bytes
+  rescue SystemCallError => e
+    close_socket
+    raise Vertica::Error::ConnectionError.new(e.message)
   end
 
   def close
     write Vertica::Messages::Terminate.new
+  ensure
+    close_socket
+  end
+
+  def close_socket
     socket.close
     @socket = nil
-  rescue Errno::ENOTCONN # the backend closed the socket already
+  rescue SystemCallError
   ensure
     reset_values
   end
 
   def reset_connection
     close
-
+    boot_connection
+  end
+ 
+  def boot_connection
     startup_connection
     initialize_connection
   end
-  
+ 
   def cancel
     conn = self.class.new(options.merge(:skip_startup => true))
     conn.write Vertica::Messages::CancelRequest.new(backend_pid, backend_key)
@@ -123,8 +131,12 @@ class Vertica::Connection
       puts "<= #{message.inspect}" if @debug
       return message
     else
-      raise Errno::ETIMEDOUT
+      close
+      raise Vertica::Error::TimedOutError.new("Connection timed out.")
     end
+  rescue SystemCallError => e
+    close_socket
+    raise Vertica::Error::ConnectionError.new(e.message)
   end
   
   def process_message(message)
@@ -172,6 +184,7 @@ class Vertica::Connection
   protected
 
   def run_with_job_lock(job)
+    boot_connection if closed?
     raise Vertica::Error::SynchronizeError.new(@current_job, job) if busy?
     @current_job = job
     job.run

data/lib/vertica/error.rb

@@ -6,6 +6,7 @@ class Vertica::Error < StandardError
   class InterruptImpossible < Vertica::Error; end
   class MessageError < Vertica::Error; end
   class EmptyQueryError < Vertica::Error; end
+  class TimedOutError < ConnectionError; end
     
   class SynchronizeError < Vertica::Error
     attr_reader :running_job, :requested_job

data/test/functional/connection_test.rb

@@ -74,8 +74,45 @@ class ConnectionTest < Test::Unit::TestCase
   end
   
   def test_connection_inspect_should_not_print_password
-    @connection = Vertica::Connection.new(TEST_CONNECTION_HASH)
-    inspected_string = @connection.inspect
+    connection = Vertica::Connection.new(TEST_CONNECTION_HASH)
+    inspected_string = connection.inspect
     assert_no_match /:password=>#{TEST_CONNECTION_HASH[:password]}/, inspected_string
   end
+
+  def test_connection_timed_out_error
+    connection = Vertica::Connection.new(TEST_CONNECTION_HASH)
+    connection.options[:read_timeout] = 0.01
+    assert_raises(Vertica::Error::TimedOutError) {connection.query("SELECT SLEEP(1)")}
+    assert connection.closed?
+  end
+
+  def test_automatically_reconnects
+    connection = Vertica::Connection.new(TEST_CONNECTION_HASH)
+    connection.close
+    assert_equal(1, connection.query("SELECT 1").the_value)
+  end
+
+  def test_socket_write_error
+    connection = Vertica::Connection.new(TEST_CONNECTION_HASH)
+    class << connection.socket
+      def write(foo)
+        raise Errno::ETIMEDOUT
+      end
+    end
+
+    assert_raises(Vertica::Error::ConnectionError) {connection.query('select 1')}
+    assert connection.closed?
+  end
+
+  def test_socket_read_error
+    connection = Vertica::Connection.new(TEST_CONNECTION_HASH)
+    class << connection.socket
+      def read(foo)
+        raise Errno::ETIMEDOUT
+      end
+    end
+
+    assert_raises(Vertica::Error::ConnectionError) {connection.query('select 1')}
+    assert connection.closed?
+  end
 end

data/test/functional/query_test.rb

@@ -110,7 +110,7 @@ class QueryTest < Test::Unit::TestCase
   end  
   
   def test_read_timeout
-    assert_raises(Errno::ETIMEDOUT) do
+    assert_raises(Vertica::Error::TimedOutError) do
       @connection.options[:read_timeout] = 0.0001
       @connection.query("SELECT * FROM test_ruby_vertica_table")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vertica
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70124964988460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124964988460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70124964987720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +39,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124964987720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Query Vertica with ruby
 email: sprsquish@gmail.com
 executables: []
@@ -109,6 +119,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 714844317513278375
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Pure ruby library for interacting with Vertica