activerecord-sqlserver-adapter 2.3.21 → 2.3.22

data/CHANGELOG

@@ -1,5 +1,10 @@
 
-* 2.3.21*
+* 2.3.22 *
+
+* Make #rollback_db_transaction smarter.
+
+ 
+* 2.3.21 *
 
 * Add support/test around handling of float/real column types [Lucas Maxwell]
 

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -147,7 +147,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '2.3.21'.freeze
+      VERSION                     = '2.3.22'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS          = [2000,2005,2008].freeze
       LIMITABLE_TYPES             = ['string','integer','float','char','nchar','varchar','nvarchar'].to_set.freeze
@@ -451,7 +451,7 @@ module ActiveRecord
       end
 
       def rollback_db_transaction
-        do_execute "ROLLBACK TRANSACTION" rescue nil
+        do_execute "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION"
       end
       
       def create_savepoint

data/test/cases/adapter_test_sqlserver.rb

@@ -485,7 +485,7 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
           assert @dirty_t2, 'Should have a Task record from within block above.'
           assert @dirty_t2.starting, 'Should have a dirty date.'
           assert_nil Task.find(@t2.id).starting, 'Should be nil again from botched transaction above.'
-        end unless active_record_2_point_2? # Transactions in tests are a bit screwy in 2.2.
+        end
         
       end
       

data/test/cases/eager_association_test_sqlserver.rb

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

data/test/cases/sqlserver_helper.rb

@@ -114,8 +114,6 @@ module ActiveRecord
       def sqlserver_2000? ; ActiveRecord::Base.connection.sqlserver_2000? ; end
       def sqlserver_2005? ; ActiveRecord::Base.connection.sqlserver_2005? ; end
       def sqlserver_2008? ; ActiveRecord::Base.connection.sqlserver_2008? ; 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
       def ruby_19? ; RUBY_VERSION >= '1.9' ; end
     end
     def assert_sql(*patterns_to_match)
@@ -134,8 +132,6 @@ module ActiveRecord
     def sqlserver_2000? ; self.class.sqlserver_2000? ; end
     def sqlserver_2005? ; self.class.sqlserver_2005? ; end
     def sqlserver_2008? ; self.class.sqlserver_2008? ; 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
     def ruby_19? ; self.class.ruby_19? ; end
   end
 end

data/test/cases/transaction_test_sqlserver.rb

@@ -75,7 +75,7 @@ class TransactionTestSqlserver < ActiveRecord::TestCase
       assert_equal 0, Ship.connection.open_transactions
     end
     
-  end unless active_record_2_point_2?
+  end
   
   
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 2
   - 3
-  - 21
-  version: 2.3.21
+  - 22
+  version: 2.3.22
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 -04:00
+date: 2011-10-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency