diff --git a/lib/activerecord-import/mysql.rb b/lib/activerecord-import/mysql.rb index 3c1d355..48f7fdc 100644 --- a/lib/activerecord-import/mysql.rb +++ b/lib/activerecord-import/mysql.rb @@ -1,2 +1,8 @@ +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 File.expand_path(File.join(File.dirname(__FILE__), "/../activerecord-import")) diff --git a/lib/activerecord-import/mysql2.rb b/lib/activerecord-import/mysql2.rb index 3c1d355..48f7fdc 100644 --- a/lib/activerecord-import/mysql2.rb +++ b/lib/activerecord-import/mysql2.rb @@ -1,2 +1,8 @@ +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 File.expand_path(File.join(File.dirname(__FILE__), "/../activerecord-import")) diff --git a/lib/activerecord-import/postgresql.rb b/lib/activerecord-import/postgresql.rb index 3c1d355..48f7fdc 100644 --- a/lib/activerecord-import/postgresql.rb +++ b/lib/activerecord-import/postgresql.rb @@ -1,2 +1,8 @@ +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 File.expand_path(File.join(File.dirname(__FILE__), "/../activerecord-import")) diff --git a/lib/activerecord-import/sqlite3.rb b/lib/activerecord-import/sqlite3.rb index 3c1d355..48f7fdc 100644 --- a/lib/activerecord-import/sqlite3.rb +++ b/lib/activerecord-import/sqlite3.rb @@ -1,2 +1,8 @@ +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 File.expand_path(File.join(File.dirname(__FILE__), "/../activerecord-import")) diff --git a/test/mysql/import_test.rb b/test/mysql/import_test.rb index 37201d1..274fcee 100644 --- a/test/mysql/import_test.rb +++ b/test/mysql/import_test.rb @@ -1,4 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper') -require "activerecord-import/mysql" + +require "test/support/mysql/assertions" +require "test/support/mysql/import_examples" should_support_mysql_import_functionality \ No newline at end of file diff --git a/test/mysql2/import_test.rb b/test/mysql2/import_test.rb index b3587b4..274fcee 100644 --- a/test/mysql2/import_test.rb +++ b/test/mysql2/import_test.rb @@ -1,5 +1,4 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper') -require "activerecord-import/mysql2" require "test/support/mysql/assertions" require "test/support/mysql/import_examples"