diff options
Diffstat (limited to 'activerecord/test/support')
| -rw-r--r-- | activerecord/test/support/connection.rb | 6 | ||||
| -rw-r--r-- | activerecord/test/support/mysql.rb | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/activerecord/test/support/connection.rb b/activerecord/test/support/connection.rb index 92736e0ca9..196b3a9493 100644 --- a/activerecord/test/support/connection.rb +++ b/activerecord/test/support/connection.rb @@ -13,9 +13,9 @@ module ARTest def self.connect puts "Using #{connection_name}" - ActiveRecord::Model.logger = ActiveSupport::Logger.new("debug.log") - ActiveRecord::Model.configurations = connection_config - ActiveRecord::Model.establish_connection 'arunit' + ActiveRecord::Base.logger = ActiveSupport::Logger.new("debug.log", 0, 100 * 1024 * 1024) + ActiveRecord::Base.configurations = connection_config + ActiveRecord::Base.establish_connection 'arunit' ARUnit2Model.establish_connection 'arunit2' end end diff --git a/activerecord/test/support/mysql.rb b/activerecord/test/support/mysql.rb deleted file mode 100644 index 7a66415e64..0000000000 --- a/activerecord/test/support/mysql.rb +++ /dev/null @@ -1,11 +0,0 @@ -if defined?(Mysql) - class Mysql - class Error - # This monkey patch fixes annoy warning with mysql-2.8.1.gem when executing testcases. - def errno_with_fix_warnings - silence_warnings { errno_without_fix_warnings } - end - alias_method_chain :errno, :fix_warnings - end - end -end |