Merge branch 'spindance-master'

Gemfile

@@ -4,6 +4,7 @@ gemspec
 
 # Database Adapters
 platforms :ruby do
+  gem "em-synchrony",           "~> 1.0.3"
   gem "mysql2",                 "~> 0.3.0"
   gem "pg",                     "~> 0.9"
   gem "sqlite3-ruby",           "~> 1.3.1"

Rakefile

@@ -13,7 +13,7 @@ namespace :display do
 end
 task :default => ["display:notice"]
 
-ADAPTERS = %w(mysql mysql2 jdbcmysql postgresql sqlite3 seamless_database_pool mysqlspatial mysql2spatial spatialite postgis)
+ADAPTERS = %w(mysql mysql2 em_mysql2 jdbcmysql postgresql sqlite3 seamless_database_pool mysqlspatial mysql2spatial spatialite postgis)
 ADAPTERS.each do |adapter|
   namespace :test do
     desc "Runs #{adapter} database tests."

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

@@ -0,0 +1,8 @@
+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

lib/activerecord-import/adapters/em_mysql2_adapter.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + "/mysql_adapter"
+
+module ActiveRecord::Import::EMMysql2Adapter
+  include ActiveRecord::Import::MysqlAdapter
+end

lib/activerecord-import/em_mysql2.rb

@@ -0,0 +1,7 @@
+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 File.expand_path(File.join(File.dirname(__FILE__),  "/../activerecord-import"))

test/adapters/em_mysql2.rb

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

test/database.yml.sample

@@ -15,6 +15,11 @@ mysql2: &mysql2
   adapter: mysql2
   strict: false
 
+em_mysql2:
+  <<: *common
+  adapter: em_mysql2
+  pool: 5
+
 mysqlspatial:
   adapter: mysql
   strict: false

test/em_mysql2/import_test.rb

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