google-cloud-bigquery 1.16.0 → 1.17.0

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

@@ -366,9 +366,7 @@ module Google
           return nil if reference?
           ensure_full_data!
           return nil if @gapi.default_encryption_configuration.nil?
-          EncryptionConfiguration.from_gapi(
-            @gapi.default_encryption_configuration
-          ).freeze
+          EncryptionConfiguration.from_gapi(@gapi.default_encryption_configuration).freeze
         end
 
         ##
@@ -690,9 +688,7 @@ module Google
         #
         def table table_id, skip_lookup: nil
           ensure_service!
-          if skip_lookup
-            return Table.new_reference project_id, dataset_id, table_id, service
-          end
+          return Table.new_reference project_id, dataset_id, table_id, service if skip_lookup
           gapi = service.get_table dataset_id, table_id
           Table.from_gapi gapi, service
         rescue Google::Cloud::NotFoundError
@@ -774,9 +770,7 @@ module Google
         #
         def model model_id, skip_lookup: nil
           ensure_service!
-          if skip_lookup
-            return Model.new_reference project_id, dataset_id, model_id, service
-          end
+          return Model.new_reference project_id, dataset_id, model_id, service if skip_lookup
           gapi = service.get_model dataset_id, model_id
           Model.from_gapi_json gapi, service
         rescue Google::Cloud::NotFoundError
@@ -1083,20 +1077,15 @@ module Google
         #
         # @!group Data
         #
-        def query_job query, params: nil, external: nil,
-                      priority: "INTERACTIVE", cache: true, table: nil,
-                      create: nil, write: nil, dryrun: nil, standard_sql: nil,
-                      legacy_sql: nil, large_results: nil, flatten: nil,
-                      maximum_billing_tier: nil, maximum_bytes_billed: nil,
-                      job_id: nil, prefix: nil, labels: nil, udfs: nil
+        def query_job query, params: nil, external: nil, priority: "INTERACTIVE", cache: true, table: nil, create: nil,
+                      write: nil, dryrun: nil, standard_sql: nil, legacy_sql: nil, large_results: nil, flatten: nil,
+                      maximum_billing_tier: nil, maximum_bytes_billed: nil, job_id: nil, prefix: nil, labels: nil,
+                      udfs: nil
           ensure_service!
-          options = { priority: priority, cache: cache, table: table,
-                      create: create, write: write, dryrun: dryrun,
-                      large_results: large_results, flatten: flatten,
-                      legacy_sql: legacy_sql, standard_sql: standard_sql,
-                      maximum_billing_tier: maximum_billing_tier,
-                      maximum_bytes_billed: maximum_bytes_billed,
-                      job_id: job_id, prefix: prefix, params: params,
+          options = { priority: priority, cache: cache, table: table, create: create, write: write, dryrun: dryrun,
+                      large_results: large_results, flatten: flatten, legacy_sql: legacy_sql,
+                      standard_sql: standard_sql, maximum_billing_tier: maximum_billing_tier,
+                      maximum_bytes_billed: maximum_bytes_billed, job_id: job_id, prefix: prefix, params: params,
                       external: external, labels: labels, udfs: udfs }
 
           updater = QueryJob::Updater.from_options service, query, options
@@ -1293,10 +1282,8 @@ module Google
         #
         # @!group Data
         #
-        def query query, params: nil, external: nil, max: nil, cache: true,
-                  standard_sql: nil, legacy_sql: nil, &block
-          job = query_job query, params: params, external: external,
-                                 cache: cache, standard_sql: standard_sql,
+        def query query, params: nil, external: nil, max: nil, cache: true, standard_sql: nil, legacy_sql: nil, &block
+          job = query_job query, params: params, external: external, cache: cache, standard_sql: standard_sql,
                                  legacy_sql: legacy_sql, &block
           job.wait_until_done!
           ensure_job_succeeded! job
@@ -1593,29 +1580,19 @@ module Google
         #
         # @!group Data
         #
-        def load_job table_id, files, format: nil, create: nil, write: nil,
-                     projection_fields: nil, jagged_rows: nil,
-                     quoted_newlines: nil, encoding: nil, delimiter: nil,
-                     ignore_unknown: nil, max_bad_records: nil, quote: nil,
-                     skip_leading: nil, schema: nil, job_id: nil, prefix: nil,
-                     labels: nil, autodetect: nil, null_marker: nil, dryrun: nil
+        def load_job table_id, files, format: nil, create: nil, write: nil, projection_fields: nil, jagged_rows: nil,
+                     quoted_newlines: nil, encoding: nil, delimiter: nil, ignore_unknown: nil, max_bad_records: nil,
+                     quote: nil, skip_leading: nil, schema: nil, job_id: nil, prefix: nil, labels: nil, autodetect: nil,
+                     null_marker: nil, dryrun: nil
           ensure_service!
 
           updater = load_job_updater table_id,
-                                     format: format, create: create,
-                                     write: write,
-                                     projection_fields: projection_fields,
-                                     jagged_rows: jagged_rows,
-                                     quoted_newlines: quoted_newlines,
-                                     encoding: encoding,
-                                     delimiter: delimiter,
-                                     ignore_unknown: ignore_unknown,
-                                     max_bad_records: max_bad_records,
-                                     quote: quote, skip_leading: skip_leading,
-                                     dryrun: dryrun, schema: schema,
-                                     job_id: job_id, prefix: prefix,
-                                     labels: labels, autodetect: autodetect,
-                                     null_marker: null_marker
+                                     format: format, create: create, write: write, projection_fields: projection_fields,
+                                     jagged_rows: jagged_rows, quoted_newlines: quoted_newlines, encoding: encoding,
+                                     delimiter: delimiter, ignore_unknown: ignore_unknown,
+                                     max_bad_records: max_bad_records, quote: quote, skip_leading: skip_leading,
+                                     dryrun: dryrun, schema: schema, job_id: job_id, prefix: prefix, labels: labels,
+                                     autodetect: autodetect, null_marker: null_marker
 
           yield updater if block_given?
 
@@ -1831,21 +1808,14 @@ module Google
         #
         # @!group Data
         #
-        def load table_id, files, format: nil, create: nil, write: nil,
-                 projection_fields: nil, jagged_rows: nil, quoted_newlines: nil,
-                 encoding: nil, delimiter: nil, ignore_unknown: nil,
-                 max_bad_records: nil, quote: nil, skip_leading: nil,
-                 schema: nil, autodetect: nil, null_marker: nil, &block
+        def load table_id, files, format: nil, create: nil, write: nil, projection_fields: nil, jagged_rows: nil,
+                 quoted_newlines: nil, encoding: nil, delimiter: nil, ignore_unknown: nil, max_bad_records: nil,
+                 quote: nil, skip_leading: nil, schema: nil, autodetect: nil, null_marker: nil, &block
           job = load_job table_id, files,
-                         format: format, create: create, write: write,
-                         projection_fields: projection_fields,
-                         jagged_rows: jagged_rows,
-                         quoted_newlines: quoted_newlines,
-                         encoding: encoding, delimiter: delimiter,
-                         ignore_unknown: ignore_unknown,
-                         max_bad_records: max_bad_records,
-                         quote: quote, skip_leading: skip_leading,
-                         schema: schema, autodetect: autodetect,
+                         format: format, create: create, write: write, projection_fields: projection_fields,
+                         jagged_rows: jagged_rows, quoted_newlines: quoted_newlines, encoding: encoding,
+                         delimiter: delimiter, ignore_unknown: ignore_unknown, max_bad_records: max_bad_records,
+                         quote: quote, skip_leading: skip_leading, schema: schema, autodetect: autodetect,
                          null_marker: null_marker, &block
 
           job.wait_until_done!
@@ -2010,10 +1980,8 @@ module Google
         def self.new_reference project_id, dataset_id, service
           raise ArgumentError, "dataset_id is required" unless dataset_id
           new.tap do |b|
-            reference_gapi = Google::Apis::BigqueryV2::DatasetReference.new(
-              project_id: project_id,
-              dataset_id: dataset_id
-            )
+            reference_gapi = Google::Apis::BigqueryV2::DatasetReference.new \
+              project_id: project_id, dataset_id: dataset_id
             b.service = service
             b.instance_variable_set :@reference, reference_gapi
           end
@@ -2100,19 +2068,17 @@ module Google
         #
         # @!group Data
         #
-        def insert table_id, rows, insert_ids: nil, skip_invalid: nil,
-                   ignore_unknown: nil, autocreate: nil
+        def insert table_id, rows, insert_ids: nil, skip_invalid: nil, ignore_unknown: nil, autocreate: nil
           rows = [rows] if rows.is_a? Hash
           insert_ids = Array insert_ids
-          if insert_ids.count > 0 && insert_ids.count != rows.count
+          if insert_ids.count.positive? && insert_ids.count != rows.count
             raise ArgumentError, "insert_ids must be the same size as rows"
           end
 
           if autocreate
             begin
-              insert_data table_id, rows, skip_invalid:   skip_invalid,
-                                          ignore_unknown: ignore_unknown,
-                                          insert_ids:     insert_ids
+              insert_data table_id, rows,
+                          skip_invalid: skip_invalid, ignore_unknown: ignore_unknown, insert_ids: insert_ids
             rescue Google::Cloud::NotFoundError
               sleep rand(1..60)
               begin
@@ -2125,15 +2091,12 @@ module Google
               # rubocop:enable Lint/HandleExceptions
 
               sleep 60
-              insert table_id, rows, skip_invalid:   skip_invalid,
-                                     ignore_unknown: ignore_unknown,
-                                     autocreate:     true,
-                                     insert_ids:     insert_ids
+              insert table_id, rows, skip_invalid: skip_invalid, ignore_unknown: ignore_unknown, autocreate: true,
+                                     insert_ids: insert_ids
             end
           else
-            insert_data table_id, rows, skip_invalid:   skip_invalid,
-                                        ignore_unknown: ignore_unknown,
-                                        insert_ids:     insert_ids
+            insert_data table_id, rows, skip_invalid: skip_invalid, ignore_unknown: ignore_unknown,
+                                        insert_ids: insert_ids
           end
         end
 
@@ -2184,9 +2147,8 @@ module Google
         #
         #   inserter.stop.wait!
         #
-        def insert_async table_id, skip_invalid: nil, ignore_unknown: nil,
-                         max_bytes: 10000000, max_rows: 500, interval: 10,
-                         threads: 4, &block
+        def insert_async table_id, skip_invalid: nil, ignore_unknown: nil, max_bytes: 10_000_000, max_rows: 500,
+                         interval: 10, threads: 4, &block
           ensure_service!
 
           # Get table, don't use Dataset#table which handles NotFoundError
@@ -2240,9 +2202,7 @@ module Google
         def patch_gapi! *attributes
           return if attributes.empty?
           ensure_service!
-          patch_args = Hash[attributes.map do |attr|
-            [attr, @gapi.send(attr)]
-          end]
+          patch_args = Hash[attributes.map { |attr| [attr, @gapi.send(attr)] }]
           patch_gapi = Google::Apis::BigqueryV2::Dataset.new patch_args
           patch_gapi.etag = etag if etag
           @gapi = service.patch_dataset dataset_id, patch_gapi
@@ -2283,11 +2243,8 @@ module Google
           )
         end
 
-        def load_job_csv_options! job, jagged_rows: nil,
-                                  quoted_newlines: nil,
-                                  delimiter: nil,
-                                  quote: nil, skip_leading: nil,
-                                  null_marker: nil
+        def load_job_csv_options! job, jagged_rows: nil, quoted_newlines: nil, delimiter: nil, quote: nil,
+                                  skip_leading: nil, null_marker: nil
           job.jagged_rows = jagged_rows unless jagged_rows.nil?
           job.quoted_newlines = quoted_newlines unless quoted_newlines.nil?
           job.delimiter = delimiter unless delimiter.nil?
@@ -2296,17 +2253,11 @@ module Google
           job.skip_leading = skip_leading unless skip_leading.nil?
         end
 
-        def load_job_file_options! job, format: nil,
-                                   projection_fields: nil,
-                                   jagged_rows: nil, quoted_newlines: nil,
-                                   encoding: nil, delimiter: nil,
-                                   ignore_unknown: nil, max_bad_records: nil,
-                                   quote: nil, skip_leading: nil,
-                                   null_marker: nil
+        def load_job_file_options! job, format: nil, projection_fields: nil, jagged_rows: nil, quoted_newlines: nil,
+                                   encoding: nil, delimiter: nil, ignore_unknown: nil, max_bad_records: nil, quote: nil,
+                                   skip_leading: nil, null_marker: nil
           job.format = format unless format.nil?
