Ticket #1792: warning.megapatch.2

Index: actionmailer/test/mail_service_test.rb
===================================================================
--- actionmailer/test/mail_service_test.rb      (revision 1873)
+++ actionmailer/test/mail_service_test.rb      (working copy)
@@ -18,8 +18,11 @@
 end
 
 class Net::SMTP
-  def self.start(*args)
-    yield MockSMTP.new
+  class << self
+    alias old_start start
+    def start(*args)
+      yield MockSMTP.new
+    end
   end
 end
 
Index: actionmailer/Rakefile
===================================================================
--- actionmailer/Rakefile       (revision 1873)
+++ actionmailer/Rakefile       (working copy)
@@ -24,6 +24,7 @@
   t.libs << "test"
   t.pattern = 'test/*_test.rb'
   t.verbose = true
+  t.warning = true
 }
 
 
@@ -194,4 +195,4 @@
       first_file = false
     end
   end
-end
\ No newline at end of file
+end
Index: actionmailer/lib/action_mailer/adv_attr_accessor.rb
===================================================================
--- actionmailer/lib/action_mailer/adv_attr_accessor.rb (revision 1873)
+++ actionmailer/lib/action_mailer/adv_attr_accessor.rb (working copy)
@@ -26,31 +26,3 @@
   end
 end
 
-module ActionMailer
-  module AdvAttrAccessor #:nodoc:
-    def self.append_features(base)
-      super
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods #:nodoc:
-      def adv_attr_accessor(*names)
-        names.each do |name|
-          define_method("#{name}=") do |value|
-            instance_variable_set("@#{name}", value)
-          end
-
-          define_method(name) do |*parameters|
-            raise ArgumentError, "expected 0 or 1 parameters" unless parameters.length <= 1
-            if parameters.empty?
-              instance_variable_get("@#{name}")
-            else
-              instance_variable_set("@#{name}", parameters.first)
-            end
-          end
-        end
-      end
-
-    end
-  end
-end
Index: actionmailer/lib/action_mailer/quoting.rb
===================================================================
--- actionmailer/lib/action_mailer/quoting.rb   (revision 1873)
+++ actionmailer/lib/action_mailer/quoting.rb   (working copy)
@@ -46,54 +46,3 @@
     end
   end
 end
-
-module ActionMailer
-  module Quoting #:nodoc:
-    # Convert the given text into quoted printable format, with an instruction
-    # that the text be eventually interpreted in the given charset.
-    def quoted_printable(text, charset)
-      text = text.gsub( /[^a-z ]/i ) { "=%02x" % $&[0] }.gsub( / /, "_" )
-      "=?#{charset}?Q?#{text}?="
-    end
-
-    # A quick-and-dirty regexp for determining whether a string contains any
-    # characters that need escaping.
-    if !defined?(CHARS_NEEDING_QUOTING)
-      CHARS_NEEDING_QUOTING = /[\000-\011\013\014\016-\037\177-\377]/
-    end
-
-    # Quote the given text if it contains any "illegal" characters
-    def quote_if_necessary(text, charset)
-      (text =~ CHARS_NEEDING_QUOTING) ?
-        quoted_printable(text, charset) :
-        text
-    end
-
-    # Quote any of the given strings if they contain any "illegal" characters
-    def quote_any_if_necessary(charset, *args)
-      args.map { |v| quote_if_necessary(v, charset) }
-    end
-
-    # Quote the given address if it needs to be. The address may be a
-    # regular email address, or it can be a phrase followed by an address in
-    # brackets. The phrase is the only part that will be quoted, and only if
-    # it needs to be. This allows extended characters to be used in the
-    # "to", "from", "cc", and "bcc" headers.
-    def quote_address_if_necessary(address, charset)
-      if Array === address
-        address.map { |a| quote_address_if_necessary(a, charset) }
-      elsif address =~ /^(\S.*)\s+(<.*>)$/
-        address = $2
-        phrase = quote_if_necessary($1.gsub(/^['"](.*)['"]$/, '\1'), charset)
-        "\"#{phrase}\" #{address}"
-      else
-        address
-      end
-    end
-
-    # Quote any of the given addresses, if they need to be.
-    def quote_any_address_if_necessary(charset, *args)
-      args.map { |v| quote_address_if_necessary(v, charset) }
-    end
-  end
-end
Index: actionmailer/lib/action_mailer/vendor/text/format.rb
===================================================================
--- actionmailer/lib/action_mailer/vendor/text/format.rb        (revision 1873)
+++ actionmailer/lib/action_mailer/vendor/text/format.rb        (working copy)
@@ -831,7 +831,7 @@
 
     def __create(arg = nil, &block) #:nodoc:
         # Format::Text.new(text-to-wrap)
-      @text = arg unless arg.nil?
+      @text = arg.nil? ? nil : arg
         # Defaults
       @columns          = 72
       @tabstop          = 8
Index: actionmailer/lib/action_mailer/vendor/tmail/facade.rb
===================================================================
--- actionmailer/lib/action_mailer/vendor/tmail/facade.rb       (revision 1873)
+++ actionmailer/lib/action_mailer/vendor/tmail/facade.rb       (working copy)
@@ -464,6 +464,8 @@
     ### utils
     ###
 
+    alias old_create_reply create_reply
+
     def create_reply
       mail = TMail::Mail.parse('')
       mail.subject = 'Re: ' + subject('').sub(/\A(?:\[[^\]]+\])?(?:\s*Re:)*\s*/i, '')
Index: activesupport/test/inflector_test.rb
===================================================================
--- activesupport/test/inflector_test.rb        (revision 1873)
+++ activesupport/test/inflector_test.rb        (working copy)
@@ -1,5 +1,5 @@
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/active_support/inflector'
+require File.dirname(__FILE__) + '/../lib/active_support/inflector' unless defined? Inflector
 
 module Ace
   module Base
Index: activesupport/test/core_ext/string_ext_test.rb
===================================================================
--- activesupport/test/core_ext/string_ext_test.rb      (revision 1873)
+++ activesupport/test/core_ext/string_ext_test.rb      (working copy)
@@ -1,11 +1,8 @@
 require 'test/unit'
 require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/string'
-require File.dirname(__FILE__) + '/../../lib/active_support/misc'
+require File.dirname(__FILE__) + '/../../lib/active_support/misc' unless defined? silence_warnings
+require File.dirname(__FILE__) + '/../inflector_test' unless defined? InflectorTest
 
-silence_warnings do
-  require File.dirname(__FILE__) + '/../inflector_test'
-end
-
 class StringInflectionsTest < Test::Unit::TestCase
   def test_pluralize
     InflectorTest::SingularToPlural.each do |singular, plural|
Index: activesupport/test/misc_test.rb
===================================================================
--- activesupport/test/misc_test.rb     (revision 1873)
+++ activesupport/test/misc_test.rb     (working copy)
@@ -1,5 +1,5 @@
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/active_support/misc'
+require File.dirname(__FILE__) + '/../lib/active_support/misc' unless defined?  silence_warnings
 
 class MiscTest < Test::Unit::TestCase
   def test_silence_warnings
Index: activesupport/Rakefile
===================================================================
--- activesupport/Rakefile      (revision 1873)
+++ activesupport/Rakefile      (working copy)
@@ -16,6 +16,7 @@
 task :default => :test
 Rake::TestTask.new { |t| 
   t.pattern = 'test/**/*_test.rb'
+  t.warning = true
 }
 
 # Create compressed packages
@@ -180,4 +181,4 @@
       first_file = false
     end
   end
-end
\ No newline at end of file
+end
Index: activesupport/lib/active_support/breakpoint.rb
===================================================================
--- activesupport/lib/active_support/breakpoint.rb      (revision 1873)
+++ activesupport/lib/active_support/breakpoint.rb      (working copy)
@@ -16,7 +16,7 @@
 # license please contact me.
 
 require 'irb'
-require File.dirname(__FILE__) + '/binding_of_caller'
+require File.dirname(__FILE__) + '/binding_of_caller' unless defined? Binding.of_caller
 require 'drb'
 require 'drb/acl'
 
@@ -460,6 +460,10 @@
       old_CurrentContext
     end
   end
+  class << self
+    alias old_parse_opts parse_opts
+    remove_method :parse_opts
+  end
   def IRB.parse_opts() end
 
   class Context #:nodoc:
Index: activesupport/lib/active_support/class_inheritable_attributes.rb
===================================================================
--- activesupport/lib/active_support/class_inheritable_attributes.rb    (revision 1873)
+++ activesupport/lib/active_support/class_inheritable_attributes.rb    (working copy)
@@ -113,5 +113,8 @@
     if respond_to?(:inherited)
       alias_method :inherited_without_inheritable_attributes, :inherited
     end
-    alias_method :inherited, :inherited_with_inheritable_attributes
+
+    alias old_inherited inherited
+    alias inherited inherited_with_inheritable_attributes
+
 end
Index: activesupport/lib/active_support/clean_logger.rb
===================================================================
--- activesupport/lib/active_support/clean_logger.rb    (revision 1873)
+++ activesupport/lib/active_support/clean_logger.rb    (working copy)
@@ -12,7 +12,8 @@
   private
     remove_const "Format"
     Format = "%s\n"
+    alias old_format_message format_message
     def format_message(severity, timestamp, msg, progname)
       Format % [msg]
     end
-end
\ No newline at end of file
+end
Index: activesupport/lib/active_support/core_ext/integer/inflections.rb
===================================================================
--- activesupport/lib/active_support/core_ext/integer/inflections.rb    (revision 1873)
+++ activesupport/lib/active_support/core_ext/integer/inflections.rb    (working copy)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../inflector'
+require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Integer #:nodoc:
Index: activesupport/lib/active_support/core_ext/string/inflections.rb
===================================================================
--- activesupport/lib/active_support/core_ext/string/inflections.rb     (revision 1873)
+++ activesupport/lib/active_support/core_ext/string/inflections.rb     (working copy)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../inflector'
+require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module String #:nodoc:
Index: activesupport/lib/active_support/dependencies.rb
===================================================================
--- activesupport/lib/active_support/dependencies.rb    (revision 1873)
+++ activesupport/lib/active_support/dependencies.rb    (working copy)
@@ -172,6 +172,9 @@
 Object.send(:define_method, :require_association) { |file_name| Dependencies.associate_with(file_name) }  unless Object.respond_to?(:require_association)
 
 class Module #:nodoc:
+
+  alias old_const_missing const_missing
+
   # Use const_missing to autoload associations so we don't have to
   # require_association when using single-table inheritance.
   def const_missing(class_id)
Index: activerecord/test/deprecated_associations_test.rb
===================================================================
--- activerecord/test/deprecated_associations_test.rb   (revision 1873)
+++ activerecord/test/deprecated_associations_test.rb   (working copy)
@@ -113,17 +113,6 @@
     assert_raises(RuntimeError) { !Company.find(3).firm?(Company.find(3)) } # "Summit shouldn't have itself as firm"
   end
 
-  def test_has_one
-    assert companies(:first_firm).account?(Account.find(1))
-    assert_equal Account.find(1).credit_limit, companies(:first_firm).account.credit_limit
-    assert companies(:first_firm).has_account?, "37signals should have an account"
-    assert Account.find(1).firm?(companies(:first_firm)), "37signals account should be able to backtrack"
-    assert Account.find(1).has_firm?, "37signals account should be able to backtrack"
-
-    assert !Account.find(2).has_firm?, "Unknown isn't linked"
-    assert !Account.find(2).firm?(companies(:first_firm)), "Unknown isn't linked"
-  end
-
   def test_has_many_dependence_on_account
     assert_equal 2, Account.find_all.length
     companies(:first_firm).destroy
@@ -317,12 +306,18 @@
 
   def test_has_one
     assert companies(:first_firm).account?(Account.find(1))
-    assert companies(:first_firm).has_account?, "37signals should have an account"
-    assert Account.find(1).firm?(companies(:first_firm)), "37signals account should be able to backtrack"
-    assert Account.find(1).has_firm?, "37signals account should be able to backtrack"
+    assert_equal(Account.find(1).credit_limit,
+                 companies(:first_firm).account.credit_limit)
+    assert(companies(:first_firm).has_account?,
+           "37signals should have an account")
+    assert(Account.find(1).firm?(companies(:first_firm)),
+           "37signals account should be able to backtrack")
+    assert(Account.find(1).has_firm?,
+           "37signals account should be able to backtrack")
 
     assert !Account.find(2).has_firm?, "Unknown isn't linked"
-    assert !Account.find(2).firm?(companies(:first_firm)), "Unknown isn't linked"
+    assert(!Account.find(2).firm?(companies(:first_firm)),
+           "Unknown isn't linked")
   end
 
   def test_has_one_build
Index: activerecord/test/associations_test.rb
===================================================================
--- activerecord/test/associations_test.rb      (revision 1873)
+++ activerecord/test/associations_test.rb      (working copy)
@@ -138,15 +138,6 @@
     assert_equal account, firm.account
   end
 
-  def test_failing_build_association
-    firm = Firm.new("name" => "GlobalMegaCorp")
-    firm.save
-
-    account = firm.build_account
-    assert !account.save
-    assert_equal "can't be empty", account.errors.on("credit_limit")
-  end
-
   def test_create_association
     firm = Firm.new("name" => "GlobalMegaCorp")
     firm.save
Index: activerecord/test/fixtures_test.rb
===================================================================
--- activerecord/test/fixtures_test.rb  (revision 1873)
+++ activerecord/test/fixtures_test.rb  (working copy)
@@ -125,14 +125,14 @@
   fixtures :topics, :developers, :accounts
 
   def test_without_complete_instantiation
-    assert_nil @first
-    assert_nil @topics
-    assert_nil @developers
-    assert_nil @accounts
+    assert !defined? @first
+    assert !defined? @topics
+    assert !defined? @developers
+    assert !defined? @accounts
   end
 
   def test_fixtures_from_root_yml_without_instantiation
-    assert_nil @unknown
+    assert !defined? @unknown
   end
 
   def test_accessor_methods
@@ -150,7 +150,7 @@
   fixtures :topics, :developers, :accounts
 
   def test_without_instance_instantiation
-    assert_nil @first
+    assert !defined? @first
     assert_not_nil @topics
     assert_not_nil @developers
     assert_not_nil @accounts
Index: activerecord/test/base_test.rb
===================================================================
--- activerecord/test/base_test.rb      (revision 1873)
+++ activerecord/test/base_test.rb      (working copy)
@@ -571,7 +571,7 @@
 
   def test_multiparameter_mass_assignment_protector
     task = Task.new
-    time = Time.mktime(0)
+    time = Time.at 1_234_567
     task.starting = time 
     attributes = { "starting(1i)" => "2004", "starting(2i)" => "6", "starting(3i)" => "24" }
     task.attributes = attributes
@@ -685,7 +685,7 @@
   def test_auto_id
     auto = AutoId.new
     auto.save
-    assert (auto.id > 0)
+    assert(auto.id > 0)
   end
   
   def quote_column_name(name)
@@ -780,7 +780,7 @@
     assert_equal 1, topics(:first, :reload).replies_count
 
     topics(:first).decrement(:replies_count).decrement!(:replies_count)
-    assert_equal -1, topics(:first, :reload).replies_count
+    assert_equal(-1, topics(:first, :reload).replies_count)
   end
   
   def test_toggle_attribute
Index: activerecord/test/deprecated_finder_test.rb
===================================================================
--- activerecord/test/deprecated_finder_test.rb (revision 1873)
+++ activerecord/test/deprecated_finder_test.rb (working copy)
@@ -4,16 +4,9 @@
 require 'fixtures/entrant'
 require 'fixtures/developer'
 
-class FinderTest < Test::Unit::TestCase
+class DeprecatedFinderTest < Test::Unit::TestCase
   fixtures :companies, :topics, :entrants, :developers
 
-  def test_find_all_with_limit
-    entrants = Entrant.find_all nil, "id ASC", 2
-    
-    assert_equal(2, entrants.size)
-    assert_equal(entrants(:first).name, entrants.first.name)
-  end
-
   def test_find_all_with_prepared_limit_and_offset
     if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
       if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
@@ -101,6 +94,11 @@
   end
 
   def test_find_all_with_limit
+    entrants = Entrant.find_all nil, "id ASC", 2
+    
+    assert_equal(2, entrants.size)
+    assert_equal(entrants(:first).name, entrants.first.name)
+
     first_five_developers = Developer.find_all nil, 'id ASC', 5
     assert_equal 5, first_five_developers.length
     assert_equal 'David', first_five_developers.first.name
Index: activerecord/test/migration_test.rb
===================================================================
--- activerecord/test/migration_test.rb (revision 1873)
+++ activerecord/test/migration_test.rb (working copy)
@@ -1,7 +1,5 @@
 require 'abstract_unit'
 require 'fixtures/person'
-require File.dirname(__FILE__) + '/fixtures/migrations/1_people_have_last_names'
-require File.dirname(__FILE__) + '/fixtures/migrations/2_we_need_reminders'
 
 if ActiveRecord::Base.connection.supports_migrations? 
 
@@ -67,7 +65,7 @@
       assert_equal TrueClass, bob.male?.class
     end
 
-    def test_add_remove_single_field
+    def test_zz_add_remove_single_field # last for autoloading
       assert !Person.column_methods_hash.include?(:last_name)
 
       PeopleHaveLastNames.up
@@ -116,7 +114,7 @@
       assert !Person.new.administrator?
     end    
 
-    def test_add_table
+    def test_zz_add_table # last for autoloading
       assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
     
       WeNeedReminders.up
@@ -198,4 +196,4 @@
       assert_equal "hello world", Reminder.find(:first).content
     end
   end
-end
\ No newline at end of file
+end
Index: activerecord/test/inheritance_test.rb
===================================================================
--- activerecord/test/inheritance_test.rb       (revision 1873)
+++ activerecord/test/inheritance_test.rb       (working copy)
@@ -138,6 +138,9 @@
         c.save
       end
     
-      def Company.inheritance_column() "ruby_type" end
+      class << Company
+        undef_method :inheritance_column
+        def inheritance_column() "ruby_type" end
+      end
     end
 end
Index: activerecord/test/finder_test.rb
===================================================================
--- activerecord/test/finder_test.rb    (revision 1873)
+++ activerecord/test/finder_test.rb    (working copy)
@@ -12,7 +12,7 @@
   end
   
   def test_exists
-    assert (Topic.exists?(1))
+    assert Topic.exists?(1)
     assert !(Topic.exists?(45))
     assert !(Topic.exists?("foo"))
     assert !(Topic.exists?([1,2]))
@@ -38,13 +38,6 @@
     }
   end
   
-  def test_find_all_with_limit
-    entrants = Entrant.find(:all, :order => "id ASC", :limit => 2)
-    
-    assert_equal(2, entrants.size)
-    assert_equal(entrants(:first).name, entrants.first.name)
-  end
-
   def test_find_all_with_prepared_limit_and_offset
     if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
       if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
@@ -276,6 +269,11 @@
   end
 
   def test_find_all_with_limit
+    entrants = Entrant.find(:all, :order => "id ASC", :limit => 2)
+    
+    assert_equal(2, entrants.size)
+    assert_equal(entrants(:first).name, entrants.first.name)
+
     first_five_developers = Developer.find :all, :order => 'id ASC', :limit =>  5
     assert_equal 5, first_five_developers.length
     assert_equal 'David', first_five_developers.first.name
Index: activerecord/test/fixtures/migrations/1_people_have_last_names.rb
===================================================================
--- activerecord/test/fixtures/migrations/1_people_have_last_names.rb   (revision 1873)
+++ activerecord/test/fixtures/migrations/1_people_have_last_names.rb   (working copy)
@@ -6,4 +6,4 @@
   def self.down
     remove_column "people", "last_name"
   end
-end
\ No newline at end of file
+end
Index: activerecord/Rakefile
===================================================================
--- activerecord/Rakefile       (revision 1873)
+++ activerecord/Rakefile       (working copy)
@@ -30,12 +30,14 @@
   t.libs << "test" << "test/connections/native_mysql"
   t.pattern = 'test/*_test{,_mysql}.rb'
   t.verbose = true
+  t.warning = true
 }
 
 Rake::TestTask.new("test_mysql_ruby") { |t|
   t.libs << "test" << "test/connections/native_mysql"
   t.pattern = 'test/*_test{,_mysql}.rb'
   t.verbose = true
+  t.warning = true
 }
 
 for adapter in %w( postgresql sqlite sqlite3 sqlserver sqlserver_odbc db2 oci )
