activerecord_save_many 0.7.0 → 0.7.1

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/activerecord_save_many/save_many.rb

@@ -42,14 +42,7 @@ module ActiveRecord
       module_function :slice_array
 
       def add_columns(klass, values, options)
-        columns = options[:columns] || klass.columns.map(&:name)
-
-        # add a :type column automatically for STI, if not already present
-        if klass.superclass!=ActiveRecord::Base && !columns.include?(:type)
-          columns = [:type, *columns]
-          values = values.map{|vals| [klass.to_s, *vals]}
-        end
-
+        columns = options[:columns] || klass.column_names
         [columns, values]
       end
       module_function :add_columns

data/spec/activerecord_save_many_spec.rb

@@ -68,25 +68,18 @@ module ActiveRecord
       end
 
       describe "add_columns" do
-        it "should add a type column to an indirect inheritor of ActiveRecord::Base" do
-          klass = new_named_class(new_ar_class("Foo"), "Bar")
-          columns, values = SaveMany::Functions::add_columns(klass, [["foo"]], :columns=>[:foo])
-          columns.should == [:type, :foo]
-          values.should == [["Bar", "foo"]]
+        it "should add the class columns if no explicit columns are given" do
+          klass = new_ar_class("Foo") { class << self ; def column_names() ; ["foo"] ; end ; end }
+          columns, values = SaveMany::Functions::add_columns(klass, [["foodata"]], {})
+          columns.should == ["foo"]
+          values.should == [["foodata"]]
         end
 
-        it "should not add a type column if already present" do
-          klass = new_named_class(new_ar_class("Foo"), "Bar")
-          columns, values = SaveMany::Functions::add_columns(klass, [["foo", "Baz"]], :columns=>[:foo, :type])
-          columns.should == [:foo, :type]
-          values.should == [["foo", "Baz"]]
-        end
-
-        it "should not add a type column to a direct inheritor of ActiveRecord::Base" do
-          klass = new_ar_class("Foo")
-          columns, values = SaveMany::Functions::add_columns(klass, [["foo"]], :columns=>[:foo])
-          columns.should == [:foo]
-          values.should == [["foo"]]
+        it "should use the explicitly given columns if given" do
+          klass = new_ar_class("Foo") { class << self ; def column_names() ; ["foo"] ; end ; end }
+          columns, values = SaveMany::Functions::add_columns(klass, [["foodata", "bardata"]], {:columns=>[:foo, :bar]})
+          columns.should == [:foo, :bar]
+          values.should == [["foodata", "bardata"]]
         end
       end
     end
@@ -121,6 +114,7 @@ module ActiveRecord
         stub(k).table_name{tablename}
         cns = column_names.map{|cn| col=Object.new ; stub(col).name{cn} ; col}
         stub(k).columns{cns}
+        stub(k).column_names{column_names}
         stub(k).quote_value{|v| "'#{v}'"}
         connection = ActiveRecord::ConnectionAdapters::MysqlAdapter.new
         stub(connection).execute_raw{|sql| 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - mccraigmccraig
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 +00:00
+date: 2010-03-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency