vertica 0.9.0.beta5 → 0.9.0.beta6

data/VERSION

@@ -1 +1 @@
-0.9.0.beta5
+0.9.0.beta6

data/lib/vertica/column.rb

@@ -6,6 +6,8 @@ module Vertica
     attr_reader :size
     attr_reader :data_type
 
+    STRING_CONVERTER = String.new.respond_to?(:force_encoding) ? lambda { |s| s.force_encoding('utf-8') } : nil
+
     DATA_TYPE_CONVERSIONS = [
       [:unspecified,  nil],
       [:tuple,        nil],
@@ -15,8 +17,8 @@ module Vertica
       [:bool,         lambda { |s| s == 't' }],
       [:integer,      lambda { |s| s.to_i }],
       [:float,        lambda { |s| s.to_f }],
-      [:char,         nil],
-      [:varchar,      nil],
+      [:char,         STRING_CONVERTER],
+      [:varchar,      STRING_CONVERTER],
       [:date,         lambda { |s| Date.new(*s.split("-").map{|x| x.to_i}) }],
       [:time,         nil],
       [:timestamp,    lambda { |s| DateTime.parse(s, true) }],

data/lib/vertica/connection.rb

@@ -37,7 +37,7 @@ class Vertica::Connection
     @socket ||= begin
       raw_socket = TCPSocket.new(@options[:host], @options[:port].to_i)
       if @options[:ssl]
-        require 'openssl/ssl'
+        require 'openssl'
         raw_socket.write Vertica::Messages::SslRequest.new.to_bytes
         if raw_socket.read(1) == 'S'
           raw_socket = OpenSSL::SSL::SSLSocket.new(raw_socket, OpenSSL::SSL::SSLContext.new)

data/lib/vertica/result.rb

@@ -43,6 +43,18 @@ class Vertica::Result
     @rows.each(&block)
   end
   
+  def empty?
+    @rows.empty?
+  end
+  
+  def the_value
+    if empty?
+      nil
+    else
+      @row_style == :array ? rows[0][0] : rows[0][columns[0].name]
+    end
+  end
+  
   alias_method :each, :each_row
 
   def row_count

data/test/functional/value_conversion_test.rb

@@ -1,3 +1,4 @@
+# encoding : UTF-8
 require 'test_helper'
 
 class ValueConversionTest < Test::Unit::TestCase
@@ -44,4 +45,8 @@ class ValueConversionTest < Test::Unit::TestCase
     assert_equal result.rows.length, 1
     assert_equal [nil, nil, nil, nil, nil, nil, nil], result.rows.first
   end
+  
+  def test_string_encoding
+    assert_equal 'åßç∂ë', @connection.query("SELECT 'åßç∂ë'").the_value
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vertica
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta5
+  version: 0.9.0.beta6
   prerelease: 6
 platform: ruby
 authors:
@@ -11,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153854620 !ruby/object:Gem::Requirement
+  requirement: &2165802180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153854620
+  version_requirements: *2165802180
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153854060 !ruby/object:Gem::Requirement
+  requirement: &2165801500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,7 +34,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153854060
+  version_requirements: *2165801500
 description: Query Vertica with ruby
 email: sprsquish@gmail.com
 executables: []
@@ -97,7 +96,6 @@ 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: 
@@ -118,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Pure ruby library for interacting with Vertica