activerecord-import 0.11.0 → 0.12.0

data/test/support/shared_examples/on_duplicate_key_update.rb

@@ -0,0 +1,92 @@
+def 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_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
+
+      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 => update_columns , :validate => false)
+      end
+
+      setup do
+        Topic.import columns, values, :validate => false
+        @topic = Topic.find 99
+      end
+
+      context "using an empty array" do
+        let(:update_columns){ [] }
+        should_not_update_fields_not_mentioned
+        should_update_updated_at_on_timestamp_columns
+      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
+    end
+
+    context "with a table that has a non-standard primary key" do
+      let(:columns){ [ :promotion_id, :code ] }
+      let(:values){ [ [ 1, 'DISCOUNT1' ] ] }
+      let(:updated_values){ [ [ 1, 'DISCOUNT2'] ] }
+      let(:update_columns){ [ :code ] }
+
+      macro(:perform_import) do |*opts|
+        Promotion.import columns, updated_values, opts.extract_options!.merge(:on_duplicate_key_update => update_columns, :validate => false)
+      end
+      macro(:updated_promotion){ Promotion.find(@promotion.promotion_id) }
+
+      setup do
+        Promotion.import columns, values, :validate => false
+        @promotion = Promotion.find 1
+      end
+
+      it "should update specified columns" do
+        perform_import
+        assert_equal 'DISCOUNT2', updated_promotion.code
+      end
+    end
+
+    context "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 ] ] }
+
+      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
+
+      setup do
+        Topic.import columns, values, :validate => false
+        @topic = Topic.find 100
+      end
+
+      it "should raise ActiveRecord::RecordNotUnique" do
+        assert_raise ActiveRecord::RecordNotUnique do
+          perform_import
+        end
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -10,7 +10,7 @@ ENV["RAILS_ENV"] = "test"
 require "bundler"
 Bundler.setup
 
-require 'pry'
+require 'pry' unless RbConfig::CONFIG["RUBY_INSTALL_NAME"] =~ /jruby/
 
 require "active_record"
 require "active_record/fixtures"
@@ -55,3 +55,7 @@ Dir[File.dirname(__FILE__) + "/models/*.rb"].each{ |file| require file }
 
 # Prevent this deprecation warning from breaking the tests.
 Rake::FileList.send(:remove_method, :import)
+
+if ENV['AR_VERSION'].to_f >= 4.2
+  ActiveSupport::TestCase.test_order = :sorted
+end

data/test/travis/build.sh

@@ -1,22 +1,26 @@
 #!/bin/bash
-set -e
-set +x
+# set -e
+# set +x
 
 function run {
-  echo "Running: AR_VERSION=$AR_VERSION $@"
-  $@
+  statement=$@
+  logfile=$4.log
+  $statement &> $logfile
+  if [ $? != 0 ] ; then
+    printf "AR_VERSION=$AR_VERSION $statement \e[31mFAILED\e[0m\n"
+    cat $logfile
+  else
+    printf "AR_VERSION=$AR_VERSION $statement \e[32mPASSED\e[0m\n"
+  fi
 }
 
 for activerecord_version in "3.1" "3.2" "4.0" "4.1" "4.2" "5.0" ; do
   export AR_VERSION=$activerecord_version
 
-  bundle update activerecord
+  bundle update activerecord > /dev/null
 
-  run bundle exec rake test:em_mysql2               # Run tests for em_mysql2
-  run bundle exec rake test:mysql                   # Run tests for mysql
   run bundle exec rake test:mysql2                  # Run tests for mysql2
   run bundle exec rake test:mysql2spatial           # Run tests for mysql2spatial
-  run bundle exec rake test:mysqlspatial            # Run tests for mysqlspatial
   run bundle exec rake test:postgis                 # Run tests for postgis
   run bundle exec rake test:postgresql              # Run tests for postgresql
   run bundle exec rake test:seamless_database_pool  # Run tests for seamless_database_pool

data/test/travis/database.yml

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -49,6 +49,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Brewfile
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.markdown
@@ -59,7 +60,7 @@ files:
 - benchmarks/lib/base.rb
 - benchmarks/lib/cli_parser.rb
 - benchmarks/lib/float.rb
-- benchmarks/lib/mysql_benchmark.rb
+- benchmarks/lib/mysql2_benchmark.rb
 - benchmarks/lib/output_to_csv.rb
 - benchmarks/lib/output_to_html.rb
 - benchmarks/models/test_innodb.rb
@@ -74,11 +75,9 @@ files:
 - gemfiles/5.0.gemfile
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
-- lib/activerecord-import/active_record/adapters/em_mysql2_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcpostgresql_adapter.rb
 - lib/activerecord-import/active_record/adapters/mysql2_adapter.rb
-- lib/activerecord-import/active_record/adapters/mysql_adapter.rb
 - lib/activerecord-import/active_record/adapters/postgresql_adapter.rb
 - lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb
 - lib/activerecord-import/active_record/adapters/sqlite3_adapter.rb
@@ -89,29 +88,23 @@ files:
 - lib/activerecord-import/adapters/postgresql_adapter.rb
 - lib/activerecord-import/adapters/sqlite3_adapter.rb
 - lib/activerecord-import/base.rb
-- lib/activerecord-import/em_mysql2.rb
 - lib/activerecord-import/import.rb
-- lib/activerecord-import/mysql.rb
 - lib/activerecord-import/mysql2.rb
 - lib/activerecord-import/postgresql.rb
 - lib/activerecord-import/sqlite3.rb
 - lib/activerecord-import/synchronize.rb
 - lib/activerecord-import/value_sets_parser.rb
 - lib/activerecord-import/version.rb
-- test/adapters/em_mysql2.rb
 - test/adapters/jdbcmysql.rb
 - test/adapters/jdbcpostgresql.rb
-- test/adapters/mysql.rb
 - test/adapters/mysql2.rb
 - test/adapters/mysql2spatial.rb
-- test/adapters/mysqlspatial.rb
 - test/adapters/postgis.rb
 - test/adapters/postgresql.rb
 - test/adapters/seamless_database_pool.rb
 - test/adapters/spatialite.rb
 - test/adapters/sqlite3.rb
 - test/database.yml.sample
-- test/em_mysql2/import_test.rb
 - test/import_test.rb
 - test/jdbcmysql/import_test.rb
 - test/jdbcpostgresql/import_test.rb
@@ -119,11 +112,12 @@ files:
 - test/models/chapter.rb
 - test/models/end_note.rb
 - test/models/group.rb
+- test/models/promotion.rb
+- test/models/question.rb
+- test/models/rule.rb
 - test/models/topic.rb
 - test/models/widget.rb
-- test/mysql/import_test.rb
 - test/mysql2/import_test.rb
-- test/mysqlspatial/import_test.rb
 - test/mysqlspatial2/import_test.rb
 - test/postgis/import_test.rb
 - test/postgresql/import_test.rb
@@ -132,12 +126,12 @@ files:
 - test/schema/version.rb
 - test/sqlite3/import_test.rb
 - test/support/active_support/test_case_extensions.rb
-- test/support/em-synchrony_extensions.rb
+- test/support/assertions.rb
 - test/support/factories.rb
 - test/support/generate.rb
-- test/support/mysql/assertions.rb
 - test/support/mysql/import_examples.rb
 - test/support/postgresql/import_examples.rb
+- test/support/shared_examples/on_duplicate_key_update.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
 - test/travis/build.sh
@@ -169,20 +163,16 @@ signing_key:
 specification_version: 4
 summary: Bulk-loading extension for ActiveRecord
 test_files:
-- test/adapters/em_mysql2.rb
 - test/adapters/jdbcmysql.rb
 - test/adapters/jdbcpostgresql.rb
-- test/adapters/mysql.rb
 - test/adapters/mysql2.rb
 - test/adapters/mysql2spatial.rb
-- test/adapters/mysqlspatial.rb
 - test/adapters/postgis.rb
 - test/adapters/postgresql.rb
 - test/adapters/seamless_database_pool.rb
 - test/adapters/spatialite.rb
 - test/adapters/sqlite3.rb
 - test/database.yml.sample
-- test/em_mysql2/import_test.rb
 - test/import_test.rb
 - test/jdbcmysql/import_test.rb
 - test/jdbcpostgresql/import_test.rb
@@ -190,11 +180,12 @@ test_files:
 - test/models/chapter.rb
 - test/models/end_note.rb
 - test/models/group.rb
+- test/models/promotion.rb
+- test/models/question.rb
+- test/models/rule.rb
 - test/models/topic.rb
 - test/models/widget.rb
-- test/mysql/import_test.rb
 - test/mysql2/import_test.rb
-- test/mysqlspatial/import_test.rb
 - test/mysqlspatial2/import_test.rb
 - test/postgis/import_test.rb
 - test/postgresql/import_test.rb
@@ -203,12 +194,12 @@ test_files:
 - test/schema/version.rb
 - test/sqlite3/import_test.rb
 - test/support/active_support/test_case_extensions.rb
-- test/support/em-synchrony_extensions.rb
+- test/support/assertions.rb
 - test/support/factories.rb
 - test/support/generate.rb
-- test/support/mysql/assertions.rb
 - test/support/mysql/import_examples.rb
 - test/support/postgresql/import_examples.rb
+- test/support/shared_examples/on_duplicate_key_update.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
 - test/travis/build.sh

data/lib/activerecord-import/active_record/adapters/em_mysql2_adapter.rb

@@ -1,8 +0,0 @@
-require "em-synchrony"
-require "em-synchrony/mysql2"
-require "em-synchrony/activerecord"
-require "activerecord-import/adapters/em_mysql2_adapter"
-
-class ActiveRecord::ConnectionAdapters::EMMysql2Adapter
-  include ActiveRecord::Import::EMMysql2Adapter
-end

data/lib/activerecord-import/active_record/adapters/mysql_adapter.rb

@@ -1,6 +0,0 @@
-require "active_record/connection_adapters/mysql_adapter"
-require "activerecord-import/adapters/mysql_adapter"
-
-class ActiveRecord::ConnectionAdapters::MysqlAdapter
-  include ActiveRecord::Import::MysqlAdapter
-end

data/lib/activerecord-import/em_mysql2.rb

@@ -1,7 +0,0 @@
-warn <<-MSG
-[DEPRECATION] loading activerecord-import via 'require "activerecord-import/<adapter-name>"'
-  is deprecated. Update to autorequire using 'require "activerecord-import"'. See
-  http://github.com/zdennis/activerecord-import/wiki/Requiring for more information
-MSG
-
-require "activerecord-import"

data/lib/activerecord-import/mysql.rb

@@ -1,7 +0,0 @@
-warn <<-MSG
-[DEPRECATION] loading activerecord-import via 'require "activerecord-import/<adapter-name>"'
-  is deprecated. Update to autorequire using 'require "activerecord-import"'. See
-  http://github.com/zdennis/activerecord-import/wiki/Requiring for more information
-MSG
-
-require "activerecord-import"

data/test/adapters/em_mysql2.rb

@@ -1 +0,0 @@
-ENV["ARE_DB"] = "em_mysql2"

data/test/adapters/mysql.rb

@@ -1 +0,0 @@
-ENV["ARE_DB"] = "mysql"

data/test/adapters/mysqlspatial.rb

@@ -1 +0,0 @@
-ENV["ARE_DB"] = "mysqlspatial"

data/test/em_mysql2/import_test.rb

@@ -1,6 +0,0 @@
-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/mysql/import_examples')
-
-should_support_mysql_import_functionality

data/test/mysql/import_test.rb

@@ -1,6 +0,0 @@
-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/mysql/import_examples')
-
-should_support_mysql_import_functionality

data/test/mysqlspatial/import_test.rb

@@ -1,6 +0,0 @@
-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/mysql/import_examples')
-
-should_support_mysql_import_functionality

data/test/support/em-synchrony_extensions.rb

@@ -1,13 +0,0 @@
-if defined?(EM::Synchrony) && ActiveRecord::VERSION::STRING >= "4.0"
-  module EM::Synchrony
-    module ActiveRecord
-      module Adapter
-        def reset_transaction
-          @transaction_manager = ::ActiveRecord::ConnectionAdapters::TransactionManager.new(self)
-        end
-
-        delegate :open_transactions, :current_transaction, :begin_transaction, :commit_transaction, :rollback_transaction, to: :transaction_manager
-      end
-    end
-  end
-end