bigquery-client 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a86e09fec3bb6175a2d99264a10a139b742f14c
-  data.tar.gz: 475d160a52fbf704d02d34ceaaaaf689e6286ae0
+  metadata.gz: 62916ca2e9ee1f90227ea2f2e67c9cd4f26c316d
+  data.tar.gz: f763e852a5747075a16c6a33c6c9287d3ee8d577
 SHA512:
-  metadata.gz: 331ef756470a6586af5eb37dee614532cf1df20873fae4c12dff16207b2c087b17092771c26007137bdffac43dfc8556d550979286ab1b0be3087388109eb610
-  data.tar.gz: 960d58359bfd5a9687ca9a313be7a963f113fe2c948dde6f765e07199548ca93cda707332fc588ec9cc3748572ec1cafb748647495ee2ab0f12cd1ac4fcb8a13
+  metadata.gz: 383fd4cd1bfe5903d6689eafd06478ebd43441f2ddf61c24901e108c5e590c7f338122d59e3c95f01f1bafd57da8817efe794f8129af39b6190243a39b8f27fc
+  data.tar.gz: fe4db299be123fe3c5b7c7310a1d79d4bcd53456a98d8e780085b27cef6ba32b4c23bb46135b8fea04c4ebe5084464e880083a7ad740ed8cdfe5099afa5f3404

data/lib/bigquery-client/jobs.rb

@@ -3,10 +3,20 @@
 module BigQuery
   module Jobs
     def sql(query, options = {})
-      result = jobs_query(query, options)
-      names = result['schema']['fields'].map {|field| field['name'] }
-      types = result['schema']['fields'].map {|field| field['type'] }
-      records = (result['rows'] || []).map {|row| row['f'].map {|record| record['v'] } }
+      jobs_query_response = jobs_query(query, options)
+      names = jobs_query_response['schema']['fields'].map {|field| field['name'] }
+      types = jobs_query_response['schema']['fields'].map {|field| field['type'] }
+      records = extract_records(jobs_query_response)
+
+      page_token = jobs_query_response['pageToken']
+      job_id = jobs_query_response['jobReference']['jobId']
+      inherited_options = options.select {|k,v| [:maxResults, :timeoutMs].include?(k) }
+      while page_token
+        query_results_response = query_results(job_id, inherited_options.merge({ pageToken: page_token }))
+        records += extract_records(query_results_response)
+        page_token = query_results_response['pageToken']
+      end
+
       convert(records, types).map { |values| [names, values].transpose.to_h }
     end
 
@@ -52,6 +62,10 @@ module BigQuery
 
     private
 
+    def extract_records(response)
+      (response['rows'] || []).map {|row| row['f'].map {|record| record['v'] } }
+    end
+
     def convert(records, types)
       records.map do |values|
         values.map.with_index do |value, index|

data/lib/bigquery-client/version.rb

@@ -1,5 +1,5 @@
 module BigQuery
   class Client
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

data/test/test_jobs.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 class JobsTest < Test::Unit::TestCase
-  @@query = <<-"EOS"
+  @@normal_query = <<-"EOS"
     SELECT
       born_alive_alive, mother_residence_state, is_male
     FROM
@@ -23,8 +23,17 @@ class JobsTest < Test::Unit::TestCase
       0
   EOS
 
+  @@huge_result_query = <<-"EOS"
+    SELECT
+      title
+    FROM
+      publicdata:samples.wikipedia
+    LIMIT
+      1234567
+  EOS
+
   def test_sql
-    result = $client.sql(@@query)
+    result = $client.sql(@@normal_query)
     assert { result.size == 100 }
     assert { result.sample["born_alive_alive"].is_a? Fixnum }
     assert { result.sample["mother_residence_state"].is_a? String }
@@ -35,4 +44,9 @@ class JobsTest < Test::Unit::TestCase
     result = $client.sql(@@no_rows_query)
     assert { result == [] }
   end
+
+  def test_sql_pagination
+    record_size = $client.sql(@@huge_result_query, maxResults: 10000).size
+    assert { record_size == 1234567 }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigquery-client
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Tsukuru Tanimichi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client