google-cloud-bigquery 1.0.0 → 1.1.0

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

@@ -300,8 +300,8 @@ module Google
         #   end
         #
         def record name, description: nil, mode: nil
-          # TODO: do we need to fail if no block was given?
-          fail ArgumentError, "a block is required" unless block_given?
+          # 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
@@ -343,7 +343,7 @@ module Google
 
         def frozen_check!
           return unless frozen?
-          fail ArgumentError, "Cannot modify a frozen schema"
+          raise ArgumentError, "Cannot modify a frozen schema"
         end
 
         def add_field name, type, description: nil, mode: :nullable
@@ -354,7 +354,8 @@ module Google
             type: verify_type(type),
             description: description,
             mode: verify_mode(mode),
-            fields: [])
+            fields: []
+          )
 
           # Remove any existing field of this name
           @gapi.fields ||= []
@@ -370,8 +371,7 @@ module Google
         def verify_type type
           type = type.to_s.upcase
           unless Field::TYPES.include? type
-            fail ArgumentError,
-                 "Type '#{type}' not found"
+            raise ArgumentError, "Type '#{type}' not found"
           end
           type
         end
@@ -380,7 +380,7 @@ module Google
           mode = :nullable if mode.nil?
           mode = mode.to_s.upcase
           unless Field::MODES.include? mode
-            fail ArgumentError "Unable to determine mode for '#{mode}'"
+            raise ArgumentError "Unable to determine mode for '#{mode}'"
           end
           mode
         end

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

@@ -37,11 +37,11 @@ module Google
         #
         class Field
           # @private
-          MODES = %w( NULLABLE REQUIRED REPEATED )
+          MODES = %w[NULLABLE REQUIRED REPEATED].freeze
 
           # @private
-          TYPES = %w( STRING INTEGER FLOAT BOOLEAN BYTES TIMESTAMP TIME DATETIME
-                      DATE RECORD )
+          TYPES = %w[STRING INTEGER FLOAT BOOLEAN BYTES TIMESTAMP TIME DATETIME
+                     DATE RECORD].freeze
 
           ##
           # The name of the field.
@@ -514,8 +514,8 @@ module Google
           def record name, description: nil, mode: nil
             record_check!
 
-            # TODO: do we need to fail if no block was given?
-            fail ArgumentError, "a block is required" unless block_given?
+            # 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
@@ -546,13 +546,13 @@ module Google
 
           def frozen_check!
             return unless frozen?
-            fail ArgumentError, "Cannot modify a frozen field"
+            raise ArgumentError, "Cannot modify a frozen field"
           end
 
           def record_check!
             return unless type != "RECORD"
-            fail ArgumentError,
-                 "Cannot add fields to a non-RECORD field (#{type})"
+            raise ArgumentError,
+                  "Cannot add fields to a non-RECORD field (#{type})"
           end
 
           def add_field name, type, description: nil, mode: :nullable
@@ -563,7 +563,8 @@ module Google
               type: verify_type(type),
               description: description,
               mode: verify_mode(mode),
-              fields: [])
+              fields: []
+            )
 
             # Remove any existing field of this name
             @gapi.fields ||= []
@@ -578,8 +579,7 @@ module Google
           def verify_type type
             type = type.to_s.upcase
             unless TYPES.include? type
-              fail ArgumentError,
-                   "Type '#{type}' not found in #{TYPES.inspect}"
+              raise ArgumentError, "Type '#{type}' not found"
             end
             type
           end
@@ -588,7 +588,7 @@ module Google
             mode = :nullable if mode.nil?
             mode = mode.to_s.upcase
             unless MODES.include? mode
-              fail ArgumentError "Unable to determine mode for '#{mode}'"
+              raise ArgumentError "Unable to determine mode for '#{mode}'"
             end
             mode
           end

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

@@ -201,22 +201,32 @@ module Google
         end
 
         def insert_tabledata dataset_id, table_id, rows, options = {}
-          insert_rows = Array(rows).map do |row|
-            Google::Apis::BigqueryV2::InsertAllTableDataRequest::Row.new(
-              insert_id: SecureRandom.uuid,
-              json: Convert.to_json_row(row)
-            )
+          json_rows = Array(rows).map { |row| Convert.to_json_row row }
+
+          insert_tabledata_json_rows dataset_id, table_id, json_rows, options
+        end
+
+        def insert_tabledata_json_rows dataset_id, table_id, json_rows,
+                                       options = {}
+          insert_rows = Array(json_rows).map do |json_row|
+            {
+              insertId: SecureRandom.uuid,
+              json: json_row
+            }
           end
-          insert_req = Google::Apis::BigqueryV2::InsertAllTableDataRequest.new(
+
+          insert_req = {
             rows: insert_rows,
-            ignore_unknown_values: options[:ignore_unknown],
-            skip_invalid_rows: options[:skip_invalid]
-          )
+            ignoreUnknownValues: options[:ignore_unknown],
+            skipInvalidRows: options[:skip_invalid]
+          }.to_json
 
           # The insertAll with insertId operation is considered idempotent
           execute backoff: true do
             service.insert_all_table_data(
-              @project, dataset_id, table_id, insert_req)
+              @project, dataset_id, table_id, insert_req,
+              options: { skip_serialization: true }
+            )
           end
         end
 
@@ -280,7 +290,8 @@ module Google
           # Jobs have generated id, so this operation is considered idempotent
           execute backoff: true do
             service.insert_job @project, copy_table_config(
-              source, target, options)
+              source, target, options
+            )
           end
         end
 
@@ -306,7 +317,8 @@ module Google
           execute backoff: true do
             service.insert_job \
               @project, load_table_file_config(
-                dataset_id, table_id, file, options),
+                dataset_id, table_id, file, options
+              ),
               upload_source: file, content_type: mime_type_for(file)
           end
         end
@@ -320,7 +332,7 @@ module Google
           str = str.to_s
           m = /\A(((?<prj>\S*):)?(?<dts>\S*)\.)?(?<tbl>\S*)\z/.match str
           unless m
