diff --git a/benchmarks/lib/cli_parser.rb b/benchmarks/lib/cli_parser.rb index 84590e55..ee88a46c 100644 --- a/benchmarks/lib/cli_parser.rb +++ b/benchmarks/lib/cli_parser.rb @@ -38,7 +38,7 @@ def self.print_valid_table_types( options, hsh={:prefix=>''} ) def self.parse( args ) options = OpenStruct.new( - :adapter => 'mysql', + :adapter => 'mysql2', :table_types => {}, :delete_on_finish => true, :number_of_objects => [], diff --git a/lib/activerecord-import/active_record/adapters/em_mysql2_adapter.rb b/lib/activerecord-import/active_record/adapters/em_mysql2_adapter.rb deleted file mode 100644 index 03d5bc58..00000000 --- a/lib/activerecord-import/active_record/adapters/em_mysql2_adapter.rb +++ /dev/null @@ -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 diff --git a/lib/activerecord-import/active_record/adapters/mysql_adapter.rb b/lib/activerecord-import/active_record/adapters/mysql_adapter.rb deleted file mode 100644 index b21ec636..00000000 --- a/lib/activerecord-import/active_record/adapters/mysql_adapter.rb +++ /dev/null @@ -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 diff --git a/lib/activerecord-import/base.rb b/lib/activerecord-import/base.rb index b8843e61..49d8a453 100644 --- a/lib/activerecord-import/base.rb +++ b/lib/activerecord-import/base.rb @@ -7,7 +7,6 @@ module ActiveRecord::Import def self.base_adapter(adapter) case adapter - when 'mysqlspatial' then 'mysql' when 'mysql2spatial' then 'mysql2' when 'spatialite' then 'sqlite3' when 'postgis' then 'postgresql' diff --git a/lib/activerecord-import/em_mysql2.rb b/lib/activerecord-import/em_mysql2.rb deleted file mode 100644 index 852b8ffd..00000000 --- a/lib/activerecord-import/em_mysql2.rb +++ /dev/null @@ -1,7 +0,0 @@ -warn <<-MSG -[DEPRECATION] loading activerecord-import via 'require "activerecord-import/"' - 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" diff --git a/lib/activerecord-import/mysql.rb b/lib/activerecord-import/mysql.rb deleted file mode 100644 index 852b8ffd..00000000 --- a/lib/activerecord-import/mysql.rb +++ /dev/null @@ -1,7 +0,0 @@ -warn <<-MSG -[DEPRECATION] loading activerecord-import via 'require "activerecord-import/"' - 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" diff --git a/test/em_mysql2/import_test.rb b/test/em_mysql2/import_test.rb deleted file mode 100644 index 191f6e1a..00000000 --- a/test/em_mysql2/import_test.rb +++ /dev/null @@ -1,6 +0,0 @@ -require File.expand_path(File.dirname(__FILE__) + '/../test_helper') - -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 diff --git a/test/mysql/import_test.rb b/test/mysql/import_test.rb deleted file mode 100644 index 227d1ace..00000000 --- a/test/mysql/import_test.rb +++ /dev/null @@ -1,5 +0,0 @@ -require File.expand_path(File.dirname(__FILE__) + '/../test_helper') -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 diff --git a/test/mysqlspatial/import_test.rb b/test/mysqlspatial/import_test.rb deleted file mode 100644 index 191f6e1a..00000000 --- a/test/mysqlspatial/import_test.rb +++ /dev/null @@ -1,6 +0,0 @@ -require File.expand_path(File.dirname(__FILE__) + '/../test_helper') - -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 diff --git a/test/support/em-synchrony_extensions.rb b/test/support/em-synchrony_extensions.rb deleted file mode 100644 index 2cd43655..00000000 --- a/test/support/em-synchrony_extensions.rb +++ /dev/null @@ -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