td 0.7.4 → 0.7.5

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2011-08-18 version 0.7.5
+
+* set-schema: adds column instead of replacing all columns
+* set-schema: adds -R, --reset option
+
+
 == 2011-08-18 version 0.7.4
 
 * Added set-schema subcommand

data/lib/td/api.rb

@@ -125,7 +125,7 @@ class API
       name = m['name']
       type = (m['type'] || '?').to_sym
       count = (m['count'] || 0).to_i  # TODO?
-      schema = JSON.parse(m['schema']) # FIXME?
+      schema = JSON.parse(m['schema'] || '[]')
       result[name] = [type, schema, count]
     }
     return result

data/lib/td/client.rb

@@ -245,8 +245,16 @@ class Schema
     @fields << Field.new(name, type)
   end
 
-  def to_s
-    @fields.map {|f| "#{f.name}:#{f.type}" }.join(',')
+  def merge(schema)
+    nf = @fields.dup
+    schema.fields.each {|f|
+      if i = nf.find_index {|sf| sf.name == f.name }
+        nf[i] = f
+      else
+        nf << f
+      end
+    }
+    Schema.new(nf)
   end
 
   def to_json(*args)

data/lib/td/command/table.rb

@@ -63,14 +63,33 @@ module Command
   def set_schema
     op = cmd_opt 'set-schema', :db_name, :table_name, :columns_?
 
+    op.banner << "\noptions:\n"
+
+    reset = nil
+    op.on('-R', '--reset', "Reset all columns", TrueClass) {|b|
+      reset = b
+    }
+
     db_name, table_name, *columns = op.cmd_parse
 
+    if !reset && columns.empty?
+      puts op.to_s
+      exit 1
+    end
+
+    rmcols = []
+
     schema = Schema.new
     columns.each {|column|
       name, type = column.split(':',2)
       name = name.to_s
       type = type.to_s
 
+      if name.empty?
+        rmcols << type
+        next
+      end
+
       API.validate_column_name(name)
       type = API.normalize_type_name(type)
 
@@ -88,7 +107,12 @@ module Command
 
     client = get_client
 
-    find_table(client, db_name, table_name)
+    table = find_table(client, db_name, table_name)
+
+    unless reset
+      schema = table.schema.merge(schema)
+      schema.fields.delete_if {|f| rmcols.include?(f.name) }
+    end
 
     client.update_schema(db_name, table_name, schema)
 

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.7.4'
+VERSION = '0.7.5'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: td
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Sadayuki Furuhashi