vertica 0.9.0.beta1 → 0.9.0.beta2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vertica (0.8.1)
+    vertica (0.9.0.beta1)
       vertica
 
 GEM
@@ -20,4 +20,5 @@ PLATFORMS
 
 DEPENDENCIES
   jeweler
+  rake
   vertica!

data/VERSION

@@ -1 +1 @@
-0.9.0.beta1
+0.9.0.beta2

data/lib/vertica/column.rb

@@ -18,11 +18,11 @@ module Vertica
       [:char,         nil],
       [:varchar,      nil],
       [:date,         lambda { |s| Date.new(*s.split("-").map{|x| x.to_i}) }],
-      [:time,         lambda { |s| Time.parse(s) }],
+      [:time,         nil],
       [:timestamp,    lambda { |s| DateTime.parse(s, true) }],
       [:timestamp_tz, lambda { |s| DateTime.parse(s, true) }],
       [:interval,     nil],
-      [:time_tz,      lambda { |s| Time.parse(s) }],
+      [:time_tz,      nil],
       [:numeric,      lambda { |s| s.to_d }],
       [:bytea,        nil],
       [:rle_tuple,    nil]

data/lib/vertica/connection.rb

@@ -9,6 +9,8 @@ module Vertica
 
     attr_reader :options, :notices, :transaction_status, :backend_pid, :backend_key, :notifications, :parameters
 
+    attr_accessor :row_style
+
     def self.cancel(existing_conn)
       conn = self.new(existing_conn.options.merge(:skip_startup => true))
       conn.write Messages::CancelRequest.new(existing_conn.backend_pid, existing_conn.backend_key)
@@ -21,6 +23,8 @@ module Vertica
 
       @options = options
       @notices = []
+      
+      @row_style = @options[:row_style] ? @options[:row_style] : :hash
 
       unless options[:skip_startup]
         write Messages::Startup.new(@options[:user], @options[:database])
@@ -140,7 +144,7 @@ module Vertica
 
 
     def process(return_result = false)
-      result = return_result ? Result.new : nil
+      result = return_result ? Result.new(row_style) : nil
       loop do
         case message = read_message
         when Messages::Authentication

data/lib/vertica/messages/backend_messages/data_row.rb

@@ -11,6 +11,7 @@ module Vertica
         pos = 2
         field_count.times do |field_index|
           size = data.unpack("@#{pos}N").first
+          size = -1 if size == 4294967295
           @values << (size == -1 ? nil : data.unpack("@#{pos + 4}a#{size}").first)
           pos += 4 + [size, 0].max
         end

data/lib/vertica/result.rb

@@ -6,7 +6,10 @@ module Vertica
     attr_reader :columns
     attr_reader :rows
 
-    def initialize
+    attr_accessor
+
+    def initialize(row_style = :hash)
+      @row_style = row_style
       @rows = []
     end
 
@@ -14,11 +17,23 @@ module Vertica
       @columns = message.fields.map { |fd| Column.new(fd) }
     end
 
-    def format_row(row_data)
+    def format_row_as_hash(row_data)
       row = {}
-      row_data.values.each_with_index do |field, idx|
+      row_data.values.each_with_index do |value, idx|
         col = columns[idx]
-        row[col.name] = col.convert(field)
+        row[col.name] = col.convert(value)
+      end
+      row
+    end
+    
+    def format_row(row_data)
+      send("format_row_as_#{@row_style}", row_data)
+    end
+    
+    def format_row_as_array(row_data)
+      row = []
+      row_data.values.each_with_index do |value, idx|
+        row << columns[idx].convert(value)
       end
       row
     end

data/test/functional/query_test.rb

@@ -16,7 +16,7 @@ class QueryTest < Test::Unit::TestCase
     @connection.close
   end
   
-  def test_select_query_with_results
+  def test_select_query_with_results_as_hash
     r = @connection.query("SELECT * FROM test_table")
     assert_equal 1, r.row_count
     assert_equal 2, r.columns.length
@@ -25,9 +25,22 @@ class QueryTest < Test::Unit::TestCase
     assert_equal :varchar, r.columns[1].data_type
     assert_equal :name, r.columns[1].name
     
-    # assert_equal [[1, 'matt']], r.rows
     assert_equal [{:id => 1, :name => "matt"}], r.rows
   end
+
+  def test_select_query_with_results_as_array
+    @connection.row_style = :array
+    r = @connection.query("SELECT * FROM test_table")
+    assert_equal 1, r.row_count
+    assert_equal 2, r.columns.length
+    assert_equal :in, r.columns[0].data_type
+    assert_equal :id, r.columns[0].name
+    assert_equal :varchar, r.columns[1].data_type
+    assert_equal :name, r.columns[1].name
+    
+    assert_equal [[1, "matt"]], r.rows
+  end
+
   
   def test_select_query_with_no_results
     r = @connection.query("SELECT * FROM test_table WHERE 1 != 1")

data/test/functional/value_conversion_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+class ValueConversionTest < Test::Unit::TestCase
+  
+  def setup
+    @connection = Vertica::Connection.new(TEST_CONNECTION_HASH.merge(:row_style => :array))
+
+    @connection.query <<-SQL
+      CREATE TABLE IF NOT EXISTS conversions_table (
+        "int_field" int, 
+        "string_field" varchar(100),
+        "date_field" date,
+        "timestamp_field" timestamp,
+        "time_field" time,
+        "interval_field" interval,
+        "boolean_field" boolean
+      )
+    SQL
+  end
+  
+  
+  def teardown
+    @connection.query("DROP TABLE IF EXISTS conversions_table CASCADE;")
+    @connection.close
+  end
+  
+  def test_value_conversions
+    @connection.query "INSERT INTO conversions_table VALUES (123, 'hello world', '2010-01-01', '2010-01-01 12:00:00', '12:00:00', INTERVAL '1 DAY', TRUE)"
+    result = @connection.query "SELECT * FROM conversions_table LIMIT 1"
+    assert_equal result.rows.length, 1
+    assert_equal [
+      123, 
+      'hello world', 
+      Date.parse('2010-01-01'), 
+      DateTime.parse('2010-01-01 12:00:00'),
+      "12:00:00", 
+      "1", 
+      true], result.rows.first
+  end
+  
+  def test_nil_conversions
+    @connection.query "INSERT INTO conversions_table VALUES (NULL, NULL, NULL, NULL, NULL, NULL, NULL)"
+    result = @connection.query "SELECT * FROM conversions_table LIMIT 1"
+    assert_equal result.rows.length, 1
+    assert_equal [nil, nil, nil, nil, nil, nil, nil], result.rows.first
+  end
+end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 0
-  - beta1
-  version: 0.9.0.beta1
+  - beta2
+  version: 0.9.0.beta2
 platform: ruby
 authors: 
 - Jeff Smick
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 -04:00
+date: 2011-09-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,32 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: Query Vertica with ruby
 email: sprsquish@gmail.com
 executables: []
@@ -126,6 +152,7 @@ files:
 - lib/vertica/result.rb
 - test/functional/connection_test.rb
 - test/functional/query_test.rb
+- test/functional/value_conversion_test.rb
 - test/test_helper.rb
 - test/unit/backend_message_test.rb
 has_rdoc: true
@@ -165,5 +192,6 @@ summary: Pure ruby library for interacting with Vertica
 test_files: 
 - test/functional/connection_test.rb
 - test/functional/query_test.rb
+- test/functional/value_conversion_test.rb
 - test/test_helper.rb
 - test/unit/backend_message_test.rb