@@ -43,6 +45,7 @@
     t.libs << "test" << "test/connections/native_#{adapter}"
     t.pattern = "test/*_test{,_#{adapter}}.rb"
     t.verbose = true
+    t.warning = true
   }
 end
 
Index: activerecord/lib/active_record/validations.rb
===================================================================
--- activerecord/lib/active_record/validations.rb       (revision 1873)
+++ activerecord/lib/active_record/validations.rb       (working copy)
@@ -310,7 +310,7 @@
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:confirmation], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
 
-        attr_accessor *(attr_names.map { |n| "#{n}_confirmation" })
+        attr_accessor(*(attr_names.map { |n| "#{n}_confirmation" }))
        
         validates_each(attr_names, configuration) do |record, attr_name, value|
           record.errors.add(attr_name, configuration[:message]) unless record.send("#{attr_name}_confirmation").nil? or value == record.send("#{attr_name}_confirmation")
@@ -339,7 +339,7 @@
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:accepted], :on => :save, :allow_nil => true, :accept => "1" }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
 
-        attr_accessor *attr_names
+        attr_accessor(*attr_names)
        
         validates_each(attr_names,configuration) do |record, attr_name, value|
           record.errors.add(attr_name, configuration[:message]) unless value == configuration[:accept]
@@ -684,7 +684,7 @@
 
     # Returns the Errors object that holds all information about attribute error messages.
     def errors
-      @errors = Errors.new(self) if @errors.nil?
+      @errors = Errors.new(self) unless defined? @errors
       @errors
     end
 
Index: activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
===================================================================
--- activerecord/lib/active_record/connection_adapters/abstract_adapter.rb      (revision 1873)
+++ activerecord/lib/active_record/connection_adapters/abstract_adapter.rb      (working copy)
@@ -410,10 +410,6 @@
         raise NotImplementedError, "change_column_default is not implemented"
       end
       
-      def supports_migrations?
-        false
-      end      
-
       def rename_column(table_name, column_name, new_column_name)
         raise NotImplementedError, "rename_column is not implemented"
       end
Index: activerecord/lib/active_record/connection_adapters/oci_adapter.rb
===================================================================
--- activerecord/lib/active_record/connection_adapters/oci_adapter.rb   (revision 1873)
+++ activerecord/lib/active_record/connection_adapters/oci_adapter.rb   (working copy)
@@ -55,7 +55,7 @@
 
         def cast_to_date_or_time(value)
           return value if value.is_a? Date
-          guess_date_or_time (value.is_a? Time) ? value : cast_to_time(value)
+          guess_date_or_time value.is_a?(Time) ? value : cast_to_time(value)
         end
 
         def cast_to_time(value)
Index: activerecord/lib/active_record/query_cache.rb
===================================================================
--- activerecord/lib/active_record/query_cache.rb       (revision 1873)
+++ activerecord/lib/active_record/query_cache.rb       (working copy)
@@ -42,9 +42,11 @@
       end
   end
   
-  class Base
+  class << Base
+    alias old_connection= connection=
+
     # Set the connection for the class with caching on
-    def self.connection=(spec)
+    def connection=(spec)
       raise ConnectionNotEstablished unless spec
 
       conn = spec.config[:query_cache] ?
Index: activerecord/lib/active_record/migration.rb
===================================================================
--- activerecord/lib/active_record/migration.rb (revision 1873)
+++ activerecord/lib/active_record/migration.rb (working copy)
@@ -182,7 +182,7 @@
     private
       def migration_classes
         migrations = migration_files.collect do |migration_file|
-          load(migration_file)
+          require migration_file
           version, name = migration_version_and_name(migration_file)
           [ version.to_i, migration_class(name) ]
         end
Index: activerecord/lib/active_record/vendor/simple.rb
===================================================================
--- activerecord/lib/active_record/vendor/simple.rb     (revision 1873)
+++ activerecord/lib/active_record/vendor/simple.rb     (working copy)
@@ -186,6 +186,7 @@
 
       # Returns the Transaction::Simple debug object. It must respond to #<<.
     def self.debug_io
+      @tdi = nil unless defined? @tdi
       @tdi
     end
 
@@ -368,18 +369,19 @@
         end
       end
 
-      if respond_to?(:instance_variable_get)
+      if r.instance_variables.include? TRANSACTION_CHECKPOINT then
         return r.instance_variable_get(TRANSACTION_CHECKPOINT)
       else
