monetdb 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWIxMjU2MTVlNWE5OGI2NmM5OTM5MjljZWVkNTQ2NzViOTUxMDAyOA==
+    Mjg1NWNmZjNmOWY2M2M5OWIwZDcxY2Y0ODA3ODBmNDc0MzgyYWFiMA==
   data.tar.gz: !binary |-
-    ZmU2YTQ4ZDhkOTk0NGVlMDY0ZTg4ODU4NjA5MThhM2U1YTc1ZjNmZQ==
+    OWIxYTQzZTYyYTQzZmYzZWZkNjE5NWFmNDllNDcyZjgwNDk1MzZlMw==
 SHA512:
   metadata.gz: !binary |-
-    NjJmYzAxZGQ1MmY0ZDk4OWU3MzViNzYyYTNhMTVmYjhiZWEyZWM2YjZlMmYw
-    YWVhOTA5NWM1YWNlZmM3NTc5ZDJhNjQ1MDU4NWJlZTQyYTIwZWEyNzcxNjM4
-    N2VlZTc2ZGY4OGM4N2Y2MjBiYjZiYmFhYzU3Y2JiMzIxNTU2ZmU=
+    YTk1ODNlMDViZDVlZWE5MDRlNmEzOTc3Y2MyNjE0MWFjYWUyNjJhM2ZlYzJm
+    ODZiNjNlMTViZjg5MzFkMTgxMDJjMWU5YmJhNGVhM2Y3OWE3MjJhMzMyZWI3
+    YmYzNThkMzgxOTUxZTE4OTAzZWNhM2RlNDA2MmYzZDIzMjAwODU=
   data.tar.gz: !binary |-
-    NDM2MWJlNjg0NTkzNTY5ZjhmNTdhM2E0M2I4MjIzZDYyZjMwMjdjN2VhMmY3
-    OGU1MzQ0YWE2NzczNjhjODAyOTI3MTgyZTExYTc5Yzg1OGEwOGNlN2JkY2Y1
-    NGI2YTg3MjUxYjkxYWFmMWVmNmIyYjY3ZmVmNzE0YzhlMDI1MGU=
+    YWZlZjUyYjhiODEyZjdiMjBmMzkxNzk4NmMxZmRkMDVmNDU0Mzg0N2Q1ODRj
+    NDdiZDVmYzA1ZGI0MjkxMjhhOTc4YzFiMDU4MTM3ZjQzNzkwZDMwNjQxMDlk
+    MTU1NmVlMmViMDQwOGFkZmRkNDBkZWU1NzcxODViOWUyNmJjZDc=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = MonetDB CHANGELOG
 
+== Version 0.2.4 (October 29, 2014)
+
+* Being able to reconnect after getting invalid query header error
+
 == Version 0.2.3 (October 22, 2014)
 
 * Dropped activesupport dependency

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/monetdb/connection.rb

@@ -63,13 +63,21 @@ module MonetDB
       true
     end
 
+    def disconnect
+      socket.disconnect if connected?
+      @socket = nil
+    end
+
     def connected?
       !socket.nil?
     end
 
-    def disconnect
-      socket.disconnect if connected?
-      @socket = nil
+    def reconnect?
+      !!config[:reconnect]
+    end
+
+    def check_connectivity!
+      connect if reconnect? && !connected?
     end
 
   private

data/lib/monetdb/connection/query.rb

@@ -1,8 +1,15 @@
+require "monetdb/connection/query/table"
+
 module MonetDB
   class Connection
     module Query
 
+      def self.included(base)
+        base.send :include, Table
+      end
+
       def query(statement)
+        check_connectivity!
         raise ConnectionError, "Not connected to server" unless connected?
 
         start = Time.now
@@ -11,19 +18,7 @@ module MonetDB
         response = read.split("\n")
 
         log :info, "\n  SQL (#{((Time.now - start) * 1000).round(1)}ms)  #{statement}"
-
-        query_header, table_header = extract_headers!(response)
-
-        if query_header[:type] == Q_TABLE
-          unless query_header[:rows] == response.size
-            raise QueryError, "Amount of fetched rows does not match header value (#{response.size} instead of #{query_header[:rows]})"
-          end
-          response = parse_rows(query_header, table_header, response.join("\n"))
-        else
-          response = true
-        end
-
-        response
+        parse_response response
       end
 
       alias :select_rows :query
@@ -39,6 +34,15 @@ module MonetDB
 
     private
 
