Fix date errors for SQLServer in association tests. Closes #3406.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3404 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activerecord/CHANGELOG

 *SVN*
 
-* Escape database name in MySQL adapter when creating and dropping databases. #3409 [anna@wota.jp]
+* Fix date errors for SQLServer in association tests. #3406 [kevin.clark@gmal.com]
+
+r Escape database name in MySQL adapter when creating and dropping databases. #3409 [anna@wota.jp]
 
 * Disambiguate table names for columns in validates_uniquness_of's WHERE clause. #3423 [alex.borovsky@gmail.com]
 

activerecord/test/associations_test.rb

@@ -1188,7 +1188,7 @@ def test_habtm_adding_before_save_with_join_attributes
     # SQL Server doesn't have a separate column type just for dates, 
     # so the time is in the string and incorrectly formatted
     if current_adapter?(:SQLServerAdapter)
-      kenReloaded.projects.each { |prj| assert_equal(sqlnow, prj.joined_on.strftime("%Y/%m/%d 00:00:00")) }
+      kenReloaded.projects.each { |prj| assert_equal(sqlnow, prj.joined_on.to_s) }
     else
       kenReloaded.projects.each { |prj| assert_equal(now.to_s, prj.joined_on.to_s) }
     end
@@ -1300,11 +1300,8 @@ def test_removing_associations_on_destroy
   def test_additional_columns_from_join_table
     # SQL Server doesn't have a separate column type just for dates, 
     # so the time is in the string and incorrectly formatted
-    if current_adapter?(:SQLServerAdapter)
-      assert_equal Time.mktime(2004, 10, 10).strftime("%Y/%m/%d 00:00:00"), Developer.find(1).projects.first.joined_on.strftime("%Y/%m/%d 00:00:00")
-    else
-      assert_equal Date.new(2004, 10, 10).to_s, Developer.find(1).projects.first.joined_on.to_s
-    end
+    expected = (current_adapter?(:SQLServerAdapter) ? Time.mktime(2004, 10, 10).strftime("%Y/%m/%d 00:00:00") : Date.new(2004, 10, 10).to_s)
+    assert_equal expected, Developer.find(1).projects.first.joined_on.to_s
   end
   
   def test_destroy_all
@@ -1322,8 +1319,8 @@ def test_rich_association
     # SQL Server doesn't have a separate column type just for dates, 
     # so the time is in the string and incorrectly formatted
     if current_adapter?(:SQLServerAdapter)
-      assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), jamis.projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.strftime("%Y/%m/%d 00:00:00")
-      assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), developers(:jamis).projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.strftime("%Y/%m/%d 00:00:00")
+      assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), jamis.projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.to_s
+      assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), developers(:jamis).projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.to_s
     else
       assert_equal Date.today.to_s, jamis.projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.to_s
       assert_equal Date.today.to_s, developers(:jamis).projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.to_s