google-cloud-bigquery 1.16.0 → 1.17.0

data/lib/google/cloud/bigquery/query_job.rb

@@ -205,11 +205,8 @@ module Google
         #   end
         #
         def query_plan
-          return nil unless @gapi.statistics.query &&
-                            @gapi.statistics.query.query_plan
-          Array(@gapi.statistics.query.query_plan).map do |stage|
-            Stage.from_gapi stage
-          end
+          return nil unless @gapi&.statistics&.query&.query_plan
+          Array(@gapi.statistics.query.query_plan).map { |stage| Stage.from_gapi stage }
         end
 
         ##
@@ -261,8 +258,8 @@ module Google
         #   query_job.ddl? #=> true
         #
         def ddl?
-          %w[CREATE_MODEL CREATE_TABLE CREATE_TABLE_AS_SELECT CREATE_VIEW \
-             DROP_MODEL DROP_TABLE DROP_VIEW].include? statement_type
+          ["CREATE_MODEL", "CREATE_TABLE", "CREATE_TABLE_AS_SELECT", "CREATE_VIEW", "\n", "DROP_MODEL", "DROP_TABLE",
+           "DROP_VIEW"].include? statement_type
         end
 
         ##
@@ -285,7 +282,7 @@ module Google
         #   query_job.dml? #=> true
         #
         def dml?
-          %w[INSERT UPDATE MERGE DELETE].include? statement_type
+          ["INSERT", "UPDATE", "MERGE", "DELETE"].include? statement_type
         end
 
         ##
@@ -383,9 +380,7 @@ module Google
         def udfs
           udfs_gapi = @gapi.configuration.query.user_defined_function_resources
           return nil unless udfs_gapi
-          Array(udfs_gapi).map do |udf|
-            udf.inline_code || udf.resource_uri
-          end
+          Array(udfs_gapi).map { |udf| udf.inline_code || udf.resource_uri }
         end
 
         ##
@@ -396,9 +391,7 @@ module Google
         #
         # @!group Attributes
         def encryption
-          EncryptionConfiguration.from_gapi(
-            @gapi.configuration.query.destination_encryption_configuration
-          )
+          EncryptionConfiguration.from_gapi @gapi.configuration.query.destination_encryption_configuration
         end
 
         ###
@@ -535,8 +528,7 @@ module Google
 
           ensure_service!
           loop do
-            query_results_gapi = service.job_query_results \
-              job_id, location: location, max: 0
+            query_results_gapi = service.job_query_results job_id, location: location, max: 0
             if query_results_gapi.job_complete
               @destination_schema_gapi = query_results_gapi.schema
               break
@@ -573,9 +565,7 @@ module Google
         #
         def data token: nil, max: nil, start: nil
           return nil unless done?
-          if dryrun?
-            return Data.from_gapi_json({ rows: [] }, nil, @gapi, service)
-          end
+          return Data.from_gapi_json({ rows: [] }, nil, @gapi, service) if dryrun?
           if ddl? || dml?
             data_hash = { totalRows: nil, rows: [] }
             return Data.from_gapi_json data_hash, nil, @gapi, service
@@ -583,10 +573,7 @@ module Google
           ensure_schema!
 
           options = { token: token, max: max, start: start }
-          data_hash = service.list_tabledata \
-            destination_table_dataset_id,
-            destination_table_table_id,
-            options
+          data_hash = service.list_tabledata destination_table_dataset_id, destination_table_table_id, options
           Data.from_gapi_json data_hash, destination_table_gapi, @gapi, service
         end
         alias query_results data
@@ -631,8 +618,7 @@ module Google
             updater.dryrun = options[:dryrun]
             updater.maximum_bytes_billed = options[:maximum_bytes_billed]
             updater.labels = options[:labels] if options[:labels]
-            updater.legacy_sql = Convert.resolve_legacy_sql(
-              options[:standard_sql], options[:legacy_sql])
+            updater.legacy_sql = Convert.resolve_legacy_sql options[:standard_sql], options[:legacy_sql]
             updater.external = options[:external] if options[:external]
             updater.priority = options[:priority]
             updater.cache = options[:cache]
@@ -731,8 +717,7 @@ module Google
           #
           # @!group Attributes
           def dataset= value
-            @gapi.configuration.query.default_dataset =
-              @service.dataset_ref_from value
+            @gapi.configuration.query.default_dataset = @service.dataset_ref_from value
           end
 
           ##
@@ -752,17 +737,13 @@ module Google
             when Array then
               @gapi.configuration.query.use_legacy_sql = false
               @gapi.configuration.query.parameter_mode = "POSITIONAL"
-              @gapi.configuration.query.query_parameters = params.map do |param|
-                Convert.to_query_param param
-              end
+              @gapi.configuration.query.query_parameters = params.map { |param| Convert.to_query_param param }
             when Hash then
               @gapi.configuration.query.use_legacy_sql = false
               @gapi.configuration.query.parameter_mode = "NAMED"
               @gapi.configuration.query.query_parameters =
                 params.map do |name, param|
-                  Convert.to_query_param(param).tap do |named_param|
-                    named_param.name = String name
-                  end
+                  Convert.to_query_param(param).tap { |named_param| named_param.name = String name }
                 end
             else
               raise "Query parameters must be an Array or a Hash."
@@ -783,8 +764,7 @@ module Google
           #
           # @!group Attributes
           def create= value
-            @gapi.configuration.query.create_disposition =
-              Convert.create_disposition value
+            @gapi.configuration.query.create_disposition = Convert.create_disposition value
           end
 
           ##
@@ -802,8 +782,7 @@ module Google
           #
           # @!group Attributes
           def write= value
-            @gapi.configuration.query.write_disposition =
-              Convert.write_disposition value
+            @gapi.configuration.query.write_disposition = Convert.write_disposition value
           end
 
           ##
@@ -905,9 +884,7 @@ module Google
           # @!group Attributes
           #
           def external= value
-            external_table_pairs = value.map do |name, obj|
-              [String(name), obj.to_gapi]
-            end
+            external_table_pairs = value.map { |name, obj| [String(name), obj.to_gapi] }
             external_table_hash = Hash[external_table_pairs]
             @gapi.configuration.query.table_definitions = external_table_hash
           end
@@ -925,8 +902,7 @@ module Google
           #
           # @!group Attributes
           def udfs= value
-            @gapi.configuration.query.user_defined_function_resources =
-              udfs_gapi_from value
+            @gapi.configuration.query.user_defined_function_resources = udfs_gapi_from value
           end
 
           ##
@@ -950,9 +926,7 @@ module Google
           #
           # @!group Attributes
           def encryption= val
-            @gapi.configuration.query.update!(
-              destination_encryption_configuration: val.to_gapi
-            )
+            @gapi.configuration.query.update! destination_encryption_configuration: val.to_gapi
           end
 
           ##
@@ -989,8 +963,7 @@ module Google
           # @!group Attributes
           #
           def time_partitioning_type= type
-            @gapi.configuration.query.time_partitioning ||= \
-              Google::Apis::BigqueryV2::TimePartitioning.new
+            @gapi.configuration.query.time_partitioning ||= Google::Apis::BigqueryV2::TimePartitioning.new
             @gapi.configuration.query.time_partitioning.update! type: type
           end
 
@@ -1036,8 +1009,7 @@ module Google
           # @!group Attributes
           #
           def time_partitioning_field= field
-            @gapi.configuration.query.time_partitioning ||= \
-              Google::Apis::BigqueryV2::TimePartitioning.new
+            @gapi.configuration.query.time_partitioning ||= Google::Apis::BigqueryV2::TimePartitioning.new
             @gapi.configuration.query.time_partitioning.update! field: field
           end
 
@@ -1076,10 +1048,8 @@ module Google
           # @!group Attributes
           #
           def time_partitioning_expiration= expiration
-            @gapi.configuration.query.time_partitioning ||= \
-              Google::Apis::BigqueryV2::TimePartitioning.new
-            @gapi.configuration.query.time_partitioning.update! \
-              expiration_ms: expiration * 1000
+            @gapi.configuration.query.time_partitioning ||= Google::Apis::BigqueryV2::TimePartitioning.new
+            @gapi.configuration.query.time_partitioning.update! expiration_ms: expiration * 1000
           end
 
           ##
@@ -1094,10 +1064,8 @@ module Google
           # @!group Attributes
           #
           def time_partitioning_require_filter= val
-            @gapi.configuration.query.time_partitioning ||= \
-              Google::Apis::BigqueryV2::TimePartitioning.new
-            @gapi.configuration.query.time_partitioning.update! \
-              require_partition_filter: val
+            @gapi.configuration.query.time_partitioning ||= Google::Apis::BigqueryV2::TimePartitioning.new
+            @gapi.configuration.query.time_partitioning.update! require_partition_filter: val
           end
 
           ##
@@ -1143,8 +1111,7 @@ module Google
           # @!group Attributes
           #
           def clustering_fields= fields
-            @gapi.configuration.query.clustering ||= \
-              Google::Apis::BigqueryV2::Clustering.new
+            @gapi.configuration.query.clustering ||= Google::Apis::BigqueryV2::Clustering.new
             @gapi.configuration.query.clustering.fields = fields
           end
 
@@ -1170,14 +1137,12 @@ module Google
           end
 
           def priority_value str
-            { "batch"       => "BATCH",
-              "interactive" => "INTERACTIVE" }[str.to_s.downcase]
+            { "batch" => "BATCH", "interactive" => "INTERACTIVE" }[str.to_s.downcase]
           end
 
           def udfs_gapi_from array_or_str
             Array(array_or_str).map do |uri_or_code|
-              resource =
-                Google::Apis::BigqueryV2::UserDefinedFunctionResource.new
+              resource = Google::Apis::BigqueryV2::UserDefinedFunctionResource.new
               if uri_or_code.start_with? "gs://"
                 resource.resource_uri = uri_or_code
               else
@@ -1237,17 +1202,15 @@ module Google
         #   end
         #
         class Stage
-          attr_reader :compute_ratio_avg, :compute_ratio_max, :id, :name,
-                      :read_ratio_avg, :read_ratio_max, :records_read,
-                      :records_written, :status, :steps, :wait_ratio_avg,
-                      :wait_ratio_max, :write_ratio_avg, :write_ratio_max
+          attr_reader :compute_ratio_avg, :compute_ratio_max, :id, :name, :read_ratio_avg, :read_ratio_max,
+                      :records_read, :records_written, :status, :steps, :wait_ratio_avg, :wait_ratio_max,
+                      :write_ratio_avg, :write_ratio_max
 
           ##
           # @private Creates a new Stage instance.
-          def initialize compute_ratio_avg, compute_ratio_max, id, name,
-                         read_ratio_avg, read_ratio_max, records_read,
-                         records_written, status, steps, wait_ratio_avg,
-                         wait_ratio_max, write_ratio_avg, write_ratio_max
+          def initialize compute_ratio_avg, compute_ratio_max, id, name, read_ratio_avg, read_ratio_max, records_read,
+                         records_written, status, steps, wait_ratio_avg, wait_ratio_max, write_ratio_avg,
+                         write_ratio_max
             @compute_ratio_avg = compute_ratio_avg
             @compute_ratio_max = compute_ratio_max
             @id                = id
@@ -1268,11 +1231,9 @@ module Google
           # @private New Stage from a statistics.query.queryPlan element.
           def self.from_gapi gapi
             steps = Array(gapi.steps).map { |g| Step.from_gapi g }
-            new gapi.compute_ratio_avg, gapi.compute_ratio_max, gapi.id,
-                gapi.name, gapi.read_ratio_avg, gapi.read_ratio_max,
-                gapi.records_read, gapi.records_written, gapi.status, steps,
-                gapi.wait_ratio_avg, gapi.wait_ratio_max, gapi.write_ratio_avg,
-                gapi.write_ratio_max
+            new gapi.compute_ratio_avg, gapi.compute_ratio_max, gapi.id, gapi.name, gapi.read_ratio_avg,
+                gapi.read_ratio_max, gapi.records_read, gapi.records_written, gapi.status, steps, gapi.wait_ratio_avg,
+                gapi.wait_ratio_max, gapi.write_ratio_avg, gapi.write_ratio_max
           end
         end
 