+      def parse_response(response)
+        query_header, table_header = extract_headers!(response)
+        if query_header[:type] == Q_TABLE
+          parse_table_response query_header, table_header, response
+        else
+          true
+        end
+      end
+
       def extract_headers!(response)
         [parse_query_header!(response), parse_scheme_header!(response)]
       end
@@ -49,6 +53,7 @@ module MonetDB
         raise QueryError, header if header[0].chr == MSG_ERROR
 
         unless header[0].chr == MSG_QUERY
+          ENV["MONETDB_QUERY_RESPONSE"] = ([header] + response).join("\n").inspect
           raise QueryError, "Expected an query header (#{MSG_QUERY}) but got (#{header[0].chr})"
         end
 
@@ -87,67 +92,6 @@ module MonetDB
         {:table_name => table_name, :column_names => column_names, :column_types => column_types, :column_lengths => column_lengths}.freeze
       end
 
-      def parse_rows(query_header, table_header, response)
-        start = Time.now
-        column_types = table_header[:column_types]
-
-        response.slice(0..-3).split("\t]\n").collect do |row|
-          parsed, values = [], row.slice(1..-1).split(",\t")
-          values.each_with_index do |value, index|
-            parsed << parse_value(column_types[index], value.strip)
-          end
-          parsed
-        end.tap do
-          log :info, "  RUBY (#{((Time.now - start) * 1000).round(1)}ms) [ Rows: #{query_header[:rows]}, Bytesize: #{response.bytesize} bytes ]"
-        end
-      end
-
-      def parse_value(type, value)
-        unless value == "NULL"
-          case type
-          when :varchar, :text
-            parse_string_value value
-          when :int, :smallint, :bigint
-            parse_integer_value value
-          when :double, :float, :real
-            parse_float_value value
-          when :date
-            parse_date_value value
-          when :timestamp
-            parse_date_time_value value
-          when :tinyint
-            parse_boolean_value value
-          else
-            raise NotImplementedError, "Cannot parse value of type #{type.inspect}"
-          end
-        end
-      end
-
-      def parse_string_value(value)
-        value.slice(1..-2).force_encoding("UTF-8")
-      end
-
-      def parse_integer_value(value)
-        value.to_i
-      end
-
-      def parse_float_value(value)
-        value.to_f
-      end
-
-      def parse_date_value(value)
-        Date.new *value.split("-").collect(&:to_i)
-      end
-
-      def parse_date_time_value(value)
-        date, time = value.split(" ")
-        Time.new *(date.split("-") + time.split(":")).collect(&:to_i)
-      end
-
-      def parse_boolean_value(value)
-        value == "1"
-      end
-
     end
   end
 end

data/lib/monetdb/connection/query/table.rb

@@ -0,0 +1,86 @@
+module MonetDB
+  class Connection
+    module Query
+      module Table
+
+        def parse_table_response(query_header, table_header, response)
+          unless query_header[:rows] == response.size
+            disconnect if reconnect?
+            raise QueryError, "Amount of fetched rows does not match header value (#{response.size} instead of #{query_header[:rows]})"
+          end
+          parse_table_rows query_header, table_header, response.join("\n")
+        end
+
+        def parse_table_rows(query_header, table_header, response)
+          start = Time.now
+          rows = response.slice(0..-3).split("\t]\n")
+          parse_rows(table_header, rows).tap do
+            log :info, "  RUBY (#{((Time.now - start) * 1000).round(1)}ms) [ Rows: #{query_header[:rows]}, Bytesize: #{response.bytesize} bytes ]"
+          end
+        end
+
+        def parse_rows(table_header, rows)
+          column_types = table_header[:column_types]
+          rows.collect do |row|
+            parse_row column_types, row
+          end
+        end
+
+        def parse_row(column_types, row)
+          [].tap do |parsed|
+            row.slice(1..-1).split(",\t").each_with_index do |value, index|
+              parsed << parse_value(column_types[index], value.strip)
+            end
+          end
+        end
+
+        def parse_value(type, value)
+          unless value == "NULL"
+            case type
+            when :varchar, :text
+              parse_string_value value
+            when :int, :smallint, :bigint
+              parse_integer_value value
+            when :double, :float, :real
+              parse_float_value value
+            when :date
+              parse_date_value value
+            when :timestamp
+              parse_date_time_value value
+            when :tinyint
+              parse_boolean_value value
+            else
+              raise NotImplementedError, "Cannot parse value of type #{type.inspect}"
+            end
+          end
+        end
+
+        def parse_string_value(value)
+          value.slice(1..-2).force_encoding("UTF-8")
+        end
+
+        def parse_integer_value(value)
+          value.to_i
+        end
+
+        def parse_float_value(value)
+          value.to_f
+        end
+
+        def parse_date_value(value)
+          Date.new *value.split("-").collect(&:to_i)
+        end
+
+        def parse_date_time_value(value)
+          date, time = value.split(" ")
+          Time.new *(date.split("-") + time.split(":")).collect(&:to_i)
+        end
+
+        def parse_boolean_value(value)
+          value == "1"
+        end
+
+      end
+    end
+  end
+end

data/lib/monetdb/version.rb

@@ -1,7 +1,7 @@
 module MonetDB
   MAJOR = 0
   MINOR = 2
-  TINY  = 3
+  TINY  = 4
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/test/test_helper/simple_connection.rb

@@ -14,6 +14,13 @@ class SimpleConnection
     !@socket.nil?
   end
 
+  def reconnect?
+    false
+  end
+
+  def check_connectivity!
+  end
+
 private
 
   def socket

data/test/unit/connection/test_query.rb

@@ -280,7 +280,7 @@ module Unit
             assert_equal [
               ["Paul Engel", Date.parse("1982-08-01"), 1709.34],
               ["Ken Adams", Date.parse("1980-10-31"), 2003.47]
-            ], @connection.send(:parse_rows, query_header, table_header, response)
+            ], @connection.send(:parse_table_rows, query_header, table_header, response)
           end
         end
 

data/test/unit/test_connection.rb

@@ -45,16 +45,6 @@ module Unit
         end
       end
 
-      describe "#connected?" do
-        it "returns whether it has an active socket" do
-          assert_equal false, @connection.connected?
-          @connection.instance_variable_set :@socket, mock
-          assert_equal true, @connection.connected?
-          @connection.instance_variable_set :@socket, nil
-          assert_equal false, @connection.connected?
-        end
-      end
-
       describe "#disconnect" do
         describe "when disconnected" do
           it "does nothing" do
@@ -79,6 +69,71 @@ module Unit
         end
       end
 
+      describe "#connected?" do
+        it "returns whether it has an active socket" do
+          assert_equal false, @connection.connected?
+          @connection.instance_variable_set :@socket, mock
+          assert_equal true, @connection.connected?
+          @connection.instance_variable_set :@socket, nil
+          assert_equal false, @connection.connected?
+        end
+      end
+
+      describe "#reconnect?" do
+        describe "at default" do
+          it "returns false" do
+            assert_equal false, @connection.reconnect?
+          end
+        end
+
+        describe "when configured to true" do
+          it "returns true" do
+            @connection.instance_variable_get(:@config)[:reconnect] = true
+            assert_equal true, @connection.reconnect?
+          end
+        end
+      end
+
+      describe "#check_connectivity!" do
+        describe "when configured reconnect: true" do
+          before do
+            @connection.expects(:reconnect?).returns(true)
+          end
+
+          describe "when disconnected" do
+            it "connects" do
+              @connection.expects(:connected?).returns(false)
+              @connection.expects(:connect)
+              @connection.check_connectivity!
+            end
+          end
+
+          describe "when connected" do
+            it "does nothing" do
+              @connection.expects(:connected?).returns(true)
+              @connection.expects(:connect).never
+              @connection.check_connectivity!
+            end
+          end
+        end
+
+        describe "when not configured reconnect: true" do
+          describe "when disconnected" do
+            it "does nothing" do
+              @connection.expects(:connect).never
+              @connection.check_connectivity!
+            end
+          end
+
+          describe "when connected" do
+            it "does nothing" do
+              @connection.expects(:connect).never
+              @connection.check_connectivity!
+            end
+          end
+        end
+      end
+
       describe "#socket" do
         it "returns its instance variable :@socket" do
           @connection.instance_variable_set :@socket, (socket = mock)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monetdb
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,6 +115,7 @@ files:
 - lib/monetdb/connection/logger.rb
 - lib/monetdb/connection/messages.rb
 - lib/monetdb/connection/query.rb
+- lib/monetdb/connection/query/table.rb
 - lib/monetdb/connection/setup.rb
 - lib/monetdb/error.rb
 - lib/monetdb/version.rb