[Rails3] More tests passing.

Author: metaskills

RAILS3_NOTES

@@ -34,13 +34,11 @@ on a local branch of our remote tracking branch.
 
 = SQL Server Todo
 
-  2364 tests, 8447 assertions, 8 failures, 47 errors
+  2364 tests, 9484 assertions, 7 failures, 44 errors
 
   * SQL Server Test Cases
-    x eager_association_test_sqlserver.rb     (2) Limit offset stuff.
     x inheritance_test_sqlserver.rb           (1) Recheck orig.
     x method_scoping_test_sqlserver.rb        (1) Recheck orig.
-    √ offset_and_limit_test_sqlserver.rb      Would prefer a few more cases.
 
   * Verify coerced tests
     Undefined coerced test: EagerAssociationTest#test_eager_with_has_many_and_limit_and_high_offset_and_multiple_array_conditions

test/cases/eager_association_test_sqlserver.rb

@@ -9,9 +9,7 @@ class EagerAssociationTestSqlserver < ActiveRecord::TestCase
 class EagerAssociationTest < ActiveRecord::TestCase
 
   COERCED_TESTS = [
-    :test_count_with_include,
-    :test_eager_with_has_many_and_limit_and_high_offset_and_multiple_array_conditions,
-    :test_eager_with_has_many_and_limit_and_high_offset_and_multiple_hash_conditions
+    :test_count_with_include
   ]
 
   include SqlserverCoercedTest
@@ -22,21 +20,5 @@ def test_coerced_test_count_with_include
     assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "len(comments.body) > 15")
   end
 
-  def test_coerced_eager_with_has_many_and_limit_and_high_offset_and_multiple_array_conditions
-    assert_queries(2) do
-      posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :offset => 10,
-        :conditions => [ "authors.name = ? and comments.body = ?", 'David', 'go crazy' ])
-      assert_equal 0, posts.size
-    end
-  end
-
-  def test_coerced_eager_with_has_many_and_limit_and_high_offset_and_multiple_hash_conditions
-    assert_queries(2) do
-      posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :offset => 10,
-        :conditions => { 'authors.name' => 'David', 'comments.body' => 'go crazy' })
-      assert_equal 0, posts.size
-    end
-  end unless active_record_2_point_2?
-  
 
 end

test/cases/method_scoping_test_sqlserver.rb

@@ -17,7 +17,7 @@ def test_coerced_test_merged_scoped_find
     poor_jamis = developers(:poor_jamis)
     Developer.send(:with_scope, :find => { :conditions => "salary < 100000" }) do
       Developer.send(:with_scope, :find => { :offset => 1, :order => 'id asc' }) do
-        assert_sql /ORDER BY id ASC/ do
+        assert_sql /ORDER BY id asc/ do
           assert_equal(poor_jamis, Developer.find(:first, :order => 'id asc'))
         end
       end

test/cases/offset_and_limit_test_sqlserver.rb

@@ -41,7 +41,10 @@ class Account < ActiveRecord::Base; end
 
     should 'alter SQL to limit number of records returned offset by specified amount' do
       sql = %|SELECT TOP (3) [_rnt].* 
-              FROM (SELECT ROW_NUMBER() OVER (ORDER BY [books].[id]) AS [rn], [books].* FROM [books]) AS [_rnt]
+              FROM (
+                SELECT ROW_NUMBER() OVER (ORDER BY [books].[id]) AS [rn], [books].* 
+                FROM [books]
+              ) AS [_rnt]
               WHERE [_rnt].[rn] > 5|.squish
       assert_sql(sql) { Book.limit(3).offset(5).all }
     end

test/connections/native_sqlserver/connection.rb

@@ -3,6 +3,7 @@
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new(File.expand_path(File.join(SQLSERVER_TEST_ROOT,'debug.log')))
+ActiveRecord::Base.logger.level = 0
 
 ActiveRecord::Base.configurations = {
   'arunit' => {

test/connections/native_sqlserver_odbc/connection.rb

@@ -3,6 +3,7 @@
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new(File.expand_path(File.join(SQLSERVER_TEST_ROOT,'debug.log')))
+ActiveRecord::Base.logger.level = 0
 
 ActiveRecord::Base.configurations = {
   'arunit' => {