@@ -1327,8 +1288,7 @@ module Google
         def ensure_schema!
           return unless destination_schema.nil?
 
-          query_results_gapi = service.job_query_results \
-            job_id, location: location, max: 0
+          query_results_gapi = service.job_query_results job_id, location: location, max: 0
           # raise "unable to retrieve schema" if query_results_gapi.schema.nil?
           @destination_schema_gapi = query_results_gapi.schema
         end
@@ -1346,9 +1306,10 @@ module Google
         end
 
         def destination_table_gapi
-          Google::Apis::BigqueryV2::Table.new \
+          Google::Apis::BigqueryV2::Table.new(
             table_reference: @gapi.configuration.query.destination_table,
             schema:          destination_schema
+          )
         end
       end
     end

data/lib/google/cloud/bigquery/schema.rb

@@ -461,8 +461,7 @@ module Google
           # TODO: do we need to raise if no block was given?
           raise ArgumentError, "a block is required" unless block_given?
 
-          nested_field = add_field name, :record, description: description,
-                                                  mode:        mode
+          nested_field = add_field name, :record, description: description, mode: mode
           yield nested_field
           nested_field
         end
@@ -528,18 +527,14 @@ module Google
 
         def verify_type type
           type = type.to_s.upcase
-          unless Field::TYPES.include? type
-            raise ArgumentError, "Type '#{type}' not found"
-          end
+          raise ArgumentError, "Type '#{type}' not found" unless Field::TYPES.include? type
           type
         end
 
         def verify_mode mode
           mode = :nullable if mode.nil?
           mode = mode.to_s.upcase
-          unless Field::MODES.include? mode
-            raise ArgumentError "Unable to determine mode for '#{mode}'"
-          end
+          raise ArgumentError "Unable to determine mode for '#{mode}'" unless Field::MODES.include? mode
           mode
         end
       end

data/lib/google/cloud/bigquery/schema/field.rb

@@ -37,11 +37,11 @@ module Google
         #
         class Field
           # @private
-          MODES = %w[NULLABLE REQUIRED REPEATED].freeze
+          MODES = ["NULLABLE", "REQUIRED", "REPEATED"].freeze
 
           # @private
-          TYPES = %w[STRING INTEGER INT64 FLOAT FLOAT64 NUMERIC BOOLEAN BOOL
-                     BYTES TIMESTAMP TIME DATETIME DATE RECORD STRUCT].freeze
+          TYPES = ["STRING", "INTEGER", "INT64", "FLOAT", "FLOAT64", "NUMERIC", "BOOLEAN", "BOOL", "BYTES", "TIMESTAMP",
+                   "TIME", "DATETIME", "DATE", "RECORD", "STRUCT"].freeze
 
           ##
           # The name of the field.
@@ -548,8 +548,7 @@ module Google
             # TODO: do we need to raise if no block was given?
             raise ArgumentError, "a block is required" unless block_given?
 
-            nested_field = add_field name, :record, description: description,
-                                                    mode:        mode
+            nested_field = add_field name, :record, description: description, mode: mode
             yield nested_field
             nested_field
           end
@@ -621,18 +620,14 @@ module Google
 
           def verify_type type
             type = type.to_s.upcase
-            unless TYPES.include? type
-              raise ArgumentError, "Type '#{type}' not found"
-            end
+            raise ArgumentError, "Type '#{type}' not found" unless TYPES.include? type
             type
           end
 
           def verify_mode mode
             mode = :nullable if mode.nil?
             mode = mode.to_s.upcase
-            unless MODES.include? mode
-              raise ArgumentError "Unable to determine mode for '#{mode}'"
-            end
+            raise ArgumentError "Unable to determine mode for '#{mode}'" unless MODES.include? mode
             mode
           end
         end

data/lib/google/cloud/bigquery/service.rb

@@ -43,8 +43,7 @@ module Google
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials,
-                       retries: nil, timeout: nil, host: nil
+        def initialize project, credentials, retries: nil, timeout: nil, host: nil
           @project = project
           @credentials = credentials
           @retries = retries
@@ -57,8 +56,7 @@ module Google
           @service ||= begin
             service = API::BigqueryService.new
             service.client_options.application_name    = "gcloud-ruby"
-            service.client_options.application_version = \
-              Google::Cloud::Bigquery::VERSION
+            service.client_options.application_version = Google::Cloud::Bigquery::VERSION
             service.client_options.open_timeout_sec = timeout
             service.client_options.read_timeout_sec = timeout
             service.client_options.send_timeout_sec = timeout
@@ -116,8 +114,7 @@ module Google
             patch_with_backoff = true
           end
           execute backoff: patch_with_backoff do
-            service.patch_dataset @project, dataset_id, patched_dataset_gapi,
-                                  options: options
+            service.patch_dataset @project, dataset_id, patched_dataset_gapi, options: options
           end
         end
 
@@ -139,9 +136,7 @@ module Google
         def list_tables dataset_id, options = {}
           # The list operation is considered idempotent
           execute backoff: true do
-            service.list_tables @project, dataset_id,
-                                max_results: options[:max],
-                                page_token:  options[:token]
+            service.list_tables @project, dataset_id, max_results: options[:max], page_token: options[:token]
           end
         end
 
@@ -182,8 +177,7 @@ module Google
             patch_with_backoff = true
           end
           execute backoff: patch_with_backoff do
-            service.patch_table @project, dataset_id, table_id,
-                                patched_table_gapi, options: options
+            service.patch_table @project, dataset_id, table_id, patched_table_gapi, options: options
           end
         end
 
@@ -214,9 +208,7 @@ module Google
           insert_tabledata_json_rows dataset_id, table_id, json_rows, options
         end
 
-        def insert_tabledata_json_rows dataset_id, table_id, json_rows,
-                                       options = {}
-
+        def insert_tabledata_json_rows dataset_id, table_id, json_rows, options = {}
           rows_and_ids = Array(json_rows).zip Array(options[:insert_ids])
           insert_rows = rows_and_ids.map do |json_row, insert_id|
             insert_id ||= SecureRandom.uuid
@@ -248,10 +240,7 @@ module Google
           options = { skip_deserialization: true }
           # The list operation is considered idempotent
           execute backoff: true do
-            json_txt = service.list_models @project, dataset_id,
-                                           max_results: max,
-                                           page_token:  token,
-                                           options:     options
+            json_txt = service.list_models @project, dataset_id, max_results: max, page_token: token, options: options
             JSON.parse json_txt, symbolize_names: true
           end
         end
@@ -263,8 +252,7 @@ module Google
         def get_model dataset_id, model_id
           # The get operation is considered idempotent
           execute backoff: true do
-            json_txt = service.get_model @project, dataset_id, model_id,
-                                         options: { skip_deserialization: true }
+            json_txt = service.get_model @project, dataset_id, model_id, options: { skip_deserialization: true }
             JSON.parse json_txt, symbolize_names: true
           end
         end
@@ -281,9 +269,7 @@ module Google
             patch_with_backoff = true
           end
           execute backoff: patch_with_backoff do
-            json_txt = service.patch_model @project, dataset_id, model_id,
-                                           patched_model_gapi,
-                                           options: options
+            json_txt = service.patch_model @project, dataset_id, model_id, patched_model_gapi, options: options
             JSON.parse json_txt, symbolize_names: true
           end
         end
@@ -303,12 +289,9 @@ module Google
           min_creation_time = Convert.time_to_millis options[:min_created_at]
           max_creation_time = Convert.time_to_millis options[:max_created_at]
           execute backoff: true do
-            service.list_jobs \
-              @project, all_users: options[:all], max_results: options[:max],
-                        page_token: options[:token], projection: "full",
-                        state_filter: options[:filter],
-                        min_creation_time: min_creation_time,
-                        max_creation_time: max_creation_time
+            service.list_jobs @project, all_users: options[:all], max_results: options[:max],
+                                        page_token: options[:token], projection: "full", state_filter: options[:filter],
+                                        min_creation_time: min_creation_time, max_creation_time: max_creation_time
           end
         end
 
@@ -331,10 +314,7 @@ module Google
         end
 
         def insert_job config, location: nil
-          job_object = API::Job.new(
-            job_reference: job_ref_from(nil, nil, location: location),
-            configuration: config
-          )
+          job_object = API::Job.new job_reference: job_ref_from(nil, nil, location: location), configuration: config
           # Jobs have generated id, so this operation is considered idempotent
           execute backoff: true do
             service.insert_job @project, job_object
@@ -352,13 +332,12 @@ module Google
         def job_query_results job_id, options = {}
           # The get operation is considered idempotent
           execute backoff: true do
-            service.get_job_query_results \
-              @project, job_id,
-              location:    options.delete(:location),
-              max_results: options.delete(:max),
-              page_token:  options.delete(:token),
-              start_index: options.delete(:start),
-              timeout_ms:  options.delete(:timeout)
+            service.get_job_query_results @project, job_id,
+                                          location:    options.delete(:location),
+                                          max_results: options.delete(:max),
+                                          page_token:  options.delete(:token),
+                                          start_index: options.delete(:start),
+                                          timeout_ms:  options.delete(:timeout)
           end
         end
 
@@ -382,10 +361,7 @@ module Google
 
         def load_table_file file, load_job_gapi
           execute backoff: true do
-            service.insert_job \
-              @project,
-              load_job_gapi,
-              upload_source: file, content_type: mime_type_for(file)
+            service.insert_job @project, load_job_gapi, upload_source: file, content_type: mime_type_for(file)
           end
         end
 
@@ -409,9 +385,7 @@ module Google
         def self.table_ref_from_s str, default_ref: {}
           str = str.to_s
           m = /\A(((?<prj>\S*)(:|\.))?(?<dts>\S*)\.)?(?<tbl>\S*)\z/.match str
-          unless m
-            raise ArgumentError, "unable to identify table from #{str.inspect}"
-          end
+          raise ArgumentError, "unable to identify table from #{str.inspect}" unless m
           str_table_ref_hash = {
             project_id: m["prj"],
             dataset_id: m["dts"],
@@ -424,10 +398,8 @@ module Google
         end
 
         def self.validate_table_ref table_ref
-          %i[project_id dataset_id table_id].each do |f|
-            if table_ref.send(f).nil?
-              raise ArgumentError, "TableReference is missing #{f}"
-            end
+          [:project_id, :dataset_id, :table_id].each do |f|
+            raise ArgumentError, "TableReference is missing #{f}" if table_ref.send(f).nil?
           end
         end
 
@@ -435,8 +407,7 @@ module Google
         # Lists all projects to which you have been granted any project role.
         def list_projects options = {}
           execute backoff: true do
-            service.list_projects max_results: options[:max],
-                                  page_token:  options[:token]
+            service.list_projects max_results: options[:max], page_token: options[:token]
           end
         end
 
@@ -446,10 +417,7 @@ module Google
         def job_ref_from job_id, prefix, location: nil
           prefix ||= "job_"
           job_id ||= "#{prefix}#{generate_id}"
-          job_ref = API::JobReference.new(
-            project_id: @project,
-            job_id:     job_id
-          )
+          job_ref = API::JobReference.new project_id: @project, job_id: job_id
           # BigQuery does not allow nil location, but missing is ok.
           job_ref.location = location if location
           job_ref
@@ -507,7 +475,7 @@ module Google
             attr_accessor :backoff
           end
           self.retries = 5
-          self.reasons = %w[rateLimitExceeded backendError]
+          self.reasons = ["rateLimitExceeded", "backendError"]
           self.backoff = lambda do |retries|
             # Max delay is 32 seconds
             # See "Back-off Requirements" here: