monetdb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MThkM2ZmNjgyZDMwNmMzZmVlYTc3ZTBhYzZmZjhhZGFmOGFlZWFlNg==
+    ZWY3ZDg1YzZlMDc5MDk4YTIyNWIwMmZlMjBhNzhmYTFhZGZiYjhhZg==
   data.tar.gz: !binary |-
-    MjZiNTIxYTNmMzkyOTQzMjBkNGQxZGY3MWJhMGQ0MjI1MGE5NWRiZg==
+    NjJiZWNiZDM2MjA5Zjg2ZmNkNGU1YTllNmU2YjA5MjkwYjNjNWEzMw==
 SHA512:
   metadata.gz: !binary |-
-    Njg2ZGY4ZjQxZWVhMmFhYjkxNDQ2NWJlYTM4ZmE1NDExZmIxYTJhNTRhYmQw
-    ZDUzZDFiY2ViMzRhNTk0MzkxZDI2NmZiOWE3NTM2NWM0ZWEyYTI5MGMxMGRh
-    MTc3MjcxNDVjNWY5OWNiYjY2OTEzNzA4ZGNjOWY5Nzg4MmUyYjI=
+    NmEyNTZjNDE2NWQ5ZjIyOTMyZTNjM2NiOGQ0MWMwMjBkMjFjYTdkZWViZDUx
+    ZGVjNzM1OWQ1YjFiNGZkNDVkYzUyYTlkOTZkODNlMDhhNjQyMjk4NTJlMDUx
+    YWM1ZGYzMTdiMTlhNThmNGYzMjU0OThlY2MzYzYwZjAwZjFjZWU=
   data.tar.gz: !binary |-
-    NGU0NDk0MWFkNTMzYjU0MTllZGNiOWFiMmRlZWVkY2EzM2EzMTQwZDM1MDFj
-    NTc2NjZmZWExMDU5ODhiZTI5ODVkMGJmNmQ2NjQ5Yjk1NGI1NWZmZTg1NzQy
-    MTQ1NzI1ZDllYjExZWU3NzZjNGVlZjY4YTRiY2U4Mzg4MGUwY2E=
+    ZjY3NTY2ZDMzYzAzMGRhNTU4MTM2YzEwZTg2OWFiZGY1MDU1ZGZjMzUwMWVi
+    MTMwNThmMTI1N2FlYWQ2OGNhZjI4ZmQ5MWYzZjNiYTMxMjEzYTk3YWE2NDQx
+    ZGNiOTNhN2JmOGUzOTRjODY1NGVhY2EyYzNjZDBjOTc4NzQ3ZTM=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = MonetDB CHANGELOG
 
+== Version 0.1.3 (October 8, 2014)
+
+* Corrected MonetDB#select_rows (was not fetching entire result set)
+
 == Version 0.1.2 (October 6, 2014)
 
 * Simplified MonetDB#select_rows gaining performance receiving the query result set

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    monetdb (0.1.2)
+    monetdb (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/monetdb/version.rb

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

data/lib/monetdb.rb

@@ -188,43 +188,49 @@ class MonetDB
 
     start = Time.now
     @connection.send(data.send(:format_query, qry))
-    result_set = @connection.receive.split("\n")
-    log :info, "\n  SQL (#{((Time.now - start) * 1000).round(1)}ms)  #{qry}"
+    response = @connection.receive.split("\n")
 
-    if (row = result_set[0]).chr == MSG_INFO
+    if (row = response[0]).chr == MSG_INFO
       raise QueryError, row
     end
 
-    record_set = result_set.select{|x| [MSG_SCHEMA_HEADER, MSG_QUERY].include? x[0]}.compact
-    data.send :receive_record_set, record_set.join("\n")
-
-    if data.instance_variable_get(:@action) == Q_TABLE
-      header = data.send :parse_header_table, data.instance_variable_get(:@header)
+    headers, rows = response.partition{|x| [MSG_SCHEMA_HEADER, MSG_QUERY].include? x[0]}
+    data.send :receive_record_set, headers.join("\n")
+    query_header = data.send :parse_header_query, headers.shift
+    table_header = data.send :parse_header_table, headers
+    rows = rows.join("\n")
+
+    row_count = rows.split("\t]\n").size
+    while row_count < query_header["rows"].to_i
+      received = @connection.receive
+      row_count += received.scan("\t]\n").size
+      rows << received
     end
+    rows = rows.split("\t]\n")
 
-    column_types = header["columns_type"]
-    types = header["columns_name"].collect{|x| column_types[x]}
-
-    result_set.collect do |x|
-      if x[0] == MSG_TUPLE
-        row, values = [], x[1..-2].split(",\t")
-        values.each_with_index do |value, index|
-          row << begin
-            unless value.strip == "NULL"
-              case types[index]
-              when "bigint", "int"
-                value.to_i
-              when "double"
-                value.to_f
-              else
-                value.strip.gsub(/(^"|"$|\\|\")/, "").force_encoding("UTF-8")
-              end
+    log :info, "\n  SQL (#{((Time.now - start) * 1000).round(1)}ms)  #{qry}"
+
+    column_types = table_header["columns_type"]
+    types = table_header["columns_name"].collect{|x| column_types[x]}
+
+    rows.collect do |row|
+      parsed, values = [], row.gsub(/^\[\s*/, "").split(",\t")
+      values.each_with_index do |value, index|
+        parsed << begin
+          unless value.strip == "NULL"
+            case types[index]
+            when "bigint", "int"
+              value.to_i
+            when "double"
+              value.to_f
+            else
+              value.strip.gsub(/(^"|"$|\\|\")/, "").force_encoding("UTF-8")
             end
           end
         end
-        row
       end
-    end.compact
+      parsed
+    end
   end
 
   # Returns whether a "connection" object exists.

data/test/unit/test_monetdb.rb

@@ -5,7 +5,7 @@ module Unit
 
     describe MonetDB do
       it "has the current version" do
-        version = File.read path("VERSION")
+        version = File.read(path("VERSION")).strip
         assert_equal version, MonetDB::VERSION
         assert File.read(path "CHANGELOG.rdoc").include?("Version #{version}")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monetdb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake