vertica 0.9.0.beta2 → 0.9.0.beta3

data/Gemfile

@@ -1,2 +1,4 @@
 source :rubygems
-gemspec
+
+gem 'rake'
+gem 'jeweler'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vertica (0.9.0.beta1)
+    vertica (0.9.0.beta2)
       vertica
 
 GEM

data/Rakefile

@@ -10,15 +10,12 @@ begin
 
     gem.email = 'sprsquish@gmail.com'
     gem.homepage = 'http://github.com/sprsquish/vertica'
-    gem.authors = ['Jeff Smick', 'Matt Bauer']
+    gem.authors = ['Jeff Smick', 'Matt Bauer', 'Willem van Bergen']
 
     gem.files = FileList["[A-Z]*", 'lib/**/*.rb'].to_a
 
     gem.test_files = FileList['test/**/*.rb']
     
-    gem.add_development_dependency 'jeweler'
-    gem.add_development_dependency 'rake'
-    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 
@@ -34,21 +31,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-# begin
-#   require 'rcov/rcovtask'
-#   Rcov::RcovTask.new do |test|
-#     test.libs << 'spec'
-#     test.pattern = 'spec/**/*_spec.rb'
-#     test.rcov_opts += ['--exclude \/Library\/Ruby,spec\/', '--xrefs']
-#     test.verbose = true
-#   end
-# rescue LoadError
-#   task :rcov do
-#     abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-#   end
-# end
-
-
 begin
   require 'yard'
   YARD::Rake::YardocTask.new do |t|

data/VERSION

@@ -1 +1 @@
-0.9.0.beta2
+0.9.0.beta3

data/lib/vertica/column.rb

@@ -13,7 +13,7 @@ module Vertica
       [:record,       nil],
       [:unknown,      nil],
       [:bool,         lambda { |s| s == 't' }],
-      [:in,           lambda { |s| s.to_i }],
+      [:integer,      lambda { |s| s.to_i }],
       [:float,        lambda { |s| s.to_f }],
       [:char,         nil],
       [:varchar,      nil],
@@ -23,7 +23,7 @@ module Vertica
       [:timestamp_tz, lambda { |s| DateTime.parse(s, true) }],
       [:interval,     nil],
       [:time_tz,      nil],
-      [:numeric,      lambda { |s| s.to_d }],
+      [:numeric,      lambda { |s| BigDecimal.new(s) }],
       [:bytea,        nil],
       [:rle_tuple,    nil]
     ]

data/lib/vertica/connection.rb

@@ -1,3 +1,5 @@
+require 'socket'
+
 module Vertica
   class Connection
 
@@ -9,7 +11,7 @@ module Vertica
 
     attr_reader :options, :notices, :transaction_status, :backend_pid, :backend_key, :notifications, :parameters
 
-    attr_accessor :row_style
+    attr_accessor :row_style, :debug
 
     def self.cancel(existing_conn)
       conn = self.new(existing_conn.options.merge(:skip_startup => true))
@@ -21,7 +23,9 @@ module Vertica
     def initialize(options = {})
       reset_values
 
-      @options = options
+      @options = {}
+      options.each { |key, value| @options[key.to_s.to_sym] = value }
+      
       @notices = []
       
       @row_style = @options[:row_style] ? @options[:row_style] : :hash
@@ -37,19 +41,20 @@ module Vertica
 
     def socket
       @socket ||= begin
-        conn = TCPSocket.new(@options[:host], @options[:port].to_s)
+        raw_socket = TCPSocket.new(@options[:host], @options[:port].to_s)
         if @options[:ssl]
-          conn.write Messages::SslRequest.new.to_bytes
-          if conn.read(1) == 'S'
-            conn = OpenSSL::SSL::SSLSocket.new(conn, OpenSSL::SSL::SSLContext.new)
-            conn.sync = true
-            conn.connect
+          require 'openssl/ssl'
+          raw_socket.write Messages::SslRequest.new.to_bytes
+          if raw_socket.read(1) == 'S'
+            raw_socket = OpenSSL::SSL::SSLSocket.new(raw_socket, OpenSSL::SSL::SSLContext.new)
+            raw_socket.sync = true
+            raw_socket.connect
           else
             raise Error::ConnectionError.new("SSL requested but server doesn't support it.")
           end
         end
         
-        conn
+        raw_socket
       end
     end
 
@@ -67,6 +72,7 @@ module Vertica
 
     def write(message)
       raise ArgumentError, "invalid message: (#{message.inspect})" unless message.respond_to?(:to_bytes)
+      puts "=> #{message.inspect}" if @debug
       socket.write message.to_bytes
     end
 
@@ -139,7 +145,9 @@ module Vertica
       type = read_bytes(1)
       size = read_bytes(4).unpack('N').first
       raise Vertica::Error::MessageError.new("Bad message size: #{size}.") unless size >= 4
-      Messages::BackendMessage.factory type, read_bytes(size - 4)
+      msg = Messages::BackendMessage.factory type, read_bytes(size - 4)
+      puts "<= #{msg.inspect}" if @debug
+      return msg
     end
 
 
@@ -220,6 +228,9 @@ module Vertica
       @field_descriptions = []
       @field_values       = []
     end
-
   end
 end
+
+require 'vertica/column'
+require 'vertica/result'
+require 'vertica/messages/message'

data/lib/vertica/messages/message.rb

@@ -40,6 +40,38 @@ module Vertica
         message_string ''
       end
     end
-
   end
 end
+
+require 'vertica/messages/backend_messages/authentication'
+require 'vertica/messages/backend_messages/backend_key_data'
+require 'vertica/messages/backend_messages/bind_complete'
+require 'vertica/messages/backend_messages/close_complete'
+require 'vertica/messages/backend_messages/command_complete'
+require 'vertica/messages/backend_messages/data_row'
+require 'vertica/messages/backend_messages/empty_query_response'
+require 'vertica/messages/backend_messages/notice_response'
+require 'vertica/messages/backend_messages/error_response'
+require 'vertica/messages/backend_messages/no_data'
+require 'vertica/messages/backend_messages/notification_response'
+require 'vertica/messages/backend_messages/parameter_description'
+require 'vertica/messages/backend_messages/parameter_status'
+require 'vertica/messages/backend_messages/parse_complete'
+require 'vertica/messages/backend_messages/portal_suspended'
+require 'vertica/messages/backend_messages/ready_for_query'
+require 'vertica/messages/backend_messages/row_description'
+require 'vertica/messages/backend_messages/unknown'
+
+require 'vertica/messages/frontend_messages/bind'
+require 'vertica/messages/frontend_messages/cancel_request'
+require 'vertica/messages/frontend_messages/close'
+require 'vertica/messages/frontend_messages/describe'
+require 'vertica/messages/frontend_messages/execute'
+require 'vertica/messages/frontend_messages/flush'
+require 'vertica/messages/frontend_messages/parse'
+require 'vertica/messages/frontend_messages/password'
+require 'vertica/messages/frontend_messages/query'
+require 'vertica/messages/frontend_messages/ssl_request'
+require 'vertica/messages/frontend_messages/startup'
+require 'vertica/messages/frontend_messages/sync'
+require 'vertica/messages/frontend_messages/terminate'

data/lib/vertica.rb

@@ -1,4 +1,8 @@
+require 'date'
+require 'bigdecimal'
+
 module Vertica
+  
   class Error < StandardError
     class ConnectionError < Error; end
     class MessageError < Error; end
@@ -11,52 +15,26 @@ module Vertica
   def self.connect(*args)
     Connection.new(*args)
   end
+  
+  def self.quote(value)
+    case value
+      when nil        then 'NULL'
+      when false      then 'FALSE'
+      when true       then 'TRUE'
+      when DateTime   then value.strftime("'%Y-%m-%d %H:%M:%S'::timestamp")
+      when Time       then value.strftime("'%Y-%m-%d %H:%M:%S'::timestamp")
+      when Date       then value.strftime("'%Y-%m-%d'::date")
+      when String     then "'#{value.gsub(/'/, "''")}'"
+      when BigDecimal then value.to_s('F')
+      when Numeric    then value.to_s
+      when Array      then value.map { |v| self.quote(v) }.join(', ')
+      else self.quote(value.to_s)
+    end
+  end
+  
+  def self.quote_identifier(identifier)
+    "\"#{identifier.to_s.gsub(/"/, '""')}\""
+  end
 end
 
-%w[
-  socket
-  uri
-  openssl/ssl
-  bigdecimal
-  bigdecimal/util
-  date
-
-  vertica/column
-  vertica/result
-  vertica/connection
-
-  vertica/messages/message
-
-  vertica/messages/backend_messages/authentication
-  vertica/messages/backend_messages/backend_key_data
-  vertica/messages/backend_messages/bind_complete
-  vertica/messages/backend_messages/close_complete
-  vertica/messages/backend_messages/command_complete
-  vertica/messages/backend_messages/data_row
-  vertica/messages/backend_messages/empty_query_response
-  vertica/messages/backend_messages/notice_response
-  vertica/messages/backend_messages/error_response
-  vertica/messages/backend_messages/no_data
-  vertica/messages/backend_messages/notification_response
-  vertica/messages/backend_messages/parameter_description
-  vertica/messages/backend_messages/parameter_status
-  vertica/messages/backend_messages/parse_complete
-  vertica/messages/backend_messages/portal_suspended
-  vertica/messages/backend_messages/ready_for_query
-  vertica/messages/backend_messages/row_description
-  vertica/messages/backend_messages/unknown
-
-  vertica/messages/frontend_messages/bind
-  vertica/messages/frontend_messages/cancel_request
-  vertica/messages/frontend_messages/close
-  vertica/messages/frontend_messages/describe
-  vertica/messages/frontend_messages/execute
-  vertica/messages/frontend_messages/flush
-  vertica/messages/frontend_messages/parse
-  vertica/messages/frontend_messages/password
-  vertica/messages/frontend_messages/query
-  vertica/messages/frontend_messages/ssl_request
-  vertica/messages/frontend_messages/startup
-  vertica/messages/frontend_messages/sync
-  vertica/messages/frontend_messages/terminate
-].each { |r| require r }
+require 'vertica/connection'

data/test/functional/query_test.rb

@@ -20,7 +20,7 @@ class QueryTest < Test::Unit::TestCase
     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 :integer, 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
@@ -33,7 +33,7 @@ class QueryTest < Test::Unit::TestCase
     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 :integer, 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
@@ -46,7 +46,7 @@ class QueryTest < Test::Unit::TestCase
     r = @connection.query("SELECT * FROM test_table WHERE 1 != 1")
     assert_equal 0, r.row_count
     assert_equal 2, r.columns.length
-    assert_equal :in, r.columns[0].data_type
+    assert_equal :integer, 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
@@ -57,7 +57,7 @@ class QueryTest < Test::Unit::TestCase
     r = @connection.query("INSERT INTO test_table VALUES (2, 'stefanie')")
     assert_equal 1, r.row_count
     assert_equal 1, r.columns.length
-    assert_equal :in, r.columns[0].data_type
+    assert_equal :integer, r.columns[0].data_type
     assert_equal :OUTPUT, r.columns[0].name
     assert_equal [{:OUTPUT => 1}], r.rows
   end
@@ -67,7 +67,7 @@ class QueryTest < Test::Unit::TestCase
     r = @connection.query("DELETE FROM test_table WHERE 1 != 1")
     assert_equal 1, r.row_count
     assert_equal 1, r.columns.length
-    assert_equal :in, r.columns[0].data_type
+    assert_equal :integer, r.columns[0].data_type
     assert_equal :OUTPUT, r.columns[0].name
     assert_equal [{:OUTPUT => 0}], r.rows
   end
@@ -76,7 +76,7 @@ class QueryTest < Test::Unit::TestCase
     r = @connection.query("DELETE FROM test_table WHERE id = 1")
     assert_equal 1, r.row_count
     assert_equal 1, r.columns.length
-    assert_equal :in, r.columns[0].data_type
+    assert_equal :integer, r.columns[0].data_type
     assert_equal :OUTPUT, r.columns[0].name
     assert_equal [{:OUTPUT => 1}], r.rows
   end
@@ -113,7 +113,7 @@ class QueryTest < Test::Unit::TestCase
   #   r = @connection.execute_prepared("my_ps")
   #   assert_equal 1, r.row_count
   #   assert_equal 2, r.columns.length
-  #   assert_equal :in, r.columns[0].data_type
+  #   assert_equal :integer, 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
@@ -126,7 +126,7 @@ class QueryTest < Test::Unit::TestCase
   #   r = c.execute_prepared("my_ps", 1)
   #   assert_equal 1, r.row_count
   #   assert_equal 2, r.columns.length
-  #   assert_equal :in, r.columns[0].data_type
+  #   assert_equal :integer, 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
@@ -140,7 +140,7 @@ class QueryTest < Test::Unit::TestCase
   #   r = c.execute_prepared("my_ps", 1, 3)
   #   assert_equal 1, r.row_count
   #   assert_equal 2, r.columns.length
-  #   assert_equal :in, r.columns[0].data_type
+  #   assert_equal :integer, 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
@@ -153,7 +153,7 @@ class QueryTest < Test::Unit::TestCase
       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 :integer, 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

data/test/test_helper.rb

@@ -6,5 +6,4 @@ require 'test/unit'
 
 require 'vertica'
 
-hash = YAML.load(File.read(File.expand_path("../connection.yml", __FILE__)))
-TEST_CONNECTION_HASH = hash.inject(Hash.new) { |carry, (k, v)| carry[k.to_sym] = v; carry }
+TEST_CONNECTION_HASH = YAML.load(File.read(File.expand_path("../connection.yml", __FILE__)))

data/test/unit/backend_message_test.rb

@@ -95,6 +95,9 @@ class BackendMessageTest < Test::Unit::TestCase
     
     msg = Vertica::Messages::DataRow.new("\x00\x02\x00\x00\x00\x011\x00\x00\x00\x04matt")
     assert_equal ['1', 'matt'], msg.values
+    
+    msg = Vertica::Messages::DataRow.new("\x00\a\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF")
+    assert_equal [nil,nil,nil,nil,nil,nil,nil], msg.values
   end
   
   def test_command_complete_message

data/test/unit/quoting_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class QuotingTest < Test::Unit::TestCase
+
+  def test_quote_identifier
+    assert_equal '"test"', Vertica.quote_identifier(:test)
+    assert_equal '"te""st"', Vertica.quote_identifier('te"st')
+    assert_equal '"te""""st"', Vertica.quote_identifier('te""st')
+  end
+
+  def test_quote
+    assert_equal "'test'", Vertica.quote('test')
+    assert_equal "'te''st'", Vertica.quote("te'st")
+    assert_equal "'te''''st'", Vertica.quote("te''st")
+    assert_equal "'test'", Vertica.quote(:test)
+
+    assert_equal 'NULL', Vertica.quote(nil)
+    assert_equal 'TRUE', Vertica.quote(true)
+    assert_equal 'FALSE', Vertica.quote(false)
+
+    assert_equal '1', Vertica.quote(1)
+    assert_equal '1.1', Vertica.quote(1.1)
+    assert_equal '1.1', Vertica.quote(BigDecimal.new('1.1'))
+
+    assert_equal "'2010-02-27'::date", Vertica.quote(Date.parse('2010-02-27'))
+    assert_equal "'2010-02-27 12:44:25'::timestamp", Vertica.quote(DateTime.parse('2010-02-27 12:44:25'))
+    assert_equal "'2010-02-27 12:44:25'::timestamp", Vertica.quote(Time.parse('2010-02-27 12:44:25'))
+    
+    assert_equal "NULL, 1, TRUE, 'test'", Vertica.quote([nil, 1, true, 'test'])
+  end
+end

metadata

@@ -1,33 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: vertica
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 9
-  - 0
-  - beta2
-  version: 0.9.0.beta2
+  prerelease: 6
+  version: 0.9.0.beta3
 platform: ruby
 authors: 
 - Jeff Smick
 - Matt Bauer
+- Willem van Bergen
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 -04:00
+date: 2011-09-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: vertica
+  name: rake
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -39,64 +33,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  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: []
@@ -155,6 +95,7 @@ files:
 - test/functional/value_conversion_test.rb
 - test/test_helper.rb
 - test/unit/backend_message_test.rb
+- test/unit/quoting_test.rb
 has_rdoc: true
 homepage: http://github.com/sprsquish/vertica
 licenses: []
@@ -169,23 +110,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Pure ruby library for interacting with Vertica
@@ -195,3 +130,4 @@ test_files:
 - test/functional/value_conversion_test.rb
 - test/test_helper.rb
 - test/unit/backend_message_test.rb
+- test/unit/quoting_test.rb