activerecord-import 0.11.0 → 0.12.0

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.11.0"
+    VERSION = "0.12.0"
   end
 end

data/test/database.yml.sample

@@ -5,25 +5,13 @@ common: &common
   host:     localhost
   database: activerecord_import_test
 
-mysql: &mysql
-  <<: *common
-  adapter: mysql
-
 mysql2: &mysql2
   <<: *common
   adapter: mysql2
 
-mysqlspatial:
-  <<: *mysql
-
 mysql2spatial:
   <<: *mysql2
 
-em_mysql2:
-  <<: *common
-  adapter: em_mysql2
-  pool: 5
-
 seamless_database_pool:
   <<: *common
   adapter: seamless_database_pool

data/test/import_test.rb

@@ -404,7 +404,7 @@ describe "#import" do
       end
     end
 
-    if ENV['AR_VERSION'].to_i > 4.1
+    if ENV['AR_VERSION'].to_f > 4.1
       it 'should be able to import enum fields by name' do
         Book.delete_all if Book.count > 0
         books = [

data/test/jdbcmysql/import_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-require File.expand_path(File.dirname(__FILE__) + '/../support/mysql/assertions')
+require File.expand_path(File.dirname(__FILE__) + '/../support/assertions')
 require File.expand_path(File.dirname(__FILE__) + '/../support/mysql/import_examples')
 
-should_support_mysql_import_functionality
+should_support_mysql_import_functionality

data/test/jdbcpostgresql/import_test.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-#require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/assertions')
 require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/import_examples')
 
 should_support_postgresql_import_functionality

data/test/models/book.rb

@@ -1,8 +1,8 @@
 class Book < ActiveRecord::Base
-  belongs_to :topic, :inverse_of=>:books
-  has_many :chapters, :autosave => true, :inverse_of => :book
-  has_many :end_notes, :autosave => true, :inverse_of => :book
-  if ENV['AR_VERSION'].to_i >= 4.1
+  belongs_to :topic, :inverse_of => :books
+  has_many :chapters, :inverse_of => :book
+  has_many :end_notes, :inverse_of => :book
+  if ENV['AR_VERSION'].to_f >= 4.1
     enum status: [:draft, :published]
   end
 end

data/test/models/promotion.rb

@@ -0,0 +1,3 @@
+class Promotion < ActiveRecord::Base
+   self.primary_key = :promotion_id
+end

data/test/models/question.rb

@@ -0,0 +1,3 @@
+class Question < ActiveRecord::Base
+	has_one :rule
+end

data/test/models/rule.rb

@@ -0,0 +1,3 @@
+class Rule < ActiveRecord::Base
+	belongs_to :question
+end

data/test/models/topic.rb

@@ -2,7 +2,7 @@ class Topic < ActiveRecord::Base
   validates_presence_of :author_name
   validates :title, numericality: { only_integer: true }, on: :context_test
 
-  has_many :books, :autosave=>true, :inverse_of=>:topic
+  has_many :books, :inverse_of => :topic
   belongs_to :parent, :class_name => "Topic"
 
   composed_of :description, :mapping => [ %w(title title), %w(author_name author_name)], :allow_nil => true, :class_name => "TopicDescription"

data/test/mysql2/import_test.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-
-require File.expand_path(File.dirname(__FILE__) + '/../support/mysql/assertions')
+require File.expand_path(File.dirname(__FILE__) + '/../support/assertions')
 require File.expand_path(File.dirname(__FILE__) + '/../support/mysql/import_examples')
 
-should_support_mysql_import_functionality
+should_support_mysql_import_functionality

data/test/mysqlspatial2/import_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-require File.expand_path(File.dirname(__FILE__) + '/../support/mysql/assertions')
+require File.expand_path(File.dirname(__FILE__) + '/../support/assertions')
 require File.expand_path(File.dirname(__FILE__) + '/../support/mysql/import_examples')
 
-should_support_mysql_import_functionality
+should_support_mysql_import_functionality

data/test/postgresql/import_test.rb

@@ -2,3 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/import_examples')
 
 should_support_postgresql_import_functionality
+
+if ActiveRecord::Base.connection.supports_on_duplicate_key_update?
+  should_support_postgresql_upsert_functionality
+end

data/test/schema/generic_schema.rb

@@ -7,7 +7,7 @@ ActiveRecord::Schema.define do
 
   create_table :group, :force => true do |t|
     t.column :order, :string
-    t.timestamps
+    t.timestamps null: true
   end
 
   create_table :topics, :force=>true do |t|
@@ -64,7 +64,7 @@ ActiveRecord::Schema.define do
     t.column :publish_date, :date
     t.column :topic_id, :integer
     t.column :for_sale, :boolean, :default => true
-    t.column :status, :integer
+    t.column :status, :integer, :default => 0
   end
 
   create_table :chapters, :force => true do |t|
@@ -118,4 +118,21 @@ ActiveRecord::Schema.define do
     t.text    :data
     t.text    :json_data
   end
+
+  create_table "promotions", primary_key: "promotion_id", force: :cascade do |t|
+    t.string   :code
+    t.string   :description
+    t.decimal  :discount
+  end
+
+  add_index :promotions, [:code], :unique => true, :name => 'uk_code'
+
+  create_table :rules, force: true do |t|
+    t.column :condition_text, :string
+    t.column :question_id, :integer
+  end
+
+  create_table :questions, force: true do |t|
+    t.column :body, :string
+  end
 end

data/test/support/{mysql/assertions.rb → assertions.rb}

@@ -1,5 +1,5 @@
 class ActiveSupport::TestCase
-  module MySQLAssertions
+  module ImportAssertions
     def self.extended(klass)
       klass.instance_eval do
         assertion(:should_not_update_created_at_on_timestamp_columns) do
@@ -19,6 +19,15 @@ class ActiveSupport::TestCase
           end
         end
 
+        assertion(:should_not_update_updated_at_on_timestamp_columns) do
+          time = Chronic.parse("5 minutes from now")
+          Timecop.freeze time do
+            perform_import
+            assert_in_delta @topic.updated_at.to_i, updated_topic.updated_at.to_i, 1
+            assert_in_delta @topic.updated_on.to_i, updated_topic.updated_on.to_i, 1
+          end
+        end
+
         assertion(:should_not_update_timestamps) do
           Timecop.freeze Chronic.parse("5 minutes from now") do
             perform_import :timestamps => false
@@ -40,10 +49,10 @@ class ActiveSupport::TestCase
         end
 
         assertion(:should_raise_update_fields_mentioned) do
-          assert_raise ActiveRecord::RecordNotUnique do 
+          assert_raise ActiveRecord::RecordNotUnique do
             perform_import
           end
-          
+
           assert_equal "Book", updated_topic.title
           assert_equal "john@doe.com", updated_topic.author_email_address
         end

data/test/support/factories.rb

@@ -21,6 +21,20 @@ FactoryGirl.define do
     sequence(:w_id){ |n| n}
   end
 
+  factory :question do
+    sequence(:body) { |n| "Text #{n}"}
+
+    trait :with_rule do
+      after(:build) do |question|
+        question.build_rule(FactoryGirl.attributes_for(:rule))
+      end
+    end
+  end
+  
+  factory :rule do
+    sequence(:condition_text){ |n| "q_#{n}_#{n}"} 
+  end
+
   factory :topic_with_book, :parent=>:topic do |m|
     after(:build) do |topic|
       2.times do

data/test/support/mysql/import_examples.rb

@@ -3,29 +3,22 @@ def should_support_mysql_import_functionality
   # Forcefully disable strict mode for this session.
   ActiveRecord::Base.connection.execute "set sql_mode='STRICT_ALL_TABLES'"
 
-  describe "#import with :on_duplicate_key_update option (mysql specific functionality)" do
-    extend ActiveSupport::TestCase::MySQLAssertions
-
-    asssertion_group(:should_support_on_duplicate_key_update) do
-      should_not_update_fields_not_mentioned
-      should_update_foreign_keys
-      should_not_update_created_at_on_timestamp_columns
-      should_update_updated_at_on_timestamp_columns
-    end
+  should_support_basic_on_duplicate_key_update
 
-    macro(:perform_import){ raise "supply your own #perform_import in a context below" }
-    macro(:updated_topic){ Topic.find(@topic.id) }
+  describe "#import" do
+    context "with :on_duplicate_key_update and validation checks turned off" do
+      extend ActiveSupport::TestCase::ImportAssertions
 
-    describe "argument safety" do
-      it "should not modify the passed in :on_duplicate_key_update columns array" do
-        assert_nothing_raised do
-          columns = %w(title author_name).freeze
-          Topic.import columns, [["foo", "bar"]], :on_duplicate_key_update => columns
-        end
+      asssertion_group(:should_support_on_duplicate_key_update) do
+        should_not_update_fields_not_mentioned
+        should_update_foreign_keys
+        should_not_update_created_at_on_timestamp_columns
+        should_update_updated_at_on_timestamp_columns
       end
-    end
 
-    context "given columns and values with :validation checks turned off" do
+      macro(:perform_import){ raise "supply your own #perform_import in a context below" }
+      macro(:updated_topic){ Topic.find(@topic.id) }
+
       let(:columns){  %w( id title author_name author_email_address parent_id ) }
       let(:values){ [ [ 99, "Book", "John Doe", "john@doe.com", 17 ] ] }
       let(:updated_values){ [ [ 99, "Book - 2nd Edition", "Author Should Not Change", "johndoe@example.com", 57 ] ] }
@@ -39,18 +32,6 @@ def should_support_mysql_import_functionality
         @topic = Topic.find 99
       end
 
-      context "using string column names" do
-        let(:update_columns){ [ "title", "author_email_address", "parent_id" ] }
-        should_support_on_duplicate_key_update
-        should_update_fields_mentioned
-      end
-
-      context "using symbol column names" do
-        let(:update_columns){ [ :title, :author_email_address, :parent_id ] }
-        should_support_on_duplicate_key_update
-        should_update_fields_mentioned
-      end
-
       context "using string hash map" do
         let(:update_columns){ { "title" => "title", "author_email_address" => "author_email_address", "parent_id" => "parent_id" } }
         should_support_on_duplicate_key_update
@@ -76,101 +57,29 @@ def should_support_mysql_import_functionality
       end
     end
 
-    context "given array of model instances with :validation checks turned off" do
-      macro(:perform_import) do |*opts|
-        @topic.title = "Book - 2nd Edition"
-        @topic.author_name = "Author Should Not Change"
-        @topic.author_email_address = "johndoe@example.com"
-        @topic.parent_id = 57
-        Topic.import [@topic], opts.extract_options!.merge(:on_duplicate_key_update => update_columns, :validate => false)
-      end
+    context "with :synchronization option" do
+      let(:topics){ Array.new }
+      let(:values){ [ [topics.first.id, "Jerry Carter", "title1"], [topics.last.id, "Chad Fowler", "title2"] ]}
+      let(:columns){ %W(id author_name title) }
 
       setup do
-        @topic = Generate(:topic, :id => 99, :author_name => "John Doe", :parent_id => 17)
-      end
-
-      context "using string column names" do
-        let(:update_columns){ [ "title", "author_email_address", "parent_id" ] }
-        should_support_on_duplicate_key_update
-        should_update_fields_mentioned
-      end
-
-      context "using symbol column names" do
-        let(:update_columns){ [ :title, :author_email_address, :parent_id ] }
-        should_support_on_duplicate_key_update
-        should_update_fields_mentioned
-      end
-
-      context "using string hash map" do
-        let(:update_columns){ { "title" => "title", "author_email_address" => "author_email_address", "parent_id" => "parent_id" } }
-        should_support_on_duplicate_key_update
-        should_update_fields_mentioned
-      end
-
-      context "using string hash map, but specifying column mismatches" do
-        let(:update_columns){ { "title" => "author_email_address", "author_email_address" => "title", "parent_id" => "parent_id" } }
-        should_support_on_duplicate_key_update
-        should_update_fields_mentioned_with_hash_mappings
+        topics << Topic.create!(:title=>"LDAP", :author_name=>"Big Bird")
+        topics << Topic.create!(:title=>"Rails Recipes", :author_name=>"Elmo")
       end
 
-      context "using symbol hash map" do
-        let(:update_columns){ { :title => :title, :author_email_address => :author_email_address, :parent_id => :parent_id } }
-        should_support_on_duplicate_key_update
-        should_update_fields_mentioned
-      end
-
-      context "using symbol hash map, but specifying column mismatches" do
-        let(:update_columns){ { :title => :author_email_address, :author_email_address => :title, :parent_id => :parent_id } }
-        should_support_on_duplicate_key_update
-        should_update_fields_mentioned_with_hash_mappings
-      end
-    end
-  
-    context "given array of model instances with :on_duplicate_key_update turned off" do
-      let(:columns){  %w( id title author_name author_email_address parent_id ) }
-      let(:values){ [ [ 100, "Book", "John Doe", "john@doe.com", 17 ] ] }
-      let(:updated_values){ [ [ 100, "Book - 2nd Edition", "This should raise an exception", "john@nogo.com", 57 ] ] }
+      it "synchronizes passed in ActiveRecord model instances with the data just imported" do
+        columns2update = [ 'author_name' ]
 
-      macro(:perform_import) do |*opts|
-        # `:on_duplicate_key_update => false` is the tested feature
-        Topic.import columns, updated_values, opts.extract_options!.merge(:on_duplicate_key_update => false, :validate => false)
-      end
+        expected_count = Topic.count
+        Topic.import( columns, values,
+          :validate=>false,
+          :on_duplicate_key_update=>columns2update,
+          :synchronize=>topics )
 
-      setup do
-        Topic.import columns, values, :validate => false
-        @topic = Topic.find 100
-      end
-    
-      context "using string column names" do
-        let(:update_columns){ [ "title", "author_email_address", "parent_id" ] }
-        should_raise_update_fields_mentioned
+        assert_equal expected_count, Topic.count, "no new records should have been created!"
+        assert_equal "Jerry Carter",  topics.first.author_name, "wrong author!"
+        assert_equal "Chad Fowler", topics.last.author_name, "wrong author!"
       end
     end
   end
-
-  describe "#import with :synchronization option" do
-    let(:topics){ Array.new }
-    let(:values){ [ [topics.first.id, "Jerry Carter", "title1"], [topics.last.id, "Chad Fowler", "title2"] ]}
-    let(:columns){ %W(id author_name title) }
-
-    setup do
-      topics << Topic.create!(:title=>"LDAP", :author_name=>"Big Bird")
-      topics << Topic.create!(:title=>"Rails Recipes", :author_name=>"Elmo")
-    end
-
-    it "synchronizes passed in ActiveRecord model instances with the data just imported" do
-      columns2update = [ 'author_name' ]
-
-      expected_count = Topic.count
-      Topic.import( columns, values,
-        :validate=>false,
-        :on_duplicate_key_update=>columns2update,
-        :synchronize=>topics )
-
-      assert_equal expected_count, Topic.count, "no new records should have been created!"
-      assert_equal "Jerry Carter",  topics.first.author_name, "wrong author!"
-      assert_equal "Chad Fowler", topics.last.author_name, "wrong author!"
-    end
-  end
-
 end

data/test/support/postgresql/import_examples.rb

@@ -19,7 +19,6 @@ def should_support_postgresql_import_functionality
     end
 
     describe "importing objects with associations" do
-
       let(:new_topics) { Build(num_topics, :topic_with_book) }
       let(:new_topics_with_invalid_chapter) {
          chapter = new_topics.first.books.first.chapters.first
@@ -31,6 +30,8 @@ def should_support_postgresql_import_functionality
       let(:num_chapters) {18}
       let(:num_endnotes) {24}
 
+      let(:new_question_with_rule) { FactoryGirl.build :question, :with_rule }
+
       it 'imports top level' do
         assert_difference "Topic.count", +num_topics do
           Topic.import new_topics, :recursive => true
@@ -83,6 +84,12 @@ def should_support_postgresql_import_functionality
         end
       end
 
+      it 'imports has_one associations' do
+        assert_difference 'Rule.count' do
+          Question.import [new_question_with_rule], recursive: true
+        end
+      end
+
       # These models dont validate associated.  So we expect that books and topics get inserted, but not chapters
       # Putting a transaction around everything wouldn't work, so if you want your chapters to prevent topics from
       # being created, you would need to have validates_associated in your models and insert with validation
@@ -127,3 +134,151 @@ def should_support_postgresql_import_functionality
     end
   end
 end
+
+def should_support_postgresql_upsert_functionality
+  should_support_basic_on_duplicate_key_update
+
+  describe "#import" do
+    extend ActiveSupport::TestCase::ImportAssertions
+
+    macro(:perform_import){ raise "supply your own #perform_import in a context below" }
+    macro(:updated_topic){ Topic.find(@topic.id) }
+
+    context "with :on_duplicate_key_ignore and validation checks turned off" do
+      let(:columns){  %w( id title author_name author_email_address parent_id ) }
+      let(:values){ [ [ 99, "Book", "John Doe", "john@doe.com", 17 ] ] }
+      let(:updated_values){ [ [ 99, "Book - 2nd Edition", "Author Should Not Change", "johndoe@example.com", 57 ] ] }
+
+      macro(:perform_import) do |*opts|
+        Topic.import columns, updated_values, opts.extract_options!.merge(:on_duplicate_key_ignore => value, :validate => false)
+      end
+
+      setup do
+        Topic.import columns, values, :validate => false
+        @topic = Topic.find 99
+      end
+
+      context "using true" do
+        let(:value){ true }
+        should_not_update_updated_at_on_timestamp_columns
+      end
+
+      context "using hash with :conflict_target" do
+        let(:value){ { conflict_target: :id } }
+        should_not_update_updated_at_on_timestamp_columns
+      end
+
+      context "using hash with :constraint_target" do
+        let(:value){ { constraint_name: :topics_pkey } }
+        should_not_update_updated_at_on_timestamp_columns
+      end
+    end
+
+    context "with :on_duplicate_key_update and validation checks turned off" do
+      asssertion_group(:should_support_on_duplicate_key_update) do
+        should_not_update_fields_not_mentioned
+        should_update_foreign_keys
+        should_not_update_created_at_on_timestamp_columns
+        should_update_updated_at_on_timestamp_columns
+      end
+
+      context "using a hash" do
+        context "with :columns a hash" do
+          let(:columns){  %w( id title author_name author_email_address parent_id ) }
+          let(:values){ [ [ 99, "Book", "John Doe", "john@doe.com", 17 ] ] }
+          let(:updated_values){ [ [ 99, "Book - 2nd Edition", "Author Should Not Change", "johndoe@example.com", 57 ] ] }
+
+          macro(:perform_import) do |*opts|
+            Topic.import columns, updated_values, opts.extract_options!.merge(:on_duplicate_key_update => { :conflict_target => :id, :columns => update_columns }, :validate => false)
+          end
+
+          setup do
+            Topic.import columns, values, :validate => false
+            @topic = Topic.find 99
+          end
+
+          context "using string hash map" do
+            let(:update_columns){ { "title" => "title", "author_email_address" => "author_email_address", "parent_id" => "parent_id" } }
+            should_support_on_duplicate_key_update
+            should_update_fields_mentioned
+          end
+
+          context "using string hash map, but specifying column mismatches" do
+            let(:update_columns){ { "title" => "author_email_address", "author_email_address" => "title", "parent_id" => "parent_id" } }
+            should_support_on_duplicate_key_update
+            should_update_fields_mentioned_with_hash_mappings
+          end
+
+          context "using symbol hash map" do
+            let(:update_columns){ { :title => :title, :author_email_address => :author_email_address, :parent_id => :parent_id } }
+            should_support_on_duplicate_key_update
+            should_update_fields_mentioned
+          end
+
+          context "using symbol hash map, but specifying column mismatches" do
+            let(:update_columns){ { :title => :author_email_address, :author_email_address => :title, :parent_id => :parent_id } }
+            should_support_on_duplicate_key_update
+            should_update_fields_mentioned_with_hash_mappings
+          end
+        end
+
+        context "with :constraint_name" do
+          let(:columns){  %w( id title author_name author_email_address parent_id ) }
+          let(:values){ [ [ 100, "Book", "John Doe", "john@doe.com", 17 ] ] }
+          let(:updated_values){ [ [ 100, "Book - 2nd Edition", "Author Should Not Change", "johndoe@example.com", 57 ] ] }
+
+          macro(:perform_import) do |*opts|
+            Topic.import columns, updated_values, opts.extract_options!.merge(:on_duplicate_key_update => { :constraint_name => :topics_pkey, :columns => update_columns }, :validate => false)
+          end
+
+          setup do
+            Topic.import columns, values, :validate => false
+            @topic = Topic.find 100
+          end
+
+          let(:update_columns){ [ :title, :author_email_address, :parent_id ] }
+          should_support_on_duplicate_key_update
+          should_update_fields_mentioned
+        end
+
+        context "with no :conflict_target or :constraint_name" do
+          let(:columns){  %w( id title author_name author_email_address parent_id ) }
+          let(:values){ [ [ 100, "Book", "John Doe", "john@doe.com", 17 ] ] }
+          let(:updated_values){ [ [ 100, "Book - 2nd Edition", "Author Should Not Change", "johndoe@example.com", 57 ] ] }
+
+          macro(:perform_import) do |*opts|
+            Topic.import columns, updated_values, opts.extract_options!.merge(:on_duplicate_key_update => { :columns => update_columns }, :validate => false)
+          end
+
+          setup do
+            Topic.import columns, values, :validate => false
+            @topic = Topic.find 100
+          end
+
+          context "default to the primary key" do
+            let(:update_columns){ [ :title, :author_email_address, :parent_id ] }
+            should_support_on_duplicate_key_update
+            should_update_fields_mentioned
+          end
+        end
+
+        context "with no :columns" do
+          let(:columns){  %w( id title author_name author_email_address ) }
+          let(:values){ [ [ 100, "Book", "John Doe", "john@doe.com" ] ] }
+          let(:updated_values){ [ [ 100, "Title Should Not Change", "Author Should Not Change", "john@nogo.com" ] ] }
+
+          macro(:perform_import) do |*opts|
+            Topic.import columns, updated_values, opts.extract_options!.merge(:on_duplicate_key_update => { :conflict_target => :id }, :validate => false)
+          end
+
+          setup do
+            Topic.import columns, values, :validate => false
+            @topic = Topic.find 100
+          end
+
+          should_update_updated_at_on_timestamp_columns
+        end
+      end
+    end
+  end
+end