-            fail ArgumentError, "unable to identify table from #{str.inspect}"
+            raise ArgumentError, "unable to identify table from #{str.inspect}"
           end
           str_table_ref_hash = {
             project_id: m["prj"],
@@ -391,7 +403,8 @@ module Google
           path = Pathname(file).to_path
           {
             destination_table: Google::Apis::BigqueryV2::TableReference.new(
-              project_id: @project, dataset_id: dataset_id, table_id: table_id),
+              project_id: @project, dataset_id: dataset_id, table_id: table_id
+            ),
             create_disposition: create_disposition(options[:create]),
             write_disposition: write_disposition(options[:write]),
             source_format: source_format(path, options[:format]),
@@ -423,7 +436,8 @@ module Google
         def load_table_url_opts dataset_id, table_id, url, options = {}
           {
             destination_table: Google::Apis::BigqueryV2::TableReference.new(
-              project_id: @project, dataset_id: dataset_id, table_id: table_id),
+              project_id: @project, dataset_id: dataset_id, table_id: table_id
+            ),
             source_uris: Array(url),
             create_disposition: create_disposition(options[:create]),
             write_disposition: write_disposition(options[:write]),
@@ -500,7 +514,7 @@ module Google
                 end
               end
             else
-              fail "Query parameters must be an Array or a Hash."
+              raise "Query parameters must be an Array or a Hash."
             end
           end
 
@@ -545,7 +559,7 @@ module Google
                 end
               end
             else
-              fail "Query parameters must be an Array or a Hash."
+              raise "Query parameters must be an Array or a Hash."
             end
           end
 
@@ -624,14 +638,15 @@ module Google
         end
 
         def source_format path, format
-          val = { "csv" => "CSV",
-                  "json" => "NEWLINE_DELIMITED_JSON",
-                  "newline_delimited_json" => "NEWLINE_DELIMITED_JSON",
-                  "avro" => "AVRO",
-                  "datastore" => "DATASTORE_BACKUP",
-                  "backup" => "DATASTORE_BACKUP",
-                  "datastore_backup" => "DATASTORE_BACKUP"
-                }[format.to_s.downcase]
+          val = {
+            "csv" => "CSV",
+            "json" => "NEWLINE_DELIMITED_JSON",
+            "newline_delimited_json" => "NEWLINE_DELIMITED_JSON",
+            "avro" => "AVRO",
+            "datastore" => "DATASTORE_BACKUP",
+            "backup" => "DATASTORE_BACKUP",
+            "datastore_backup" => "DATASTORE_BACKUP"
+          }[format.to_s.downcase]
           return val unless val.nil?
           return nil if path.nil?
           return "CSV" if path.end_with? ".csv"
@@ -649,7 +664,7 @@ module Google
           mime_type = MIME::Types.of(Pathname(file).to_path).first.to_s
           return nil if mime_type.empty?
           mime_type
-        rescue
+        rescue StandardError
           nil
         end
 
@@ -682,13 +697,13 @@ module Google
             attr_accessor :backoff
           end
           self.retries = 5
-          self.reasons = %w(rateLimitExceeded backendError)
+          self.reasons = %w[rateLimitExceeded backendError]
           self.backoff = lambda do |retries|
             # Max delay is 32 seconds
             # See "Back-off Requirements" here:
             # https://cloud.google.com/bigquery/sla
             retries = 5 if retries > 5
-            delay = 2 ** retries
+            delay = 2**retries
             sleep delay
           end
 
@@ -729,7 +744,7 @@ module Google
               return false unless @reasons.include? json_error["reason"]
             end
             true
-          rescue
+          rescue StandardError
             false
           end
         end

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

@@ -211,12 +211,69 @@ module Google
         #
         def time_partitioning_type= type
           reload! unless resource_full?
-          @gapi.time_partitioning ||=
-              Google::Apis::BigqueryV2::TimePartitioning.new
+          @gapi.time_partitioning ||= \
+            Google::Apis::BigqueryV2::TimePartitioning.new
           @gapi.time_partitioning.type = type
           patch_gapi! :time_partitioning
         end
 
+        ###
+        # The field on which the table is partitioned, if any. See
+        # [Partitioned Tables](https://cloud.google.com/bigquery/docs/partitioned-tables).
+        #
+        # @return [String, nil] The partition field, if a field was configured.
+        #   `nil` if not partitioned, not set (partitioned by pseudo column
+        #   '_PARTITIONTIME') or the object is a reference (see {#reference?}).
+        #
+        # @!group Attributes
+        #
+        def time_partitioning_field
+          return nil if reference?
+          ensure_full_data!
+          @gapi.time_partitioning.field if time_partitioning?
+        end
+
+        ##
+        # Sets the field on which to partition the table. See [Partitioned
+        # Tables](https://cloud.google.com/bigquery/docs/partitioned-tables).
+        # The table must also be partitioned.
+        #
+        # See {Table#time_partitioning_type=}.
+        #
+        # You can only set the partitioning field while creating a table as in
+        # the example below. BigQuery does not allow you to change partitioning
+        # on an existing table.
+        #
+        # If the table is not a full resource representation (see
+        # {#resource_full?}), the full representation will be retrieved before
+        # the update to comply with ETag-based optimistic concurrency control.
+        #
+        # @param [String] field The partition field. The field must be a
+        #   top-level TIMESTAMP or DATE field. Its mode must be NULLABLE or
+        #   REQUIRED.
+        #
+        # @example
+        #   require "google/cloud/bigquery"
+        #
+        #   bigquery = Google::Cloud::Bigquery.new
+        #   dataset = bigquery.dataset "my_dataset"
+        #   table = dataset.create_table "my_table" do |table|
+        #     table.time_partitioning_type  = "DAY"
+        #     table.time_partitioning_field = "dob"
+        #     table.schema do |schema|
+        #       schema.timestamp "dob", mode: :required
+        #     end
+        #   end
+        #
+        # @!group Attributes
+        #
+        def time_partitioning_field= field
+          reload! unless resource_full?
+          @gapi.time_partitioning ||= \
+            Google::Apis::BigqueryV2::TimePartitioning.new
+          @gapi.time_partitioning.field = field
+          patch_gapi! :time_partitioning
+        end
 
         ###
         # The expiration for the table partitions, if any, in seconds. See
@@ -264,8 +321,8 @@ module Google
         #
         def time_partitioning_expiration= expiration
           reload! unless resource_full?
-          @gapi.time_partitioning ||=
-              Google::Apis::BigqueryV2::TimePartitioning.new
+          @gapi.time_partitioning ||= \
+            Google::Apis::BigqueryV2::TimePartitioning.new
           @gapi.time_partitioning.expiration_ms = expiration * 1000
           patch_gapi! :time_partitioning
         end
@@ -426,7 +483,7 @@ module Google
           ensure_full_data!
           begin
             Integer @gapi.num_bytes
-          rescue
+          rescue StandardError
             nil
           end
         end
@@ -444,7 +501,7 @@ module Google
           ensure_full_data!
           begin
             Integer @gapi.num_rows
-          rescue
+          rescue StandardError
             nil
           end
         end
@@ -462,7 +519,7 @@ module Google
           ensure_full_data!
           begin
             ::Time.at(Integer(@gapi.creation_time) / 1000.0)
-          rescue
+          rescue StandardError
             nil
           end
         end
@@ -482,7 +539,7 @@ module Google
           ensure_full_data!
           begin
             ::Time.at(Integer(@gapi.expiration_time) / 1000.0)
-          rescue
+          rescue StandardError
             nil
           end
         end
@@ -500,7 +557,7 @@ module Google
           ensure_full_data!
           begin
             ::Time.at(Integer(@gapi.last_modified_time) / 1000.0)
-          rescue
+          rescue StandardError
             nil
           end
         end
@@ -829,7 +886,7 @@ module Google
           oldest_entry_time = @gapi.streaming_buffer.oldest_entry_time
           begin
             ::Time.at(Integer(oldest_entry_time) / 1000.0)
-          rescue
+          rescue StandardError
             nil
           end
         end
@@ -1163,8 +1220,8 @@ module Google
           if job.failed?
             begin
               # raise to activate ruby exception cause handling
-              fail job.gapi_error
-            rescue => e
+              raise job.gapi_error
+            rescue StandardError => e
               # wrap Google::Apis::Error with Google::Cloud::Error
               raise Google::Cloud::Error.from_error(e)
             end
@@ -1303,8 +1360,8 @@ module Google
           if job.failed?
             begin
               # raise to activate ruby exception cause handling
-              fail job.gapi_error
-            rescue => e
+              raise job.gapi_error
+            rescue StandardError => e
               # wrap Google::Apis::Error with Google::Cloud::Error
               raise Google::Cloud::Error.from_error(e)
             end
@@ -1486,7 +1543,7 @@ module Google
                       autodetect: autodetect, null_marker: null_marker }
           return load_storage(file, options) if storage_url? file
           return load_local(file, options) if local_file? file
-          fail Google::Cloud::Error, "Don't know how to load #{file}"
+          raise Google::Cloud::Error, "Don't know how to load #{file}"
         end
 
         ##
@@ -1642,8 +1699,8 @@ module Google
           if job.failed?
             begin
               # raise to activate ruby exception cause handling
-              fail job.gapi_error
-            rescue => e
+              raise job.gapi_error
+            rescue StandardError => e
               # wrap Google::Apis::Error with Google::Cloud::Error
               raise Google::Cloud::Error.from_error(e)
             end
@@ -1701,7 +1758,7 @@ module Google
         #
         def insert rows, skip_invalid: nil, ignore_unknown: nil
           rows = [rows] if rows.is_a? Hash
-          fail ArgumentError, "No rows provided" if rows.empty?
+          raise ArgumentError, "No rows provided" if rows.empty?
           ensure_service!
           options = { skip_invalid: skip_invalid,
                       ignore_unknown: ignore_unknown }
@@ -1812,7 +1869,7 @@ module Google
           gapi = service.get_table dataset_id, table_id
           @gapi = gapi
         end
-        alias_method :refresh!, :reload!
+        alias refresh! reload!
 
         ##
         # Determines whether the table exists in the BigQuery service. The
@@ -1965,7 +2022,7 @@ module Google
         ##
         # Raise an error unless an active service is available.
         def ensure_service!
-          fail "Must have active connection" unless service
+          raise "Must have active connection" unless service
         end
 
         ##
@@ -2019,7 +2076,7 @@ module Google
 
         def local_file? file
           ::File.file? file
-        rescue
+        rescue StandardError
           false
         end