vertica 0.8.1 → 0.9.0.beta1

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

@@ -1,7 +1,7 @@
 module Vertica
   module Messages
     class NoData < BackendMessage
-      message_id ?n
+      message_id 'n'
     end
   end
 end

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

@@ -1,16 +1,42 @@
 module Vertica
   module Messages
     class NoticeResponse < BackendMessage
-      message_id ?N
+      message_id 'N'
+      
+      FIELDS_DEFINITIONS = [
+        { :type => 'q', :name => "Internal Query" },
+        { :type => 'S', :name => "Severity" },
+        { :type => 'M', :name => "Message" },
+        { :type => 'C', :name => "Sqlstate" },
+        { :type => 'D', :name => "Detail" },
+        { :type => 'H', :name => "Hint" },
+        { :type => 'P', :name => "Position" },
+        { :type => 'W', :name => "Where" },
+        { :type => 'p', :name => "Internal Position" },
+        { :type => 'R', :name => "Routine" },
+        { :type => 'F', :name => "File" },
+        { :type => 'L', :name => "Line" }
+      ]
+      
+      FIELDS = Hash[*FIELDS_DEFINITIONS.map { |f| [f[:type], f[:name]] }.flatten]
+      
+      attr_reader :values
 
-      attr_reader :notices
-
-      def initialize(stream, size)
-        super
-        @notices, type = [], nil
-        @notices << [type, stream.read_cstring] while (type = stream.read_byte) != 0
+      def initialize(data)
+        @values, pos = {}, 0
+        while pos < data.size - 1
+          key, value = data.unpack("@#{pos}aZ*")
+          @values[FIELDS[key]] = value
+          pos += value.size + 2
+        end
       end
 
+      def error_message
+        ordered_values = FIELDS_DEFINITIONS.map do |field| 
+          "#{field[:name]}: #{@values[field[:name]]}" if @values[field[:name]]
+        end
+        ordered_values.compact.join(', ')
+      end
     end
   end
 end

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

@@ -1,17 +1,12 @@
 module Vertica
   module Messages
     class NotificationResponse < BackendMessage
-      message_id ?A
+      message_id 'A'
       
-      attr_reader :pid
-      attr_reader :condition
-      attr_reader :addition_info
+      attr_reader :pid, :condition, :addition_info
       
-      def initialize(stream, size)
-        super
-        @pid           = stream.read_network_int32
-        @condition     = stream.read_cstring
-        @addition_info = stream.read_cstring
+      def initialize(data)
+        @pid, @condition, @addition_info = data.unpack('NZ*Z*')
       end
     end
   end

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

@@ -1,18 +1,14 @@
 module Vertica
   module Messages
     class ParameterDescription < BackendMessage
-      message_id ?t
+      message_id 't'
 
-      attr_reader :parameter_count
       attr_reader :parameter_types
       
-      def initialize(stream, size)
-        super
-        @parameter_types = []
-        @parameter_count = stream.read_network_int16
-        @parameter_count.times do
-          @parameter_types << Vertica::Column::DATA_TYPES[stream.read_network_int32]
-        end
+      def initialize(data)
+        parameter_count    = data.unpack('n').first
+        parameter_type_ids = data.unpack("@2N#{parameter_count}")
+        @parameter_types   = parameter_type_ids.map { |id| Vertica::Column::DATA_TYPES[id] }
       end
     end
   end

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

@@ -1,17 +1,13 @@
 module Vertica
   module Messages
     class ParameterStatus < BackendMessage
-      message_id ?S
+      message_id 'S'
       
-      attr_reader :name
-      attr_reader :value
+      attr_reader :name, :value
       
-      def initialize(stream, size)
-        super
-        @name  = stream.read_cstring
-        @value = stream.read_cstring
+      def initialize(data)
+        @name, @value = data.unpack('Z*Z*')
       end
-
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Vertica
   module Messages
     class ParseComplete < BackendMessage
-      message_id ?1
+      message_id '1'
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Vertica
   module Messages
     class PortalSuspended < BackendMessage
-      message_id ?s
+      message_id 's'
     end
   end
 end

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

@@ -1,13 +1,12 @@
 module Vertica
   module Messages
     class ReadyForQuery < BackendMessage
-      message_id ?Z
+      message_id 'Z'
 
       attr_reader :transaction_status
 
-      def initialize(stream, size)
-        super
-        @transaction_status = stream.read_byte
+      def initialize(data)
+        @transaction_status = data.unpack('a').first
       end
     end
   end

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

@@ -1,27 +1,27 @@
 module Vertica
   module Messages
     class RowDescription < BackendMessage
-      message_id ?T
+      message_id 'T'
 
-      attr_reader :field_count
       attr_reader :fields
 
-      def initialize(stream, size)
-        super
-
+      def initialize(data)
         @fields = []
-
-        @field_count = stream.read_network_int16
-        @field_count.times do |field_index|
+        field_count = data.unpack('n').first
+        pos = 2
+        field_count.times do |field_index|
+          field_info = data.unpack("@#{pos}Z*NnNnNn")
           @fields << {
-            :name             => stream.read_cstring,
-            :table_oid        => stream.read_network_int32,
-            :attribute_number => stream.read_network_int16,
-            :data_type_oid    => stream.read_network_int32,
-            :data_type_size   => stream.read_network_int16,
-            :type_modifier    => stream.read_network_int32,
-            :format_code      => stream.read_network_int16
+            :name             => field_info[0],
+            :table_oid        => field_info[1],
+            :attribute_number => field_info[2],
+            :data_type_oid    => field_info[3],
+            :data_type_size   => field_info[4],
+            :type_modifier    => field_info[5],
+            :format_code      => field_info[6],
           }
+          
+          pos += 19 + field_info[0].size
         end
       end
     end

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

@@ -3,8 +3,8 @@ module Vertica
     class Unknown < BackendMessage
       attr_reader :message_id
 
-      def initialize(stream, size)
-        @message_id = message_id
+      def initialize(message_id, data)
+        @message_id, @data = message_id, data
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Vertica
   module Messages
     class Bind < FrontendMessage
-      message_id ?B
+      message_id 'B'
 
       def initialize(portal_name, prepared_statement_name, parameter_values)
         @portal_name = portal_name
@@ -10,19 +10,10 @@ module Vertica
       end
 
       def to_bytes
-        bytes = [
-          @portal_name.to_cstring,                    # portal name ("")
-          @prepared_statement_name.to_cstring,        # prep
-          0.to_network_int16,                         # format codes (0 - default text format)
-          @parameter_values.length.to_network_int16,  # number of parameters
-        ]
-        @parameter_values.each do |parameter_value|
-          bytes << parameter_value.length.to_network_int32  # parameter value (which is represented as a string) length
-          bytes << parameter_value                          # parameter value written out in text representation
-        end
+        bytes = [@portal_name, @prepared_statement_name, 0, @parameter_values.length].pack('Z*Z*nn')
+        bytes << @parameter_values.map { |val| [val.length, val].pack('Na*') }.join('') << [0].pack('n')
         message_string bytes
       end
-
     end
   end
 end

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

@@ -9,11 +9,7 @@ module Vertica
       end
 
       def to_bytes
-        message_string([
-          80877102.to_network_int32,
-          @backend_pid.to_network_int32,
-          @backend_key.to_network_int32
-        ])
+        message_string [80877102, @backend_pid, @backend_key].pack('N3')
       end
 
     end

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

@@ -1,24 +1,20 @@
 module Vertica
   module Messages
     class Close < FrontendMessage
-      message_id ?C
+      message_id 'C'
 
       def initialize(close_type, close_name)
         @close_name = close_name
         @close_type = case close_type
-        when :portal              then ?P
-        when :prepared_statement  then ?S
-        else raise ArgumentError.new("#{close_type} is not a valid close_type.  Must be either :portal or :prepared_statement.")
+          when :portal              then 'P'
+          when :prepared_statement  then 'S'
+          else raise ArgumentError.new("#{close_type} is not a valid close_type.  Must be either :portal or :prepared_statement.")
         end
       end
 
       def to_bytes
-        message_string([
-          @close_type.to_byte,
-          @close_name.to_cstring
-        ])
+        message_string [@close_type, @close_name].pack('AZ*')
       end
-
     end
   end
 end

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

@@ -1,24 +1,20 @@
 module Vertica
   module Messages
     class Describe < FrontendMessage
-      message_id ?D
+      message_id 'D'
 
       def initialize(describe_type, describe_name)
         @describe_name = describe_name
         @describe_type = case describe_type
-        when :portal              then ?P
-        when :prepared_statement  then ?S
-        else raise ArgumentError.new("#{describe_type} is not a valid describe_type.  Must be either :portal or :prepared_statement.")
+          when :portal              then 'P'
+          when :prepared_statement  then 'S'
+          else raise ArgumentError.new("#{describe_type} is not a valid describe_type.  Must be either :portal or :prepared_statement.")
         end
       end
 
       def to_bytes
-        message_string([
-          @describe_type.to_byte,
-          @describe_name.to_cstring
-        ])
+        message_string [@describe_type, @describe_name].pack('AZ*')
       end
-
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Vertica
   module Messages
     class Execute < FrontendMessage
-      message_id ?E
+      message_id 'E'
 
       def initialize(portal_name, max_rows)
         @portal_name = portal_name
@@ -9,12 +9,8 @@ module Vertica
       end
 
       def to_bytes
-        message_string([ 
-          @portal_name.to_cstring,
-          @max_rows.to_network_int32
-        ])
+        message_string [@portal_name, @max_rows].pack('Z*N')
       end
-
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Vertica
   module Messages
     class Flush < FrontendMessage
-      message_id ?H
+      message_id 'H'
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Vertica
   module Messages
     class Parse < FrontendMessage
-      message_id ?P
+      message_id 'P'
 
       def initialize(name, query, param_types)
         @name         = name
@@ -10,14 +10,8 @@ module Vertica
       end
 
       def to_bytes
-        message_string([ 
-          @name.to_cstring,
-          @query.to_cstring,
-          @param_types.length.to_network_int16,
-          @param_types.map { |type| type.to_network_int32 }
-        ].flatten)
+        message_string([@name, @query, @param_types.length, *@param_types].pack('Z*Z*nN*'))
       end
-
     end
   end
 end

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

@@ -2,7 +2,7 @@
 module Vertica
   module Messages
     class Password < FrontendMessage
-      message_id ?p
+      message_id 'p'
 
       def initialize(password, auth_method = nil, options = {})
         @password = password
@@ -10,16 +10,16 @@ module Vertica
         @options = options
       end
 
-      def password
+      def encoded_password
         case @auth_method
         when Authentication::CLEARTEXT_PASSWORD
           @password
         when Authentication::CRYPT_PASSWORD
-          @password.crypt(options[:salt])
+          @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 = Digest::MD5.hexdigest(@password + @options[:salt])
           @password = 'md5' + @password
         else
           raise ArgumentError.new("unsupported authentication method: #{@auth_method}")
@@ -27,9 +27,8 @@ module Vertica
       end
 
       def to_bytes
-        message_string password.to_cstring
+        message_string [encoded_password].pack('Z*')
       end
-
     end
   end
 end

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

@@ -2,16 +2,15 @@ module Vertica
   module Messages
 
     class Query < FrontendMessage
-      message_id ?Q
+      message_id 'Q'
 
       def initialize(query_string)
         @query_string = query_string
       end
 
       def to_bytes
-        message_string @query_string.to_cstring
+        message_string [@query_string].pack('Z*')
       end
     end
-
   end
 end