Rails2.3 - Back passing tests on 2.2 work. Includes: (1) Created new test helpers that check ActiveRecord version strings so we can conditionally run 2.2 and 2.3 tests. (2) Making TransactionTestSqlserver use Ship vs Bird model. Also made it conditional run a few blocks for different versions of ActiveRecord. (3) Previous JoinDependency#aliased_table_name_for is now only patched in ActiveRecord equal or greater than 2.3.

Author: metaskills

CHANGELOG

@@ -1,6 +1,11 @@
 
 MASTER
 
+* Rails2.3 - Back passing tests on 2.2 work. Includes: (1) Created new test helpers that check ActiveRecord 
+  version strings so we can conditionally run 2.2 and 2.3 tests. (2) Making TransactionTestSqlserver use Ship vs 
+  Bird model. Also made it conditional run a few blocks for different versions of ActiveRecord. (3) Previous 
+  JoinDependency#aliased_table_name_for is now only patched in ActiveRecord equal or greater than 2.3. [Ken Collins]
+
 * Rails2.3 - Implement new savepoint support [Ken Collins]
   http://rails.lighthouseapp.com/projects/8994/tickets/383
   http://www.codeproject.com/KB/database/sqlservertransactions.aspx

lib/core_ext/active_record.rb

@@ -1,3 +1,5 @@
+require 'active_record/version'
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServerActiveRecordExtensions
@@ -85,45 +87,47 @@ def add_order_with_sqlserver_unique_checking!(sql, order, scope = :auto)
 
 
 
-require 'active_record/associations'
+if ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR >= 3
 
-module ActiveRecord
-  module ConnectionAdapters
-    module SQLServerJoinAssociationChanges
-      
-      def self.included(klass)
-        klass.class_eval do
-          include InstanceMethods
-          alias_method_chain :aliased_table_name_for, :sqlserver_support
-        end
-      end
-      
-      module InstanceMethods
-        
-        protected
+  require 'active_record/associations'
+  module ActiveRecord
+    module ConnectionAdapters
+      module SQLServerJoinAssociationChanges
 
-        # An exact copy, except this method has a Regexp escape on the quoted table name.
-        def aliased_table_name_for_with_sqlserver_support(name,suffix=nil)
-          if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+#{Regexp.escape(active_record.connection.quote_table_name(name.downcase))}\son}i
-            @join_dependency.table_aliases[name] += 1
+        def self.included(klass)
+          klass.class_eval do
+            include InstanceMethods
+            alias_method_chain :aliased_table_name_for, :sqlserver_support
           end
-          unless @join_dependency.table_aliases[name].zero?
-            # if the table name has been used, then use an alias
-            name = active_record.connection.table_alias_for "#{pluralize(reflection.name)}_#{parent_table_name}#{suffix}"
-            table_index = @join_dependency.table_aliases[name]
-            @join_dependency.table_aliases[name] += 1
-            name = name[0..active_record.connection.table_alias_length-3] + "_#{table_index+1}" if table_index > 0
-          else
-            @join_dependency.table_aliases[name] += 1
+        end
+        
+        module InstanceMethods
+          
+          protected
+          
+          # An exact copy, except this method has a Regexp escape on the quoted table name.
+          def aliased_table_name_for_with_sqlserver_support(name,suffix=nil)
+            if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+#{Regexp.escape(active_record.connection.quote_table_name(name.downcase))}\son}i
+              @join_dependency.table_aliases[name] += 1
+            end
+            unless @join_dependency.table_aliases[name].zero?
+              # if the table name has been used, then use an alias
+              name = active_record.connection.table_alias_for "#{pluralize(reflection.name)}_#{parent_table_name}#{suffix}"
+              table_index = @join_dependency.table_aliases[name]
+              @join_dependency.table_aliases[name] += 1
+              name = name[0..active_record.connection.table_alias_length-3] + "_#{table_index+1}" if table_index > 0
+            else
+              @join_dependency.table_aliases[name] += 1
+            end
+            name
           end
-          name
+          
         end
 
       end
-      
     end
   end
-end
+  ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation.send :include, ActiveRecord::ConnectionAdapters::SQLServerJoinAssociationChanges
 
-ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation.send :include, ActiveRecord::ConnectionAdapters::SQLServerJoinAssociationChanges
+end
 

test/cases/eager_association_test_sqlserver.rb

@@ -36,7 +36,7 @@ def test_coerced_eager_with_has_many_and_limit_and_high_offset_and_multiple_hash
         :conditions => { 'authors.name' => 'David', 'comments.body' => 'go crazy' })
       assert_equal 0, posts.size
     end
-  end
+  end unless active_record_2_point_2?
 
 
 end

test/cases/sqlserver_helper.rb

@@ -3,6 +3,7 @@
 require 'mocha'
 require 'cases/helper'
 require 'models/topic'
+require 'active_record/version'
 
 SQLSERVER_TEST_ROOT       = File.expand_path(File.join(File.dirname(__FILE__),'..'))
 SQLSERVER_ASSETS_ROOT     = SQLSERVER_TEST_ROOT + "/assets"
@@ -94,6 +95,8 @@ class TestCase < ActiveSupport::TestCase
     class << self
       def sqlserver_2000? ; ActiveRecord::Base.connection.sqlserver_2000? ; end
       def sqlserver_2005? ; ActiveRecord::Base.connection.sqlserver_2005? ; end
+      def active_record_2_point_2? ; ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR == 2 ; end
+      def active_record_2_point_3? ; ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR == 3 ; end
     end
     def assert_sql(*patterns_to_match)
       $queries_executed = []
@@ -107,6 +110,8 @@ def assert_sql(*patterns_to_match)
     end
     def sqlserver_2000? ; self.class.sqlserver_2000? ; end
     def sqlserver_2005? ; self.class.sqlserver_2005? ; end
+    def active_record_2_point_2? ; self.class.active_record_2_point_2? ; end
+    def active_record_2_point_3? ; self.class.active_record_2_point_3? ; end
   end
 end
 

test/cases/transaction_test_sqlserver.rb

@@ -1,34 +1,34 @@
 require 'cases/sqlserver_helper'
-require 'models/bird'
+require 'models/ship'
 require 'models/developer'
 
 class TransactionTestSqlserver < ActiveRecord::TestCase
 
   self.use_transactional_fixtures = false
 
-  setup :delete_birds
+  setup :delete_ships
 
   context 'Testing transaction basics' do
 
     should 'allow ActiveRecord::Rollback to work in 1 transaction block' do
-      Bird.transaction do
-        Bird.create! :name => 'Crow', :pirate_id => 1
+      Ship.transaction do
+        Ship.create! :name => 'Black Pearl'
         raise ActiveRecord::Rollback
       end
-      assert_no_birds
+      assert_no_ships
     end
 
     should 'allow nested transactions to totally rollback' do
       begin
-        Bird.transaction do
-          Bird.create! :name => 'Crow', :pirate_id => 1
-          Bird.transaction do
-            Bird.create! :name => 'Dog', :pirate_id => 1
+        Ship.transaction do
+          Ship.create! :name => 'Black Pearl'
+          Ship.transaction do
+            Ship.create! :name => 'Flying Dutchman'
             raise 'HELL'
           end
         end
       rescue Exception => e
-        assert_no_birds
+        assert_no_ships
       end
     end
 
@@ -37,56 +37,56 @@ class TransactionTestSqlserver < ActiveRecord::TestCase
   context 'Testing #outside_transaction?' do
 
     should 'work in simple usage' do
-      assert Bird.connection.outside_transaction?
-      Bird.connection.begin_db_transaction
-      assert !Bird.connection.outside_transaction?
-      Bird.connection.rollback_db_transaction
-      assert Bird.connection.outside_transaction?
+      assert Ship.connection.outside_transaction?
+      Ship.connection.begin_db_transaction
+      assert !Ship.connection.outside_transaction?
+      Ship.connection.rollback_db_transaction
+      assert Ship.connection.outside_transaction?
     end
 
     should 'work inside nested transactions' do
-      assert Bird.connection.outside_transaction?
-      Bird.transaction do
-        assert !Bird.connection.outside_transaction?
-        Bird.transaction do
-          assert !Bird.connection.outside_transaction?
+      assert Ship.connection.outside_transaction?
+      Ship.transaction do
+        assert !Ship.connection.outside_transaction?
+        Ship.transaction do
+          assert !Ship.connection.outside_transaction?
         end
       end
-      assert Bird.connection.outside_transaction?
+      assert Ship.connection.outside_transaction?
     end
 
     should 'not call rollback if no transaction is active' do
       assert_raise RuntimeError do
-        Bird.transaction do
-          Bird.connection.rollback_db_transaction
-          Bird.connection.expects(:rollback_db_transaction).never
+        Ship.transaction do
+          Ship.connection.rollback_db_transaction
+          Ship.connection.expects(:rollback_db_transaction).never
           raise "Rails doesn't scale!"
         end
       end
     end
 
     should 'test_open_transactions_count_is_reset_to_zero_if_no_transaction_active' do
-      Bird.transaction do
-        Bird.transaction do
-          Bird.connection.rollback_db_transaction
+      Ship.transaction do
+        Ship.transaction do
+          Ship.connection.rollback_db_transaction
         end
-        assert_equal 0, Bird.connection.open_transactions
+        assert_equal 0, Ship.connection.open_transactions
       end
-      assert_equal 0, Bird.connection.open_transactions
+      assert_equal 0, Ship.connection.open_transactions
     end
 
-  end
+  end unless active_record_2_point_2?
 
 
 
   protected
 
-  def delete_birds
-    Bird.delete_all
+  def delete_ships
+    Ship.delete_all
   end
 
-  def assert_no_birds
-    assert Bird.count.zero?, "Expected Bird to have no models but it did have:\n#{Bird.all.inspect}"
+  def assert_no_ships
+    assert Ship.count.zero?, "Expected Ship to have no models but it did have:\n#{Ship.all.inspect}"
   end
 
 end