embulk-input-bigquery 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6d1843ddd992acd60c5fae63ca9e4708dfb695aa
-  data.tar.gz: 90a6c3aa9442c569537badeda3431d506aeb351d
+SHA256:
+  metadata.gz: efd02ce4fc80435c9c8201987b371039e9b95bd0c3cbcffb36e57abb7b7ebb84
+  data.tar.gz: 4b5569cb00d85d942294f394288458cec16717f730044d5abe302ac280041ddf
 SHA512:
-  metadata.gz: eb4b870643c699b2046d9a5274dea51d243387f777ca7aa1817d0702728633f4aa8b8446ec36180dee8ee043a204209060cbaba8aba76ff5cb68f1f58bac606e
-  data.tar.gz: 84c0b47cca1b3e396d4dad22f4f11e668e00b7a5107b950bee4857b68f9a4df24f6353d1103be4e55fc3223c81025a9f5a147f9583076cf65cb36ba0f7217083
+  metadata.gz: f196cd00abd736c0ed95d9619af52035256e75685fb4e9c519dc3eb99aa566e61e1bc6096f01e701bbe74afa4618efbdecb3d4042745dce16abdd34990a3d6e2
+  data.tar.gz: 89acc43d7c8f4add08b92235302936962ff55feb3c6dc50484b2866d97eaeac0b0b31751149761089657e2a079ae1330437b7e98c75aa0c1b0128522ded7fb9f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.6 (2018/05/16)
+
+* Support location option to allow to use location other than the US or EU multi-region.
+
 # 0.0.5 (2018/05/14)
 
 * Allow google-cloud-bigquery version between v0.24 and v1.5.0

data/README.md

@@ -22,6 +22,7 @@ This plugin uses the gem [`google-cloud(Google Cloud Client Library for Ruby)`](
 | cache                                | boolean     | optional   | true                     | Whether to look for the result in the query cache. The query cache is a best-effort cache that will be flushed whenever tables in the query are modified. The default value is true. For more information, see [query caching](https://developers.google.com/bigquery/querying-data). |
 | standard\_sql                        | boolean     | optional   | true                     | Specifies whether to use BigQuery's [standard SQL](https://cloud.google.com/bigquery/docs/reference/standard-sql/) dialect for this query. If set to true, the query will use standard SQL rather than the [legacy SQL](https://cloud.google.com/bigquery/docs/reference/legacy-sql) dialect. When set to true, the values of `large_results` and `flatten` are ignored; the query will be run as if `large_results` is true and `flatten` is false. Optional. The default value is true. |
 | legacy\_sql                          | boolean     | optional   | false                    | legacy_sql Specifies whether to use BigQuery's [legacy SQL](https://cloud.google.com/bigquery/docs/reference/legacy-sql) dialect for this query. If set to false, the query will use BigQuery's [standard SQL](https://cloud.google.com/bigquery/docs/reference/standard-sql/) When set to false, the values of `large_results` and `flatten` are ignored; the query will be run as if `large_results` is true and `flatten` is false. Optional. The default value is false. |
+| location                             | string      | optional   | `null`                   | If your data is in a location other than the US or EU multi-region, you must specify the location. See also [Dataset Locations | BigQuery | Google Cloud](https://cloud.google.com/bigquery/docs/dataset-locations) |
 
 ## Example
 
@@ -35,6 +36,9 @@ in:
     - {name: price, type: long}
     - {name: category_id, type: string}
   max: 2000
+
+  # # If your data is in a location other than the US or EU multi-region, you must specify the location.
+  # location: asia-northeast1
 out:
   type: stdout
 ```

data/lib/embulk/input/bigquery.rb

@@ -43,7 +43,8 @@ module Embulk
             max: config[:max],
             cache: config[:cache],
             standard_sql: config[:standard_sql],
-            legacy_sql: config[:legacy_sql]
+            legacy_sql: config[:legacy_sql],
+            location: config[:location],
           }
         }
 
@@ -74,9 +75,17 @@ module Embulk
         option = keys_to_sym(@task[:option])
 
         rows = if @task[:job_id].nil?
-                 bq.query(@task[:sql], **option)
+                 query_option = option.dup
+                 query_option.delete(:location)
+
+                 bq.query(@task[:sql], **query_option) do |job_updater|
+                   job_updater.location = option[:location] if option[:location]
+                 end
                else
-                 bq.job(@task[:job_id]).query_results(max: option[:max])
+                 job_option = {}
+                 job_option[:location] = option[:location] if option[:location]
+
+                 bq.job(@task[:job_id], **job_option).query_results(max: option[:max])
                end
 
         @task[:columns] = values_to_sym(@task[:columns], 'name')
@@ -99,9 +108,12 @@ module Embulk
       def self.determine_columns_by_query_results(sql, option, bigquery_client)
         Embulk.logger.info 'determine columns using the getQueryResults API instead of the config.yml'
 
-        filtered_option = option.dup
-        filtered_option.delete(:max)
-        job = bigquery_client.query_job(sql, **filtered_option)
+        query_option = option.dup
+        query_option.delete(:max)
+        query_option.delete(:location)
+        job = bigquery_client.query_job(sql, **query_option) do |query|
+          query.location = option[:location] if option[:location]
+        end
 
         Embulk.logger.info 'waiting for the query job to complete to get schema from query results'
         job.wait_until_done!

data/lib/embulk/input/bigquery/version.rb

@@ -1,7 +1,7 @@
 module Embulk
   module Input
     module Bigquery
-      VERSION = '0.0.5'.freeze
+      VERSION = '0.0.6'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-bigquery
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - potato2003
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-bigquery
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Embulk input plugin from bigquery.