vertica 0.9.1 → 0.9.2

data/Gemfile.lock

@@ -2,14 +2,17 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
-    jeweler (1.6.4)
+    jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.9.2)
+      rdoc
+    json (1.7.3)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/README.md

@@ -1,11 +1,11 @@
 # Vertica
 
 Vertica is a pure Ruby library for connecting to Vertica databases. You can learn more
-about Vertica at http://www.vertica.com.  
+about Vertica at http://www.vertica.com.
 
-This library currently supports simple queries. Prepared statements are currently not supported
-but are being worked on. The gem is tested against Vertica version 5.0 and should work in both 
-Ruby 1.8 and Ruby 1.9.
+This library currently supports connecting, executing SQL queries, and transferring data
+for a "COPY table FROM STDIN" statement. The gem is tested against Vertica version 4.1, 
+5.0, and 5.1, and Ruby version 1.8 and 1.9.
 
 # Install
 
@@ -101,8 +101,7 @@ prefixed with <tt>test_ruby_vertica_</tt>.
 
 ### TODO
 
- * Prepared statements
- * More tests
+ * Asynchronous / EventMachine version
 
 ## Authors
 

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/vertica/error.rb

@@ -26,10 +26,11 @@ class Vertica::Error < StandardError
   end
   
   QUERY_ERROR_CLASSES = {
-    '55V03' => (LockFailure     = Class.new(Vertica::Error::QueryError)),
-    '53200' => (OutOfMemory     = Class.new(Vertica::Error::QueryError)),
-    '42601' => (SyntaxError     = Class.new(Vertica::Error::QueryError)),
-    '42V01' => (MissingRelation = Class.new(Vertica::Error::QueryError)),
-    '42703' => (MissingColumn   = Class.new(Vertica::Error::QueryError))
+    '55V03' => (LockFailure           = Class.new(Vertica::Error::QueryError)),
+    '53000' => (InsufficientResources = Class.new(Vertica::Error::QueryError)),
+    '53200' => (OutOfMemory           = Class.new(Vertica::Error::QueryError)),
+    '42601' => (SyntaxError           = Class.new(Vertica::Error::QueryError)),
+    '42V01' => (MissingRelation       = Class.new(Vertica::Error::QueryError)),
+    '42703' => (MissingColumn         = Class.new(Vertica::Error::QueryError))
   }
 end

data/lib/vertica/query.rb

@@ -1,6 +1,6 @@
 class Vertica::Query
 
-  attr_reader :connection, :sql
+  attr_reader :connection, :sql, :result, :error
   attr_accessor :row_handler, :copy_handler, :row_style
 
   def initialize(connection, sql, options = {})
@@ -9,27 +9,19 @@ class Vertica::Query
     @row_style    = options[:row_style] || @connection.row_style || :hash
     @row_handler  = options[:row_handler] 
     @copy_handler = options[:copy_handler]
+
+    @error  = nil
+    @result = Vertica::Result.new(row_style)
   end
   
   
   def run
-    @connection.write Vertica::Messages::Query.new(@sql)
-    result, error = nil, nil
+    @connection.write Vertica::Messages::Query.new(sql)
+    
     begin
-      case message = @connection.read_message
-      when Vertica::Messages::ErrorResponse
-        error = Vertica::Error::QueryError.from_error_response(message, @sql)
-      when Vertica::Messages::EmptyQueryResponse
-        error = Vertica::Error::EmptyQueryError.new("A SQL string was expected, but the given string was blank or only contained SQL comments.")
-      when Vertica::Messages::CopyInResponse
-        handle_copy_from_stdin
-      when Vertica::Messages::RowDescription, Vertica::Messages::CommandComplete
-        result = retreive_result(message, Vertica::Result.new(row_style))
-      else
-        @connection.process_message(message)
-      end
+      process_message(message = @connection.read_message)
     end until message.kind_of?(Vertica::Messages::ReadyForQuery)
-    
+
     raise error unless error.nil?
     return result
   end
@@ -43,6 +35,25 @@ class Vertica::Query
   
   protected
   
+  def process_message(message)
+    case message
+    when Vertica::Messages::ErrorResponse
+      @error = Vertica::Error::QueryError.from_error_response(message, @sql)
+    when Vertica::Messages::EmptyQueryResponse
+      @error = Vertica::Error::EmptyQueryError.new("A SQL string was expected, but the given string was blank or only contained SQL comments.")
+    when Vertica::Messages::CopyInResponse
+      handle_copy_from_stdin
+    when Vertica::Messages::RowDescription
+      result.descriptions = message
+    when Vertica::Messages::DataRow
+      handle_datarow(message)
+    when Vertica::Messages::CommandComplete
+      result.tag = message.tag
+    else
+      @connection.process_message(message)
+    end
+  end
+  
   def handle_copy_from_stdin
     if copy_handler.nil?
       @connection.write Vertica::Messages::CopyFail.new('no handler provided')
@@ -59,26 +70,14 @@ class Vertica::Query
       end
     end
   end
-  
-  def retreive_result(message, result)
-    until message.kind_of?(Vertica::Messages::CommandComplete)
-      case message
-      when Vertica::Messages::RowDescription
-        result.descriptions = message
-      when Vertica::Messages::DataRow
-        record = result.format_row(message)
-        result.add_row(record) if buffer_rows?
-        @row_handler.call(record) if @row_handler
-      else
-        @connection.process_message(message)
-      end
-      message = @connection.read_message
-    end
-    result.tag = message.tag
-    return result
+
+  def handle_datarow(datarow_message)
+    record = result.format_row(datarow_message)
+    result.add_row(record) if buffer_rows?
+    row_handler.call(record) if row_handler
   end
   
   def buffer_rows?
-    @row_handler.nil? && @copy_handler.nil?
+    row_handler.nil? && copy_handler.nil?
   end
 end

data/test/functional/connection_test.rb

@@ -64,7 +64,7 @@ class ConnectionTest < Test::Unit::TestCase
   
   def test_interrupt_connection
     @connection = Vertica::Connection.new(TEST_CONNECTION_HASH.merge(:interruptable => true))
-    assert @connection.interruptable?
+    assert @connection.interruptable?, "The connection should be interruptable!"
   end
 
   def test_new_with_error_response

data/test/test_helper.rb

@@ -6,4 +6,14 @@ require 'test/unit'
 
 require 'vertica'
 
-TEST_CONNECTION_HASH = YAML.load(File.read(File.expand_path("../connection.yml", __FILE__)))
+TEST_CONNECTION_FILENAME = File.expand_path("../connection.yml", __FILE__)
+
+if File.exist?(TEST_CONNECTION_FILENAME)
+  TEST_CONNECTION_HASH = YAML.load(File.read(TEST_CONNECTION_FILENAME))
+else
+  puts
+  puts "Create #{TEST_CONNECTION_FILENAME} with connection info "
+  puts "for your Vertica test database in order to run the test suite."
+  puts
+  exit(1)
+end

metadata

@@ -1,63 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vertica
-version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 1
-  version: 0.9.1
+version: !ruby/object:Gem::Version
+  version: 0.9.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jeff Smick
 - Matt Bauer
 - Willem van Bergen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-01 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2012-08-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: &70251107449460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70251107449460
+- !ruby/object:Gem::Dependency
   name: jeweler
+  requirement: &70251107448680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *70251107448680
 description: Query Vertica with ruby
 email: sprsquish@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -112,41 +97,31 @@ files:
 - test/unit/backend_message_test.rb
 - test/unit/frontend_message_test.rb
 - test/unit/quoting_test.rb
-has_rdoc: true
 homepage: http://github.com/sprsquish/vertica
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Pure ruby library for interacting with Vertica
-test_files: 
+test_files:
 - test/functional/connection_test.rb
 - test/functional/query_test.rb
 - test/functional/value_conversion_test.rb