-          unless projection_fields.nil?
-            job.projection_fields = projection_fields
-          end
+          job.projection_fields = projection_fields unless projection_fields.nil?
           job.encoding = encoding unless encoding.nil?
           job.ignore_unknown = ignore_unknown unless ignore_unknown.nil?
           job.max_bad_records = max_bad_records unless max_bad_records.nil?
@@ -2318,16 +2269,11 @@ module Google
                                      null_marker:     null_marker
         end
 
-        def load_job_updater table_id, format: nil, create: nil,
-                             write: nil, projection_fields: nil,
-                             jagged_rows: nil, quoted_newlines: nil,
-                             encoding: nil, delimiter: nil,
-                             ignore_unknown: nil, max_bad_records: nil,
-                             quote: nil, skip_leading: nil, dryrun: nil,
-                             schema: nil, job_id: nil, prefix: nil, labels: nil,
-                             autodetect: nil, null_marker: nil
-          new_job = load_job_gapi table_id, dryrun, job_id: job_id,
-                                                    prefix: prefix
+        def load_job_updater table_id, format: nil, create: nil, write: nil, projection_fields: nil, jagged_rows: nil,
+                             quoted_newlines: nil, encoding: nil, delimiter: nil, ignore_unknown: nil,
+                             max_bad_records: nil, quote: nil, skip_leading: nil, dryrun: nil, schema: nil, job_id: nil,
+                             prefix: nil, labels: nil, autodetect: nil, null_marker: nil
+          new_job = load_job_gapi table_id, dryrun, job_id: job_id, prefix: prefix
           LoadJob::Updater.new(new_job).tap do |job|
             job.location = location if location # may be dataset reference
             job.create = create unless create.nil?
@@ -2365,9 +2311,7 @@ module Google
             job_gapi.configuration.load.update! source_uris: urls
             if job_gapi.configuration.load.source_format.nil?
               source_format = Convert.derive_source_format_from_list urls
-              unless source_format.nil?
-                job_gapi.configuration.load.source_format = source_format
-              end
+              job_gapi.configuration.load.source_format = source_format unless source_format.nil?
             end
           end
 
@@ -2379,9 +2323,7 @@ module Google
           path = Pathname(file).to_path
           if job_gapi.configuration.load.source_format.nil?
             source_format = Convert.derive_source_format path
-            unless source_format.nil?
-              job_gapi.configuration.load.source_format = source_format
-            end
+            job_gapi.configuration.load.source_format = source_format unless source_format.nil?
           end
 
           gapi = service.load_table_file file, job_gapi
@@ -2401,10 +2343,8 @@ module Google
         def storage_url? files
           [files].flatten.all? do |file|
             file.respond_to?(:to_gs_url) ||
-              (file.respond_to?(:to_str) &&
-                  file.to_str.downcase.start_with?("gs://")) ||
-              (file.is_a?(URI) &&
-                  file.to_s.downcase.start_with?("gs://"))
+              (file.respond_to?(:to_str) && file.to_str.downcase.start_with?("gs://")) ||
+              (file.is_a?(URI) && file.to_s.downcase.start_with?("gs://"))
           end
         end
 

data/lib/google/cloud/bigquery/dataset/access.rb

@@ -885,10 +885,8 @@ module Google
             rules = Array gapi.access
             new.tap do |s|
               s.instance_variable_set :@rules, rules
-              s.instance_variable_set :@original_rules_hashes,
-                                      rules.map(&:to_h)
-              s.instance_variable_set :@dataset_reference,
-                                      gapi.dataset_reference
+              s.instance_variable_set :@original_rules_hashes, rules.map(&:to_h)
+              s.instance_variable_set :@dataset_reference, gapi.dataset_reference
             end
           end
 
@@ -902,18 +900,14 @@ module Google
           # @private
           def validate_role role
             good_role = ROLES[role.to_s]
-            if good_role.nil?
-              raise ArgumentError "Unable to determine role for #{role}"
-            end
+            raise ArgumentError "Unable to determine role for #{role}" if good_role.nil?
             good_role
           end
 
           # @private
           def validate_scope scope
             good_scope = SCOPES[scope.to_s]
-            if good_scope.nil?
-              raise ArgumentError "Unable to determine scope for #{scope}"
-            end
+            raise ArgumentError "Unable to determine scope for #{scope}" if good_scope.nil?
             good_scope
           end
 
@@ -984,9 +978,7 @@ module Google
             # If scope is special group, make sure value is in the list
             value = validate_special_group value if scope == :special_group
             # Detect any rules of this role, scope, and value
-            !(!@rules.detect(
-              &find_by_role_and_scope_and_value(role, scope, value)
-            ))
+            !(!@rules.detect(&find_by_role_and_scope_and_value(role, scope, value)))
           end
 
           # @private

data/lib/google/cloud/bigquery/dataset/list.rb

@@ -123,15 +123,13 @@ module Google
           #
           def all request_limit: nil
             request_limit = request_limit.to_i if request_limit
-            unless block_given?
-              return enum_for :all, request_limit: request_limit
-            end
+            return enum_for :all, request_limit: request_limit unless block_given?
             results = self
             loop do
               results.each { |r| yield r }
               if request_limit
                 request_limit -= 1
-                break if request_limit < 0
+                break if request_limit.negative?
               end
               break unless results.next?
               results = results.next
@@ -140,11 +138,8 @@ module Google
 
           ##
           # @private New Dataset::List from a response object.
-          def self.from_gapi gapi_list, service, hidden = nil, filter = nil,
-                             max = nil
-            datasets = List.new(Array(gapi_list.datasets).map do |gapi_object|
-              Dataset.from_gapi gapi_object, service
-            end)
+          def self.from_gapi gapi_list, service, hidden = nil, filter = nil, max = nil
+            datasets = List.new(Array(gapi_list.datasets).map { |gapi_object| Dataset.from_gapi gapi_object, service })
             datasets.instance_variable_set :@token,   gapi_list.next_page_token
             datasets.instance_variable_set :@etag,    gapi_list.etag
             datasets.instance_variable_set :@service, service

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

@@ -54,9 +54,7 @@ module Google
         # @private New External from URLs and format
         def self.from_urls urls, format = nil
           external_format = source_format_for urls, format
-          if external_format.nil?
-            raise ArgumentError, "Unable to determine external table format"
-          end
+          raise ArgumentError, "Unable to determine external table format" if external_format.nil?
           external_class = table_class_for external_format
           external_class.new.tap do |e|
             e.gapi.source_uris = Array(urls)
@@ -69,9 +67,7 @@ module Google
         def self.from_gapi gapi
           external_format = source_format_for gapi.source_uris,
                                               gapi.source_format
-          if external_format.nil?
-            raise ArgumentError, "Unable to determine external table format"
-          end
+          raise ArgumentError, "Unable to determine external table format" if external_format.nil?
           external_class = table_class_for external_format
           external_class.from_gapi gapi
         end
@@ -96,12 +92,8 @@ module Google
             return "NEWLINE_DELIMITED_JSON" if url.end_with? ".json"
             return "AVRO" if url.end_with? ".avro"
             return "DATASTORE_BACKUP" if url.end_with? ".backup_info"
-            if url.start_with? "https://docs.google.com/spreadsheets/"
-              return "GOOGLE_SHEETS"
-            end
-            if url.start_with? "https://googleapis.com/bigtable/projects/"
-              return "BIGTABLE"
-            end
+            return "GOOGLE_SHEETS" if url.start_with? "https://docs.google.com/spreadsheets/"
+            return "BIGTABLE" if url.start_with? "https://googleapis.com/bigtable/projects/"
           end
           nil
         end
@@ -556,8 +548,7 @@ module Google
 
           def frozen_check!
             return unless frozen?
-            raise ArgumentError,
-                  "Cannot modify external data source when frozen"
+            raise ArgumentError, "Cannot modify external data source when frozen"
           end
         end
 
@@ -1163,8 +1154,7 @@ module Google
           # @private Create an empty SheetsSource object.
           def initialize
             super
-            @gapi.google_sheets_options = \
-              Google::Apis::BigqueryV2::GoogleSheetsOptions.new
+            @gapi.google_sheets_options = Google::Apis::BigqueryV2::GoogleSheetsOptions.new
           end
 
           ##
@@ -1309,8 +1299,7 @@ module Google
           # @private Create an empty BigtableSource object.
           def initialize
             super
-            @gapi.bigtable_options = \
-              Google::Apis::BigqueryV2::BigtableOptions.new
+            @gapi.bigtable_options = Google::Apis::BigqueryV2::BigtableOptions.new
             @families = []
           end
 
@@ -1454,9 +1443,7 @@ module Google
           def self.from_gapi gapi
             new_table = super
             families = Array gapi.bigtable_options.column_families
-            families = families.map do |fam_gapi|
-              BigtableSource::ColumnFamily.from_gapi fam_gapi
-            end
+            families = families.map { |fam_gapi| BigtableSource::ColumnFamily.from_gapi fam_gapi }
             new_table.instance_variable_set :@families, families
             new_table
           end
@@ -1473,8 +1460,7 @@ module Google
 
           def frozen_check!
             return unless frozen?
-            raise ArgumentError,
-                  "Cannot modify external data source when frozen"
+            raise ArgumentError, "Cannot modify external data source when frozen"
           end
 
           ##
@@ -1993,9 +1979,7 @@ module Google
             def self.from_gapi gapi
               new_fam = new
               new_fam.instance_variable_set :@gapi, gapi
-              columns = Array(gapi.columns).map do |col_gapi|
-                BigtableSource::Column.from_gapi col_gapi
-              end
+              columns = Array(gapi.columns).map { |col_gapi| BigtableSource::Column.from_gapi col_gapi }
               new_fam.instance_variable_set :@columns, columns
               new_fam
             end
@@ -2012,8 +1996,7 @@ module Google
 
             def frozen_check!
               return unless frozen?
-              raise ArgumentError,
-                    "Cannot modify external data source when frozen"
+              raise ArgumentError, "Cannot modify external data source when frozen"
             end
           end
 
@@ -2082,8 +2065,7 @@ module Google
             #   end
             #
             def qualifier
-              @gapi.qualifier_string || \
-                Base64.strict_decode64(@gapi.qualifier_encoded.to_s)
+              @gapi.qualifier_string || Base64.strict_decode64(@gapi.qualifier_encoded.to_s)
             end
 
             ##
@@ -2128,9 +2110,7 @@ module Google
               end
             rescue EncodingError
               @gapi.qualifier_encoded = Base64.strict_encode64 new_qualifier
-              if @gapi.instance_variables.include? :@qualifier_string
-                @gapi.remove_instance_variable :@qualifier_string
-              end
+              @gapi.remove_instance_variable :@qualifier_string if @gapi.instance_variables.include? :@qualifier_string
             end
 
             ##
@@ -2390,8 +2370,7 @@ module Google
 
             def frozen_check!
               return unless frozen?
-              raise ArgumentError,
-                    "Cannot modify external data source when frozen"
+              raise ArgumentError, "Cannot modify external data source when frozen"
             end
           end
         end