Merge pull request #2 from leifg/fix_bug_large_queries

CSV parse issue on EC2 instance when using Executrix

Author: leifg

lib/executrix.rb

@@ -44,7 +44,6 @@ def query(sobject, query)
       batch_id = @connection.add_query(job_id, query)
       @connection.close_job job_id
       batch_reference = Executrix::Batch.new @connection, job_id, batch_id
-      batch_reference.init_result_id
       batch_reference.final_status
     end
 

lib/executrix/batch.rb

@@ -34,18 +34,17 @@ def status
       @connection.query_batch @job_id, @batch_id
     end
 
-    # only needed for query
-    def init_result_id
-      max_retries = 5
-      retry_count = 0
-      while @result_id.nil? && retry_count < max_retries
-        @result_id = @connection.query_batch_result_id(@job_id, @batch_id)[:result]
-        retry_count += 1
-      end
-    end
-
     def results
+      init_result_id
       @connection.query_batch_result_data(@job_id, @batch_id, @result_id)
     end
+
+    private
+    def init_result_id
+      result_raw = @connection.query_batch_result_id(@job_id, @batch_id)
+      if result_raw
+        @result_id = result_raw[:result]
+      end
+    end
   end
 end

lib/executrix/version.rb

@@ -1,3 +1,3 @@
 module Executrix
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

spec/lib/executrix_spec.rb

@@ -56,7 +56,6 @@
       empty_connection.should_receive(:create_job).ordered
       empty_connection.should_receive(:add_query).ordered
       empty_connection.should_receive(:close_job).ordered
-      empty_batch.should_receive(:init_result_id).ordered
       empty_batch.should_receive(:final_status).ordered
       s.query(sobject_input, query_input)
     end