vertica 0.7.4 → 0.8.1

data/lib/vertica/messages/frontend_messages/password.rb

@@ -0,0 +1,35 @@
+
+module Vertica
+  module Messages
+    class Password < FrontendMessage
+      message_id ?p
+
+      def initialize(password, auth_method = nil, options = {})
+        @password = password
+        @auth_method = auth_method || Messages::Authentication::CLEARTEXT_PASSWORD
+        @options = options
+      end
+
+      def password
+        case @auth_method
+        when Authentication::CLEARTEXT_PASSWORD
+          @password
+        when Authentication::CRYPT_PASSWORD
+          @password.crypt(options[:salt])
+        when Authentication::MD5_PASSWORD
+          require 'digest/md5'
+          @password = Digest::MD5.hexdigest(@password + @options[:user])
+          @password = Digest::MD5.hexdigest(m + @options[:salt])
+          @password = 'md5' + @password
+        else
+          raise ArgumentError.new("unsupported authentication method: #{@auth_method}")
+        end
+      end
+
+      def to_bytes
+        message_string password.to_cstring
+      end
+
+    end
+  end
+end

data/lib/vertica/messages/frontend_messages/query.rb

@@ -0,0 +1,17 @@
+module Vertica
+  module Messages
+
+    class Query < FrontendMessage
+      message_id ?Q
+
+      def initialize(query_string)
+        @query_string = query_string
+      end
+
+      def to_bytes
+        message_string @query_string.to_cstring
+      end
+    end
+
+  end
+end

data/lib/vertica/messages/frontend_messages/ssl_request.rb

@@ -0,0 +1,12 @@
+module Vertica
+  module Messages
+    class SslRequest < FrontendMessage
+      message_id nil
+
+      def to_bytes
+        message_string 80877103.to_network_int32
+      end
+
+    end
+  end
+end

data/lib/vertica/messages/frontend_messages/startup.rb

@@ -0,0 +1,25 @@
+module Vertica
+  module Messages
+
+    class Startup < FrontendMessage
+      message_id nil
+
+      def initialize(user, database, options = nil)
+        @user     = user
+        @database = database
+        @options  = options
+      end
+
+      def to_bytes
+        bytes =   [Vertica::PROTOCOL_VERSION.to_network_int32]
+        bytes +=  ['user'.to_cstring, @user.to_cstring] if @user
+        bytes +=  ['database'.to_cstring, @database.to_cstring] if @database
+        bytes +=  ['options'.to_cstring, @options.to_cstring] if @options
+        bytes << 0
+
+        message_string bytes
+      end
+
+    end
+  end
+end

data/lib/vertica/messages/frontend_messages/sync.rb

@@ -0,0 +1,7 @@
+module Vertica
+  module Messages
+    class Sync < FrontendMessage
+      message_id ?S
+    end
+  end
+end

data/lib/vertica/messages/frontend_messages/terminate.rb

@@ -0,0 +1,7 @@
+module Vertica
+  module Messages
+    class Terminate < FrontendMessage
+      message_id ?X
+    end
+  end
+end

data/lib/vertica/messages/message.rb

@@ -1,15 +1,19 @@
 module Vertica
   module Messages
-    class Message
-      LENGTH_SIZE   = 4
 
-      class << self
+    class Message
+      def self.message_id(message_id)
+        self.send(:define_method, :message_id) { message_id }
+      end
 
-        def message_id(message_id)
-          self.const_set(:MESSAGE_ID, message_id)
-          class_eval "def message_id; MESSAGE_ID end"
+      def message_string(msg)
+        msg = msg.join if msg.is_a?(Array)
+        size = (0.to_network_int32.size + msg.size).to_network_int32
+        m_id = ''.to_byte             #in 1.9 it seems to write out message ids as numbers, handle this here
+        if (message_id)
+          m_id = message_id.chr
         end
-
+        "#{m_id}#{size}#{msg}"
       end
     end
 
@@ -18,68 +22,33 @@ module Vertica
 
       attr_reader :size
 
-      class << self
-        def message_id(message_id)
-          super
-          MessageIdMap[message_id.chr] = self
+      def self.factory(type, stream, size)
+        #puts "factory reading message #{type} #{size} #{type.class}"
+        if klass = MessageIdMap[type.chr]           #explicitly use the char value, for 1.9 compat
+          klass.new stream, size
+        else
+          Messages::Unknown.new stream, size
         end
+      end
 
-        def read(stream)
-          type = stream.read_byte
-          size = stream.read_network_int32
-
-          raise Vertica::Error::MessageError.new("Bad message size: #{size}") unless size >= 4
-
-          message_klass = MessageIdMap[type.chr]
-          if message_klass.nil?
-            Messages::Unknown.new(type)
-          else
-            message_klass.new(stream, size)
-          end
-        end
+      def self.message_id(message_id)
+        super
+        MessageIdMap[message_id.chr] = self          #explicitly use the char value, for 1.9 compat
+      end
 
+      def self.read(stream)
       end
 
       def initialize(stream, size)
         @size = size
       end
-
     end
 
     class FrontendMessage < Message
+      def to_bytes
+        message_string ''
+      end
     end
 
   end
 end
-
-require 'vertica/messages/unknown'
-require 'vertica/messages/error_response'
-require 'vertica/messages/startup'
-require 'vertica/messages/authentication'
-require 'vertica/messages/password'
-require 'vertica/messages/parameter_status'
-require 'vertica/messages/backend_key_data'
-require 'vertica/messages/ready_for_query'
-require 'vertica/messages/terminate'
-require 'vertica/messages/notification_response'
-require 'vertica/messages/query'
-require 'vertica/messages/notice_response'
-require 'vertica/messages/row_description'
-require 'vertica/messages/command_complete'
-require 'vertica/messages/data_row'
-require 'vertica/messages/empty_query_response'
-require 'vertica/messages/sync'
-require 'vertica/messages/ssl_request'
-require 'vertica/messages/parse'
-require 'vertica/messages/parse_complete'
-require 'vertica/messages/bind'
-require 'vertica/messages/bind_complete'
-require 'vertica/messages/describe'
-require 'vertica/messages/flush'
-require 'vertica/messages/parameter_description'
-require 'vertica/messages/no_data'
-require 'vertica/messages/execute'
-require 'vertica/messages/close'
-require 'vertica/messages/close_complete'
-require 'vertica/messages/portal_suspended'
-require 'vertica/messages/cancel_request'

data/lib/vertica/result.rb

@@ -1,28 +1,36 @@
 module Vertica
   class Result
-    
-    def initialize(field_descriptions, field_values)
-      @field_descriptions = field_descriptions
-      @field_values = field_values
+    attr_reader :columns
+    attr_reader :rows
+
+    def initialize
+      @rows = []
     end
-    
-    def row_count
-      @row_count ||= @field_values.length
-    end
-    
-    def columns
-      @columns ||= @field_descriptions.map { |fd| Column.new(fd[:type_modifier], fd[:format_code], fd[:table_oid], fd[:name], fd[:attribute_number], fd[:data_type_oid], fd[:data_type_size]) }
+
+    def descriptions=(message)
+      @columns = message.fields.map { |fd| Column.new(fd) }
     end
-    
-    def rows
-      @field_values.map do |fv|
-        index = 0
-        fv.map do |f|
-          index += 1
-          self.columns[index-1].convert(f[:value])
-        end
+
+    def format_row(row_data)
+      row = {}
+      row_data.fields.each_with_index do |field, idx|
+        col = columns[idx]
+        row[col.name] = col.convert(field)
       end
+      row
+    end
+
+    def add_row(row_data)
+      @rows << format_row(row_data)
+    end
+
+    def each_row(&block)
+      @rows.each(&block)
+    end
+
+    def row_count
+      @rows.size
     end
-    
+
   end
 end

data/lib/vertica/vertica_socket.rb

@@ -1,8 +1,19 @@
-require 'socket'
-require 'vertica/bit_helper'
-
 module Vertica
   class VerticaSocket < TCPSocket
     include BitHelper
+
+    def read_message
+      type = read_byte
+      size = read_network_int32
+
+      raise Vertica::Error::MessageError.new("Bad message size: #{size}") unless size >= 4
+      Messages::BackendMessage.factory type, self, size
+    end
+
+    def write_message(message)
+      raise ArgumentError, "invalid message: (#{message.inspect})" unless message.respond_to?(:to_bytes)
+      write message.to_bytes
+    end
+
   end
 end

data/test/test_helper.rb

@@ -1,25 +1,16 @@
 require "test/unit"
+
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require "vertica"
- 
+
 class Test::Unit::TestCase
-  
-  TEST_CONNECTION_USER     = 'dbadmin'
-  TEST_CONNECTION_PASSWORD = 'cl3v3rcstore'
-  TEST_CONNECTION_HOST     = 'ec2-174-129-157-242.compute-1.amazonaws.com'
-  TEST_CONNECTION_PORT     = 5433
-  TEST_CONNECTION_DATABASE = 'db'
 
   TEST_CONNECTION_HASH = {
-    :user     => TEST_CONNECTION_USER,
-    :password => TEST_CONNECTION_PASSWORD,
-    :host     => TEST_CONNECTION_HOST,
-    :port     => TEST_CONNECTION_PORT,
-    :database => TEST_CONNECTION_DATABASE
+    :user     => '',
+    :password => '',
+    :host     => '',
+    :port     => '',
+    :database => ''
   }
 
 end
-
-class StringIO
-  include Vertica::BitHelper
-end

metadata

@@ -1,81 +1,85 @@
 --- !ruby/object:Gem::Specification 
 name: vertica
 version: !ruby/object:Gem::Version 
+  hash: 61
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 4
-  version: 0.7.4
+  - 8
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
+- Jeff Smick
 - Matt Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 +02:00
+date: 2011-03-07 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
-description: 
-email: bauer@pedalbrain.com
+description: Query Vertica with ruby
+email: sprsquish@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE
+- README.md
 files: 
-- vertica.gemspec
 - LICENSE
-- README.textile
+- README.md
 - Rakefile
+- VERSION
 - lib/vertica.rb
-- lib/vertica/notice.rb
 - lib/vertica/bit_helper.rb
 - lib/vertica/column.rb
 - lib/vertica/connection.rb
+- lib/vertica/core_ext/numeric.rb
+- lib/vertica/core_ext/string.rb
+- lib/vertica/messages/backend_messages/authentication.rb
+- lib/vertica/messages/backend_messages/backend_key_data.rb
+- lib/vertica/messages/backend_messages/bind_complete.rb
+- lib/vertica/messages/backend_messages/close_complete.rb
+- lib/vertica/messages/backend_messages/command_complete.rb
+- lib/vertica/messages/backend_messages/data_row.rb
+- lib/vertica/messages/backend_messages/empty_query_response.rb
+- lib/vertica/messages/backend_messages/error_response.rb
+- lib/vertica/messages/backend_messages/no_data.rb
+- lib/vertica/messages/backend_messages/notice_response.rb
+- lib/vertica/messages/backend_messages/notification_response.rb
+- lib/vertica/messages/backend_messages/parameter_description.rb
+- lib/vertica/messages/backend_messages/parameter_status.rb
+- lib/vertica/messages/backend_messages/parse_complete.rb
+- lib/vertica/messages/backend_messages/portal_suspended.rb
+- lib/vertica/messages/backend_messages/ready_for_query.rb
+- lib/vertica/messages/backend_messages/row_description.rb
+- lib/vertica/messages/backend_messages/unknown.rb
+- lib/vertica/messages/frontend_messages/bind.rb
+- lib/vertica/messages/frontend_messages/cancel_request.rb
+- lib/vertica/messages/frontend_messages/close.rb
+- lib/vertica/messages/frontend_messages/describe.rb
+- lib/vertica/messages/frontend_messages/execute.rb
+- lib/vertica/messages/frontend_messages/flush.rb
+- lib/vertica/messages/frontend_messages/parse.rb
+- lib/vertica/messages/frontend_messages/password.rb
+- lib/vertica/messages/frontend_messages/query.rb
+- lib/vertica/messages/frontend_messages/ssl_request.rb
+- lib/vertica/messages/frontend_messages/startup.rb
+- lib/vertica/messages/frontend_messages/sync.rb
+- lib/vertica/messages/frontend_messages/terminate.rb
+- lib/vertica/messages/message.rb
+- lib/vertica/notice.rb
 - lib/vertica/notification.rb
 - lib/vertica/result.rb
 - lib/vertica/vertica_socket.rb
-- lib/vertica/messages/authentication.rb
-- lib/vertica/messages/backend_key_data.rb
-- lib/vertica/messages/bind.rb
-- lib/vertica/messages/bind_complete.rb
-- lib/vertica/messages/cancel_request.rb
-- lib/vertica/messages/close.rb
-- lib/vertica/messages/close_complete.rb
-- lib/vertica/messages/command_complete.rb
-- lib/vertica/messages/data_row.rb
-- lib/vertica/messages/describe.rb
-- lib/vertica/messages/empty_query_response.rb
-- lib/vertica/messages/error_response.rb
-- lib/vertica/messages/execute.rb
-- lib/vertica/messages/flush.rb
-- lib/vertica/messages/message.rb
-- lib/vertica/messages/no_data.rb
-- lib/vertica/messages/notice_response.rb
-- lib/vertica/messages/notification_response.rb
-- lib/vertica/messages/parameter_description.rb
-- lib/vertica/messages/parameter_status.rb
-- lib/vertica/messages/parse.rb
-- lib/vertica/messages/parse_complete.rb
-- lib/vertica/messages/password.rb
-- lib/vertica/messages/portal_suspended.rb
-- lib/vertica/messages/query.rb
-- lib/vertica/messages/ready_for_query.rb
-- lib/vertica/messages/row_description.rb
-- lib/vertica/messages/ssl_request.rb
-- lib/vertica/messages/startup.rb
-- lib/vertica/messages/sync.rb
-- lib/vertica/messages/terminate.rb
-- lib/vertica/messages/unknown.rb
 - test/connection_test.rb
-- test/create_schema.sql
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/mattbauer/vertica
+homepage: http://github.com/sprsquish/vertica
 licenses: []
 
 post_install_message: 
@@ -88,16 +92,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 8
-      - 4
-      version: 1.8.4
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -107,6 +111,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A Ruby interface to Vertica
+summary: Pure ruby library for interacting with Vertica
 test_files: 
+- test/connection_test.rb
 - test/test_helper.rb