td-client 0.8.30 → 0.8.31

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-09-21 version 0.8.31
+
+* Added Job#db_name
+
+
 == 2012-09-21 version 0.8.30
 
 * Fixed Account#storage_size_string and Table#estimated_storage_size_string

data/lib/td/client.rb

@@ -123,22 +123,22 @@ class Client
   # => [Job]
   def jobs(from=nil, to=nil, status=nil)
     result = @api.list_jobs(from, to, status)
-    result.map {|job_id,type,status,query,start_at,end_at,result_url,priority,org|
-      Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority, org)
+    result.map {|job_id,type,status,query,start_at,end_at,result_url,priority,org,db|
+      Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority, org, db)
     }
   end
 
   # => Job
   def job(job_id)
     job_id = job_id.to_s
-    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org = @api.show_job(job_id)
-    Job.new(self, job_id, type, query, status, url, debug, start_at, end_at, nil, result_url, hive_result_schema, priority, org)
+    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org, db = @api.show_job(job_id)
+    Job.new(self, job_id, type, query, status, url, debug, start_at, end_at, nil, result_url, hive_result_schema, priority, org, db)
   end
 
   # => type:Symbol, url:String
   def job_status(job_id)
-    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org = @api.show_job(job_id)
-    return query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org
+    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org, db = @api.show_job(job_id)
+    return query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org, db
   end
 
   # => result:[{column:String=>value:Object]
@@ -259,9 +259,9 @@ class Client
   # [ScheduledJob]
   def history(name, from=nil, to=nil)
     result = @api.history(name, from, to)
-    result.map {|scheduled_at,job_id,type,status,query,start_at,end_at,result_url,priority|
+    result.map {|scheduled_at,job_id,type,status,query,start_at,end_at,result_url,priority,database|
       # TODO org
-      ScheduledJob.new(self, scheduled_at, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority)
+      ScheduledJob.new(self, scheduled_at, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority,nil,database)
     }
   end
 

data/lib/td/client/api.rb

@@ -339,6 +339,7 @@ class API
     js['jobs'].each {|m|
       job_id = m['job_id']
       type = (m['type'] || '?').to_sym
+      database = m['database']
       status = m['status']
       query = m['query']
       start_at = m['start_at']
@@ -346,7 +347,7 @@ class API
       result_url = m['result']
       priority = m['priority']
       organization = m['organization']
-      result << [job_id, type, status, query, start_at, end_at, result_url, priority, organization]
+      result << [job_id, type, status, query, start_at, end_at, result_url, priority, organization, database]
     }
     return result
   end
@@ -360,6 +361,7 @@ class API
     js = checked_json(body, %w[status])
     # TODO debug
     type = (js['type'] || '?').to_sym  # TODO
+    database = js['database']
     query = js['query']
     status = js['status']
     debug = js['debug']
@@ -375,7 +377,7 @@ class API
     end
     priority = js['priority']
     organization = js['organization']
-    return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema, priority, organization]
+    return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema, priority, organization, database]
   end
 
   def job_result(job_id)
@@ -697,6 +699,7 @@ class API
     js['history'].each {|m|
       job_id = m['job_id']
       type = (m['type'] || '?').to_sym
+      database = m['database']
       status = m['status']
       query = m['query']
       start_at = m['start_at']
@@ -704,7 +707,7 @@ class API
       scheduled_at = m['scheduled_at']
       result_url = m['result']
       priority = m['priority']
-      result << [scheduled_at, job_id, type, status, query, start_at, end_at, result_url, priority]
+      result << [scheduled_at, job_id, type, status, query, start_at, end_at, result_url, priority, database]
     }
     return result
   end

data/lib/td/client/model.rb

@@ -215,7 +215,7 @@ class Job < Model
   STATUS_KILLED = "killed"
   FINISHED_STATUS = [STATUS_SUCCESS, STATUS_ERROR, STATUS_KILLED]
 
-  def initialize(client, job_id, type, query, status=nil, url=nil, debug=nil, start_at=nil, end_at=nil, result=nil, result_url=nil, hive_result_schema=nil, priority=nil, org_name=nil)
+  def initialize(client, job_id, type, query, status=nil, url=nil, debug=nil, start_at=nil, end_at=nil, result=nil, result_url=nil, hive_result_schema=nil, priority=nil, org_name=nil, db_name=nil)
     super(client)
     @job_id = job_id
     @type = type
@@ -230,10 +230,11 @@ class Job < Model
     @hive_result_schema = hive_result_schema
     @priority = priority
     @org_name = org_name
+    @db_name = db_name
   end
 
   attr_reader :job_id, :type, :result_url
-  attr_reader :hive_result_schema, :priority, :org_name
+  attr_reader :hive_result_schema, :priority, :org_name, :db_name
 
   def wait(timeout=nil)
     # TODO
@@ -324,7 +325,7 @@ class Job < Model
   end
 
   def update_status!
-    query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org_name = @client.job_status(@job_id)
+    query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org_name, db_name = @client.job_status(@job_id)
     @query = query
     @status = status
     @url = url
@@ -333,6 +334,7 @@ class Job < Model
     @end_at = end_at
     @hive_result_schema = hive_result_schema
     @org_name = org_name
+    @db_name = db_name
     self
   end
 end

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.30'
+VERSION = '0.8.31'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.30
+  version: 0.8.31
   prerelease: 
 platform: ruby
 authors: