fix merge conflict with actionpack changelog

9 files changed, 192 insertions, 116 deletions

diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 8a74b6d6f5..91504af901 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -6,15 +6,16 @@ class AdapterTest < ActiveRecord::TestCase
   end
 
   def test_tables
-    if @connection.respond_to?(:tables)
-      tables = @connection.tables
-      assert tables.include?("accounts")
-      assert tables.include?("authors")
-      assert tables.include?("tasks")
-      assert tables.include?("topics")
-    else
-      warn "#{@connection.class} does not respond to #tables"
-    end
+    tables = @connection.tables
+    assert tables.include?("accounts")
+    assert tables.include?("authors")
+    assert tables.include?("tasks")
+    assert tables.include?("topics")
+  end
+
+  def test_table_exists?
+    assert @connection.table_exists?("accounts")
+    assert !@connection.table_exists?("nonexistingtable")
   end
 
   def test_indexes
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 546ed80894..67b57ceb42 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -29,6 +29,10 @@ class EagerAssociationTest < ActiveRecord::TestCase
     post = Post.find(:first, :include => :comments, :conditions => "posts.title = 'Welcome to the weblog'")
     assert_equal 2, post.comments.size
     assert post.comments.include?(comments(:greetings))
+
+    posts = Post.find(:all, :include => :last_comment)
+    post = posts.find { |p| p.id == 1 }
+    assert_equal Post.find(1).last_comment, post.last_comment
   end
 
   def test_loading_conditions_with_or
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index ed2fab6d22..d8fe98bf57 100755
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -149,6 +149,12 @@ class AssociationProxyTest < ActiveRecord::TestCase
     assert !david.projects.loaded?
   end
 
+  def test_inspect_does_not_reload_a_not_yet_loaded_target
+    andreas = Developer.new :name => 'Andreas', :log => 'new developer added'
+    assert !andreas.audit_logs.loaded?
+    assert_match(/message: "new developer added"/, andreas.audit_logs.inspect)
+  end
+
   def test_save_on_parent_saves_children
     developer = Developer.create :name => "Bryan", :salary => 50_000
     assert_equal 1, developer.reload.audit_logs.size
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 61a049ab36..c336fd9afb 100755
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -173,6 +173,41 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_setting_time_zone_aware_attribute_with_string
+    utc_time = Time.utc(2008, 1, 1)
+    (-11..13).each do |timezone_offset|
+      time_string = utc_time.in_time_zone(timezone_offset).to_s
+      in_time_zone "Pacific Time (US & Canada)" do
+        record   = @target.new
+        record.written_on = time_string
+        assert_equal Time.zone.parse(time_string), record.written_on
+        assert_equal TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone
+        assert_equal Time.utc(2007, 12, 31, 16), record.written_on.time
+      end
+    end
+  end
+  
+  def test_setting_time_zone_aware_attribute_to_blank_string_returns_nil
+    in_time_zone "Pacific Time (US & Canada)" do
+      record   = @target.new
+      record.written_on = ' '
+      assert_nil record.written_on
+    end
+  end
+
+  def test_setting_time_zone_aware_attribute_interprets_time_zone_unaware_string_in_time_zone
+    time_string = 'Tue Jan 01 00:00:00 2008'
+    (-11..13).each do |timezone_offset|
+      in_time_zone timezone_offset do
+        record   = @target.new
+        record.written_on = time_string
+        assert_equal Time.zone.parse(time_string), record.written_on
+        assert_equal TimeZone[timezone_offset], record.written_on.time_zone
+        assert_equal Time.utc(2008, 1, 1), record.written_on.time
+      end
+    end
+  end
+
   def test_setting_time_zone_aware_attribute_in_current_time_zone
     utc_time = Time.utc(2008, 1, 1)
     in_time_zone "Pacific Time (US & Canada)" do
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index b7f87fe6e8..2acfe9b387 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -8,6 +8,7 @@ require 'models/entrant'
 require 'models/developer'
 require 'models/post'
 require 'models/customer'
+require 'models/job'
 
 class FinderTest < ActiveRecord::TestCase
   fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :comments, :accounts, :authors, :customers
@@ -857,6 +858,14 @@ class FinderTest < ActiveRecord::TestCase
       Company.connection.select_rows("SELECT id, name FROM companies WHERE id IN (1,2,3) ORDER BY id").map! {|i| i.map! {|j| j.to_s unless j.nil?}}
   end
 
+  def test_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct
+    assert_equal 2, Post.find(:all,:include=>{:authors=>:author_address},:order=>' author_addresses.id DESC ', :limit=>2).size
+
+    assert_equal 3, Post.find(:all,:include=>{:author=>:author_address,:authors=>:author_address},
+                              :order=>' author_addresses_authors.id DESC ', :limit=>3).size
+  end
+
+
   protected
     def bind(statement, *vars)
       if vars.first.is_a?(Hash)
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index d4e81827aa..6be31b5f86 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -209,6 +209,24 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Base.primary_key_prefix_type = nil
     end
 
+    uses_mocha('test_create_table_with_force_true_does_not_drop_nonexisting_table') do
+      def test_create_table_with_force_true_does_not_drop_nonexisting_table
+        if Person.connection.table_exists?(:testings2)
+          Person.connection.drop_table :testings2
+        end
+
+        # using a copy as we need the drop_table method to
+        # continue to work for the ensure block of the test
+        temp_conn = Person.connection.dup
+        temp_conn.expects(:drop_table).never
+        temp_conn.create_table :testings2, :force => true do |t|
+          t.column :foo, :string
+        end
+      ensure
+        Person.connection.drop_table :testings2 rescue nil
+      end
+    end
+
 
     # SQL Server, Sybase, and SQLite3 will not allow you to add a NOT NULL
     # column to a table without a default value.
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index ba8bff3b44..c42b0efba0 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -2,140 +2,137 @@ require "cases/helper"
 require 'active_record/schema_dumper'
 require 'stringio'
 
-if ActiveRecord::Base.connection.respond_to?(:tables)
 
-  class SchemaDumperTest < ActiveRecord::TestCase
-    def standard_dump
-      stream = StringIO.new
-      ActiveRecord::SchemaDumper.ignore_tables = []
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      stream.string
-    end
+class SchemaDumperTest < ActiveRecord::TestCase
+  def standard_dump
+    stream = StringIO.new
+    ActiveRecord::SchemaDumper.ignore_tables = []
+    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+    stream.string
+  end
 
-    def test_schema_dump
-      output = standard_dump
-      assert_match %r{create_table "accounts"}, output
-      assert_match %r{create_table "authors"}, output
-      assert_no_match %r{create_table "schema_migrations"}, output
-    end
+  def test_schema_dump
+    output = standard_dump
+    assert_match %r{create_table "accounts"}, output
+    assert_match %r{create_table "authors"}, output
+    assert_no_match %r{create_table "schema_migrations"}, output
+  end
 
-    def test_schema_dump_excludes_sqlite_sequence
-      output = standard_dump
-      assert_no_match %r{create_table "sqlite_sequence"}, output
-    end
+  def test_schema_dump_excludes_sqlite_sequence
+    output = standard_dump
+    assert_no_match %r{create_table "sqlite_sequence"}, output
+  end
 
-    def assert_line_up(lines, pattern, required = false)
-      return assert(true) if lines.empty?
-      matches = lines.map { |line| line.match(pattern) }
-      assert matches.all? if required
-      matches.compact!
-      return assert(true) if matches.empty?
-      assert_equal 1, matches.map{ |match| match.offset(0).first }.uniq.length
-    end
+  def assert_line_up(lines, pattern, required = false)
+    return assert(true) if lines.empty?
+    matches = lines.map { |line| line.match(pattern) }
+    assert matches.all? if required
+    matches.compact!
+    return assert(true) if matches.empty?
+    assert_equal 1, matches.map{ |match| match.offset(0).first }.uniq.length
+  end
 
-    def column_definition_lines(output = standard_dump)
-      output.scan(/^( *)create_table.*?\n(.*?)^\1end/m).map{ |m| m.last.split(/\n/) }
-    end
+  def column_definition_lines(output = standard_dump)
+    output.scan(/^( *)create_table.*?\n(.*?)^\1end/m).map{ |m| m.last.split(/\n/) }
+  end
 
-    def test_types_line_up
-      column_definition_lines.each do |column_set|
-        next if column_set.empty?
+  def test_types_line_up
+    column_definition_lines.each do |column_set|
+      next if column_set.empty?
 
-        lengths = column_set.map do |column|
-          if match = column.match(/t\.(?:integer|decimal|float|datetime|timestamp|time|date|text|binary|string|boolean)\s+"/)
-            match[0].length
-          end
+      lengths = column_set.map do |column|
+        if match = column.match(/t\.(?:integer|decimal|float|datetime|timestamp|time|date|text|binary|string|boolean)\s+"/)
+          match[0].length
         end
-
-        assert_equal 1, lengths.uniq.length
       end
-    end
 
-    def test_arguments_line_up
-      column_definition_lines.each do |column_set|
-        assert_line_up(column_set, /:default => /)
-        assert_line_up(column_set, /:limit => /)
-        assert_line_up(column_set, /:null => /)
-      end
+      assert_equal 1, lengths.uniq.length
     end
+  end
 
-    def test_no_dump_errors
-      output = standard_dump
-      assert_no_match %r{\# Could not dump table}, output
+  def test_arguments_line_up
+    column_definition_lines.each do |column_set|
+      assert_line_up(column_set, /:default => /)
+      assert_line_up(column_set, /:limit => /)
+      assert_line_up(column_set, /:null => /)
     end
+  end
 
-    def test_schema_dump_includes_not_null_columns
-      stream = StringIO.new
+  def test_no_dump_errors
+    output = standard_dump
+    assert_no_match %r{\# Could not dump table}, output
+  end
 
-      ActiveRecord::SchemaDumper.ignore_tables = [/^[^r]/]
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      output = stream.string
-      assert_match %r{:null => false}, output
-    end
+  def test_schema_dump_includes_not_null_columns
+    stream = StringIO.new
 
-    def test_schema_dump_with_string_ignored_table
-      stream = StringIO.new
+    ActiveRecord::SchemaDumper.ignore_tables = [/^[^r]/]
+    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+    output = stream.string
+    assert_match %r{:null => false}, output
+  end
 
-      ActiveRecord::SchemaDumper.ignore_tables = ['accounts']
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      output = stream.string
-      assert_no_match %r{create_table "accounts"}, output
-      assert_match %r{create_table "authors"}, output
-      assert_no_match %r{create_table "schema_migrations"}, output
-    end
+  def test_schema_dump_with_string_ignored_table
+    stream = StringIO.new
+
+    ActiveRecord::SchemaDumper.ignore_tables = ['accounts']
+    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+    output = stream.string
+    assert_no_match %r{create_table "accounts"}, output
+    assert_match %r{create_table "authors"}, output
+    assert_no_match %r{create_table "schema_migrations"}, output
+  end
+
+  def test_schema_dump_with_regexp_ignored_table
+    stream = StringIO.new
 
-    def test_schema_dump_with_regexp_ignored_table
-      stream = StringIO.new
+    ActiveRecord::SchemaDumper.ignore_tables = [/^account/]
+    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+    output = stream.string
+    assert_no_match %r{create_table "accounts"}, output
+    assert_match %r{create_table "authors"}, output
+    assert_no_match %r{create_table "schema_migrations"}, output
+  end
 
-      ActiveRecord::SchemaDumper.ignore_tables = [/^account/]
+  def test_schema_dump_illegal_ignored_table_value
+    stream = StringIO.new
+    ActiveRecord::SchemaDumper.ignore_tables = [5]
+    assert_raise(StandardError) do
       ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      output = stream.string
-      assert_no_match %r{create_table "accounts"}, output
-      assert_match %r{create_table "authors"}, output
-      assert_no_match %r{create_table "schema_migrations"}, output
     end
+  end
 
-    def test_schema_dump_illegal_ignored_table_value
-      stream = StringIO.new
-      ActiveRecord::SchemaDumper.ignore_tables = [5]
-      assert_raise(StandardError) do
-        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      end
+  if current_adapter?(:MysqlAdapter)
+    def test_schema_dump_should_not_add_default_value_for_mysql_text_field
+      output = standard_dump
+      assert_match %r{t.text\s+"body",\s+:null => false$}, output
     end
 
-    if current_adapter?(:MysqlAdapter)
-      def test_schema_dump_should_not_add_default_value_for_mysql_text_field
-        output = standard_dump
-        assert_match %r{t.text\s+"body",\s+:null => false$}, output
-      end
-
-      def test_mysql_schema_dump_should_honor_nonstandard_primary_keys
-        output = standard_dump
-        match = output.match(%r{create_table "movies"(.*)do})
-        assert_not_nil(match, "nonstandardpk table not found")
-        assert_match %r(:primary_key => "movieid"), match[1], "non-standard primary key not preserved"
-      end
-
-      def test_schema_dump_includes_length_for_mysql_blob_and_text_fields
-        output = standard_dump
-        assert_match %r{t.binary\s+"tiny_blob",\s+:limit => 255$}, output
-        assert_match %r{t.binary\s+"normal_blob"$}, output
-        assert_match %r{t.binary\s+"medium_blob",\s+:limit => 16777215$}, output
-        assert_match %r{t.binary\s+"long_blob",\s+:limit => 2147483647$}, output
-        assert_match %r{t.text\s+"tiny_text",\s+:limit => 255$}, output
-        assert_match %r{t.text\s+"normal_text"$}, output
-        assert_match %r{t.text\s+"medium_text",\s+:limit => 16777215$}, output
-        assert_match %r{t.text\s+"long_text",\s+:limit => 2147483647$}, output
-      end
+    def test_mysql_schema_dump_should_honor_nonstandard_primary_keys
+      output = standard_dump
+      match = output.match(%r{create_table "movies"(.*)do})
+      assert_not_nil(match, "nonstandardpk table not found")
+      assert_match %r(:primary_key => "movieid"), match[1], "non-standard primary key not preserved"
     end
 
-    def test_schema_dump_includes_decimal_options
-      stream = StringIO.new
-      ActiveRecord::SchemaDumper.ignore_tables = [/^[^n]/]
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      output = stream.string
-      assert_match %r{:precision => 3,[[:space:]]+:scale => 2,[[:space:]]+:default => 2.78}, output
+    def test_schema_dump_includes_length_for_mysql_blob_and_text_fields
+      output = standard_dump
+      assert_match %r{t.binary\s+"tiny_blob",\s+:limit => 255$}, output
+      assert_match %r{t.binary\s+"normal_blob"$}, output
+      assert_match %r{t.binary\s+"medium_blob",\s+:limit => 16777215$}, output
+      assert_match %r{t.binary\s+"long_blob",\s+:limit => 2147483647$}, output
+      assert_match %r{t.text\s+"tiny_text",\s+:limit => 255$}, output
+      assert_match %r{t.text\s+"normal_text"$}, output
+      assert_match %r{t.text\s+"medium_text",\s+:limit => 16777215$}, output
+      assert_match %r{t.text\s+"long_text",\s+:limit => 2147483647$}, output
     end
   end
 
+  def test_schema_dump_includes_decimal_options
+    stream = StringIO.new
+    ActiveRecord::SchemaDumper.ignore_tables = [/^[^n]/]
+    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+    output = stream.string
+    assert_match %r{:precision => 3,[[:space:]]+:scale => 2,[[:space:]]+:default => 2.78}, output
+  end
 end
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 192c2cb5ab..f77fd0e96d 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -49,6 +49,10 @@ class Developer < ActiveRecord::Base
   before_create do |developer|
     developer.audit_logs.build :message => "Computer created"
   end
+
+  def log=(message)
+    audit_logs.build :message => message
+  end
 end
 
 class AuditLog < ActiveRecord::Base
diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 22c5a645b8..d9101706b5 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -9,6 +9,8 @@ class Post < ActiveRecord::Base
 
   belongs_to :author_with_posts, :class_name => "Author", :foreign_key => :author_id, :include => :posts
 
+  has_one :last_comment, :class_name => 'Comment', :order => 'id desc'
+
   has_many   :comments, :order => "body" do
     def find_most_recent
       find(:first, :order => "id DESC")