-        return r.instance_eval(TRANSACTION_CHECKPOINT)
+        return nil
       end
     end
 
     def __commit_transaction #:nodoc:
-      if respond_to?(:instance_variable_get)
-        @__transaction_checkpoint__ = Marshal.restore(@__transaction_checkpoint__).instance_variable_get(TRANSACTION_CHECKPOINT)
+      val = Marshal.restore(@__transaction_checkpoint__)
+      if val.instance_variables.include? TRANSACTION_CHECKPOINT then
+        @__transaction_checkpoint__ = val.instance_variable_get(TRANSACTION_CHECKPOINT)
       else
-        @__transaction_checkpoint__ = Marshal.restore(@__transaction_checkpoint__).instance_eval(TRANSACTION_CHECKPOINT)
+        @@__transaction_checkpoint__ = nil
       end
 
       @__transaction_level__ -= 1
Index: activerecord/lib/active_record/associations.rb
===================================================================
--- activerecord/lib/active_record/associations.rb      (revision 1873)
+++ activerecord/lib/active_record/associations.rb      (working copy)
@@ -365,13 +365,16 @@
 
         require_association_class(association_class_name)
 
+        ivar_name = "\"@#{association_name}\""
         module_eval do
           after_save <<-EOF
-            association = instance_variable_get("@#{association_name}")
-            unless association.nil?
-              association["#{association_class_primary_key_name}"] = id
-              association.save(true)
-              association.send(:construct_sql)
+            if instance_variables.include? #{ivar_name} then
+              association = instance_variable_get #{ivar_name}
+              unless association.nil?
+                association["#{association_class_primary_key_name}"] = id
+                association.save(true)
+                association.send(:construct_sql)
+              end
             end
           EOF
         end
@@ -442,9 +445,13 @@
         association_constructor_method(:build, association_name, association_class_name, association_class_primary_key_name, options, BelongsToAssociation)
         association_constructor_method(:create, association_name, association_class_name, association_class_primary_key_name, options, BelongsToAssociation)
 
+        ivar_name = "\"@#{association_name}\""
         module_eval do
           before_save <<-EOF
-            association = instance_variable_get("@#{association_name}")
+            association = nil
+            if instance_variables.include? #{ivar_name} then
+              association = instance_variable_get #{ivar_name}
+            end
             if not association.nil? and association.new_record?
               association.save(true)
               self["#{association_class_primary_key_name}"] = association.id
@@ -600,18 +607,22 @@
         end
         
         def association_accessor_methods(association_name, association_class_name, association_class_primary_key_name, options, association_proxy_class)
+          ivar_name = "@#{association_name}"
           define_method(association_name) do |*params|
             force_reload = params.first unless params.empty?
-            association = instance_variable_get("@#{association_name}")
+            association = nil
+            if instance_variables.include? ivar_name then
+              association = instance_variable_get ivar_name
+            end
             if association.nil? or force_reload
               association = association_proxy_class.new(self,
                 association_name, association_class_name,
                 association_class_primary_key_name, options)
               retval = association.reload
               unless retval.nil?
-                instance_variable_set("@#{association_name}", association)
+                instance_variable_set ivar_name, association
               else
-                instance_variable_set("@#{association_name}", nil)
+                instance_variable_set ivar_name, nil
                 return nil
               end
             end
@@ -619,7 +630,10 @@
           end
 
           define_method("#{association_name}=") do |new_value|
-            association = instance_variable_get("@#{association_name}")
+            association = nil
+            if instance_variables.include? ivar_name then
+              association = instance_variable_get ivar_name
+            end
             if association.nil?
               association = association_proxy_class.new(self,
                 association_name, association_class_name,
@@ -627,9 +641,9 @@
             end
             association.replace(new_value)
             unless new_value.nil?
-              instance_variable_set("@#{association_name}", association)
+              instance_variable_set ivar_name, association
             else
-              instance_variable_set("@#{association_name}", nil)
+              instance_variable_set ivar_name, nil
               return nil
             end
             association
@@ -641,31 +655,41 @@
               association_name, association_class_name,
               association_class_primary_key_name, options)
             association.target = target
-            instance_variable_set("@#{association_name}", association)
+            instance_variable_set ivar_name, association
           end
         end
 
         def collection_accessor_methods(association_name, association_class_name, association_class_primary_key_name, options, association_proxy_class)
+          ivar_name = "@#{association_name}"
+
           define_method(association_name) do |*params|
             force_reload = params.first unless params.empty?
-            association = instance_variable_get("@#{association_name}")
+            association = nil
+
+            if instance_variables.include? ivar_name then
+              association = instance_variable_get ivar_name
+            end
+
             unless association.respond_to?(:loaded?)
               association = association_proxy_class.new(self,
                 association_name, association_class_name,
                 association_class_primary_key_name, options)
-              instance_variable_set("@#{association_name}", association)
+              instance_variable_set ivar_name, association
             end
             association.reload if force_reload
             association
           end
 
           define_method("#{association_name}=") do |new_value|
-            association = instance_variable_get("@#{association_name}")
+            association = nil
+            if instance_variables.include? ivar_name then
+              association = instance_variable_get ivar_name
+            end
             unless association.respond_to?(:loaded?)
               association = association_proxy_class.new(self,
                 association_name, association_class_name,
                 association_class_primary_key_name, options)
-              instance_variable_set("@#{association_name}", association)
+              instance_variable_set ivar_name, association
             end
             association.replace(new_value)
             association
@@ -681,10 +705,14 @@
         end
 
         def add_multiple_associated_save_callbacks(association_name)
+          ivar_name = "\"@#{association_name}\""
           module_eval do
             before_save <<-end_eval
               @new_record_before_save = new_record?
-              association = instance_variable_get("@#{association_name}")
+              association = nil
+              if instance_variables.include? #{ivar_name} then
+                association = instance_variable_get #{ivar_name}
+              end
               if association.respond_to?(:loaded?)
                 if new_record?
                   records_to_save = association
@@ -700,7 +728,10 @@
 
           module_eval do
             after_callback = <<-end_eval
-              association = instance_variable_get("@#{association_name}")
+              association = nil
+              if instance_variables.include? #{ivar_name} then
+                association = instance_variable_get #{ivar_name}
+              end
               if association.respond_to?(:loaded?)
                 if @new_record_before_save
                   records_to_save = association
@@ -719,16 +750,20 @@
         end
 
         def association_constructor_method(constructor, association_name, association_class_name, association_class_primary_key_name, options, association_proxy_class)
+          ivar_name = "@#{association_name}"
           define_method("#{constructor}_#{association_name}") do |*params|
             attributees      = params.first unless params.empty?
             replace_existing = params[1].nil? ? true : params[1]
-            association      = instance_variable_get("@#{association_name}")
+            association = nil
+            if instance_variables.include? ivar_name then
+              association = instance_variable_get ivar_name
+            end
 
             if association.nil?
               association = association_proxy_class.new(self,
                 association_name, association_class_name,
                 association_class_primary_key_name, options)
-              instance_variable_set("@#{association_name}", association)
+              instance_variable_set ivar_name, association
             end
 
             if association_proxy_class == HasOneAssociation
Index: activerecord/lib/active_record/fixtures.rb
===================================================================
--- activerecord/lib/active_record/fixtures.rb  (revision 1873)
+++ activerecord/lib/active_record/fixtures.rb  (working copy)
@@ -447,6 +447,7 @@
       end
 
       def self.uses_transaction?(method)
+        @uses_transaction = nil unless defined? @uses_transaction
         @uses_transaction && @uses_transaction.include?(method.to_s)
       end
 
@@ -483,7 +484,8 @@
         instantiate_fixtures if use_instantiated_fixtures
       end
 
-      alias_method :setup, :setup_with_fixtures
+      alias old_setup setup
+      alias setup setup_with_fixtures
 
       def teardown_with_fixtures
         # Rollback changes.
@@ -493,7 +495,8 @@
         end
       end
 
-      alias_method :teardown, :teardown_with_fixtures
+      alias old_teardown teardown
+      alias teardown teardown_with_fixtures
 
       def self.method_added(method)
         case method.to_s
Index: activerecord/lib/active_record/aggregations.rb
===================================================================
--- activerecord/lib/active_record/aggregations.rb      (revision 1873)
+++ activerecord/lib/active_record/aggregations.rb      (working copy)
@@ -144,7 +144,7 @@
         def reader_method(name, class_name, mapping)
           module_eval <<-end_eval
             def #{name}(force_reload = false)
-              if @#{name}.nil? || force_reload
+              if (not defined? @#{name}) || @#{name}.nil? || force_reload
                 @#{name} = #{class_name}.new(#{(Array === mapping.first ? mapping : [ mapping ]).collect{ |pair| "read_attribute(\"#{pair.first}\")"}.join(", ")})
               end
               
Index: activerecord/lib/active_record/base.rb
===================================================================
--- activerecord/lib/active_record/base.rb      (revision 1873)
+++ activerecord/lib/active_record/base.rb      (working copy)
@@ -831,7 +831,11 @@
         def define_attr_method(name, value=nil, &block)
           sing = class << self; self; end
           block = proc { value.to_s } if value
-          sing.send( :alias_method, "original_#{name}", name )
+          original_name = "original_#{name}"
+          if sing.instance_methods.include? original_name then
+            sing.send :undef_method, original_name
+          end
+          sing.send( :alias_method, original_name, name )
           sing.send( :define_method, name, &block )
         end
 
@@ -958,6 +962,7 @@
 
       # Returns true if this object hasn't been saved yet -- that is, a record for the object doesn't exist yet.
       def new_record?
+        @new_record = nil unless defined? @new_record # HACK true is default?
         @new_record
       end
 
Index: actionpack/Rakefile
===================================================================
--- actionpack/Rakefile (revision 1873)
+++ actionpack/Rakefile (working copy)
@@ -28,6 +28,7 @@
   t.test_files=Dir.glob( "test/c*/*_test.rb" ) + Dir.glob( "test/[ft]*/*_test.rb" )
 #  t.pattern = 'test/*/*_test.rb'
   t.verbose = true
+  t.warning = true
 }
 
 
@@ -239,4 +240,4 @@
       first_file = false
     end
   end
-end
\ No newline at end of file
+end
Index: actionpack/lib/action_controller/request.rb
===================================================================
--- actionpack/lib/action_controller/request.rb (revision 1873)
+++ actionpack/lib/action_controller/request.rb (working copy)
@@ -1,7 +1,7 @@
 module ActionController
   # These methods are available in both the production and test Request objects.
   class AbstractRequest
-    cattr_accessor :relative_url_root
+    cattr_writer :relative_url_root
     
     # Returns both GET and POST parameters in a single hash.
     def parameters
Index: actionpack/lib/action_controller/base.rb
===================================================================
--- actionpack/lib/action_controller/base.rb    (revision 1873)
+++ actionpack/lib/action_controller/base.rb    (working copy)
@@ -300,6 +300,7 @@
       
       # Convert the class name from something like "OneModule::TwoModule::NeatController" to "one_module/two_module/neat".
       def controller_path
+        return unless defined? @controller_path
         unless @controller_path
           components = self.name.to_s.split('::')
           components[-1] = $1 if /^(.*)Controller$/ =~ components.last
Index: actionpack/lib/action_controller/test_process.rb
===================================================================
--- actionpack/lib/action_controller/test_process.rb    (revision 1873)
+++ actionpack/lib/action_controller/test_process.rb    (working copy)
@@ -15,13 +15,15 @@
 
   class TestRequest < AbstractRequest #:nodoc:
     attr_accessor :cookies
-    attr_accessor :query_parameters, :request_parameters, :path, :session, :env
+    attr_accessor :query_parameters, :request_parameters, :session, :env
     attr_accessor :host
+    attr_writer :path
 
     def initialize(query_parameters = nil, request_parameters = nil, session = nil)
       @query_parameters   = query_parameters || {}
       @request_parameters = request_parameters || {}
       @session            = session || TestSession.new
+      @path = nil
 
       initialize_containers
       initialize_default_values
Index: actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb
===================================================================
--- actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb       (revision 1873)
+++ actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb       (working copy)
@@ -1,6 +1,7 @@
 class CGI #:nodoc:
   # Add @request.env['RAW_POST_DATA'] for the vegans.
   module QueryExtension
+    alias old_initialize_query initialize_query
     # Initialize the data from the query.
     #
     # Handles multipart forms (in particular, forms that involve file uploads).
Index: actionpack/lib/action_controller/session.rb
===================================================================
--- actionpack/lib/action_controller/session.rb (revision 1873)
+++ actionpack/lib/action_controller/session.rb (working copy)
@@ -7,8 +7,12 @@
 
     private
       def clear_persistant_model_associations #:doc:
+        unless defined? @session and
+               @session.instance_variables.include? '@data' then
+          return
+        end
         session = @session.instance_variable_get("@data")
         session.each { |key, obj| obj.clear_association_cache if obj.respond_to?(:clear_association_cache) } if session
       end
   end
-end
\ No newline at end of file
+end
Index: actionwebservice/Rakefile
===================================================================
--- actionwebservice/Rakefile   (revision 1873)
+++ actionwebservice/Rakefile   (working copy)
@@ -27,6 +27,7 @@
   t.libs << "test"
   t.test_files = Dir['test/*_test.rb']
   t.verbose = true
+  t.warning = true
 }