lib/google/cloud/bigquery/job/list.rb in google-cloud-bigquery-1.12.0 vs lib/google/cloud/bigquery/job/list.rb in google-cloud-bigquery-1.13.0
- old
+ new
@@ -69,13 +69,13 @@
# next_jobs = jobs.next
# end
def next
return nil unless next?
ensure_service!
- options = { all: @hidden, token: token, max: @max, filter: @filter }
- gapi = @service.list_jobs options
- self.class.from_gapi gapi, @service, @hidden, @max, @filter
+ next_options = @options.merge token: token
+ next_gapi = @service.list_jobs next_options
+ self.class.from_gapi next_gapi, @service, next_options
end
##
# Retrieves remaining results by repeatedly invoking {#next} until
# {#next?} returns `false`. Calls the given block once for each
@@ -139,20 +139,17 @@
end
##
# @private New Job::List from a Google API Client
# Google::Apis::BigqueryV2::JobList object.
- def self.from_gapi gapi_list, service, hidden = nil, max = nil,
- filter = nil
+ def self.from_gapi gapi_list, service, options = {}
jobs = List.new(Array(gapi_list.jobs).map do |gapi_object|
Job.from_gapi gapi_object, service
end)
- jobs.instance_variable_set :@token, gapi_list.next_page_token
- jobs.instance_variable_set :@etag, gapi_list.etag
- jobs.instance_variable_set :@service, service
- jobs.instance_variable_set :@hidden, hidden
- jobs.instance_variable_set :@max, max
- jobs.instance_variable_set :@filter, filter
+ jobs.instance_variable_set :@token, gapi_list.next_page_token
+ jobs.instance_variable_set :@etag, gapi_list.etag
+ jobs.instance_variable_set :@service, service
+ jobs.instance_variable_set :@options, options
jobs
end
protected