rails-sqlserver-2000-2005-adapter 2.2.13 → 2.2.14

data/CHANGELOG

@@ -1,7 +1,38 @@
 
 MASTER
 
-*
+* 
+
+
+* 2.2.14 * (March 17th, 2009)
+
+* 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
+
+* Rails2.3 - Coerce NestedScopingTest#test_merged_scoped_find to use correct regexp for adapter. [Ken Collins]
+
+* Rails2.3 - Implement a custom ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation#aliased_table_name_for
+  method that uses a Regexp.escape so that table/column quoting does not get ignored. [Ken Collins]
+
+* Rails2.3 - Implement #outside_transaction? and a new transaction test case to test some SQL Server 
+  basic support while implementing this method. Future home of some savepoint tests too. [Ken Collins]
+
+* Rails2.3 - Coerced tests that ensure hash conditions on referenced tables are considered when eager 
+  loading with limit/offset. Information on these changes and the ticket in rails are.
+  http://github.com/rails/rails/commit/9a4d557713acb0fc8e80f61af18094034aca029a
+  http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1404-conditions_tables-doesnt-understand-condition-hashes
+
+* Rails2.3 - Add coerced tests for true/false attributes in selects use SQL Server case statement. [Ken Collins]
+
+* Making sure that smalldatetime types are OK to use. Also fixed a bug in the #view_information method that 
+  checks to see if a view definition is equal to 4000 chars, meaning that it is most likely truncated and 
+  needs to use the backup method of sp_helptext to get it's view definition. [Ken Collins]
 
 
 * 2.2.13 * (February 10th, 2009)

data/README.rdoc

@@ -6,6 +6,7 @@ The SQL Server adapter for rails is back for ActiveRecord 2.2 and up! We are cur
 
 == What's New
 
+* Now supports both rails 2.2 & 2.3!!!
 * An ActiveRecord::Base.execute_procedure method that can be used by classes.
 * Enabled support for DDL transactions.
 * Micro second support. Time#usec is automatically converted to SQL Server's 3.33 millisecond limitation.

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -150,7 +150,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME            = 'SQLServer'.freeze
-      VERSION                 = '2.2.13'.freeze
+      VERSION                 = '2.2.14'.freeze
       DATABASE_VERSION_REGEXP = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS      = [2000,2005].freeze
       LIMITABLE_TYPES         = ['string','integer','float','char','nchar','varchar','nvarchar'].freeze
@@ -189,6 +189,10 @@ module ActiveRecord
         true
       end
       
+      def supports_savepoints?
+        true
+      end
+      
       def database_version
         @database_version ||= info_schema_query { select_value('SELECT @@version') }
       end
@@ -342,6 +346,10 @@ module ActiveRecord
         end
       end
       
+      def outside_transaction?
+        info_schema_query { select_value("SELECT @@TRANCOUNT") == 0 }
+      end
+      
       def begin_db_transaction
         do_execute "BEGIN TRANSACTION"
       end
@@ -354,6 +362,17 @@ module ActiveRecord
         do_execute "ROLLBACK TRANSACTION" rescue nil
       end
       
+      def create_savepoint
+        do_execute "SAVE TRANSACTION #{current_savepoint_name}"
+      end
+
+      def release_savepoint
+      end
+      
+      def rollback_to_savepoint
+        do_execute "ROLLBACK TRANSACTION #{current_savepoint_name}"
+      end
+      
       def add_limit_offset!(sql, options)
         # Validate and/or convert integers for :limit and :offets options.
         if options[:offset]
@@ -485,7 +504,9 @@ module ActiveRecord
         @sqlserver_view_information_cache[table_name] ||= begin
           view_info = info_schema_query { select_one("SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'") }
           if view_info
-            view_info['VIEW_DEFINITION'] ||= info_schema_query { select_values("EXEC sp_helptext #{table_name}").join }
+            if view_info['VIEW_DEFINITION'].blank? || view_info['VIEW_DEFINITION'].length == 4000
+              view_info['VIEW_DEFINITION'] = info_schema_query { select_values("EXEC sp_helptext #{table_name}").join }
+            end
           end
           view_info
         end

data/lib/core_ext/active_record.rb

@@ -1,3 +1,5 @@
+require 'active_record/version'
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServerActiveRecordExtensions
@@ -81,3 +83,51 @@ module ActiveRecord
 end
 
 ActiveRecord::Base.send :include, ActiveRecord::ConnectionAdapters::SQLServerActiveRecordExtensions
+
+
+
+
+if ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR >= 3
+
+  require 'active_record/associations'
+  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
+          
+          # 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
+          
+        end
+        
+      end
+    end
+  end
+  ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation.send :include, ActiveRecord::ConnectionAdapters::SQLServerJoinAssociationChanges
+
+end
+

data/test/cases/attribute_methods_test_sqlserver.rb

@@ -0,0 +1,33 @@
+require 'cases/sqlserver_helper'
+require 'models/topic'
+
+class AttributeMethodsTestSqlserver < ActiveRecord::TestCase
+end
+
+class AttributeMethodsTest < ActiveRecord::TestCase
+  
+  COERCED_TESTS = [
+    :test_typecast_attribute_from_select_to_false,
+    :test_typecast_attribute_from_select_to_true
+  ]
+  
+  include SqlserverCoercedTest
+  
+  fixtures :topics
+  
+  
+  def test_coerced_typecast_attribute_from_select_to_false
+    topic = Topic.create(:title => 'Budget')
+    topic = Topic.find(:first, :select => "topics.*, CASE WHEN 1=2 THEN 1 ELSE 0 END as is_test")
+    assert !topic.is_test?
+  end
+
+  def test_coerced_typecast_attribute_from_select_to_true
+    topic = Topic.create(:title => 'Budget')
+    topic = Topic.find(:first, :select => "topics.*, CASE WHEN 2=2 THEN 1 ELSE 0 END as is_test")
+    assert topic.is_test?
+  end
+  
+  
+end
+

data/test/cases/column_test_sqlserver.rb

@@ -158,6 +158,7 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
       @date = SqlServerChronic.columns_hash['date']
       @time = SqlServerChronic.columns_hash['time']
       @datetime = SqlServerChronic.columns_hash['datetime']
+      @smalldatetime = SqlServerChronic.columns_hash['smalldatetime']
     end
 
     should 'have correct simplified type for uncast datetime' do
@@ -176,6 +177,23 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
       assert_equal nil, @datetime.limit
     end
     
+    context 'For smalldatetime types' do
+      
+      should 'have created that type using rails migrations' do
+        assert_equal 'smalldatetime', @smalldatetime.sql_type
+      end
+      
+      should 'be able to insert column without truncation warnings or the like' do
+        SqlServerChronic.create! :smalldatetime => Time.now
+      end
+      
+      should 'be able to update column without truncation warnings or the like' do
+        ssc = SqlServerChronic.create! :smalldatetime => 2.days.ago
+        ssc.update_attributes! :smalldatetime => Time.now
+      end
+
+    end
+    
     context 'which have coerced types' do
       
       setup do

data/test/cases/eager_association_test_sqlserver.rb

@@ -8,7 +8,11 @@ end
 
 class EagerAssociationTest < ActiveRecord::TestCase
   
-  COERCED_TESTS = [:test_count_with_include]
+  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
+  ]
   
   include SqlserverCoercedTest
   
@@ -18,5 +22,21 @@ class EagerAssociationTest < ActiveRecord::TestCase
     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

data/test/cases/method_scoping_test_sqlserver.rb

@@ -0,0 +1,28 @@
+require 'cases/sqlserver_helper'
+require 'models/developer'
+
+class MethodScopingTestSqlServer < ActiveRecord::TestCase
+end
+
+class NestedScopingTest < ActiveRecord::TestCase
+  
+  COERCED_TESTS = [:test_merged_scoped_find]
+  
+  include SqlserverCoercedTest
+  
+  fixtures :developers
+
+  def test_coerced_test_merged_scoped_find
+    poor_jamis = developers(:poor_jamis)
+    Developer.with_scope(:find => { :conditions => "salary < 100000" }) do
+      Developer.with_scope(:find => { :offset => 1, :order => 'id asc' }) do
+        assert_sql /ORDER BY id ASC/ do
+          assert_equal(poor_jamis, Developer.find(:first, :order => 'id asc'))
+        end
+      end
+    end
+  end
+  
+end
+
+

data/test/cases/sqlserver_helper.rb

@@ -3,6 +3,7 @@ require 'shoulda'
 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"
@@ -77,7 +78,7 @@ end
 # Our changes/additions to ActiveRecord test helpers specific for SQL Server.
 
 ActiveRecord::Base.connection.class.class_eval do
-  IGNORED_SQL << /SELECT SCOPE_IDENTITY/ << /INFORMATION_SCHEMA.TABLES/ << /INFORMATION_SCHEMA.COLUMNS/
+  IGNORED_SQL << /SELECT SCOPE_IDENTITY/ << /INFORMATION_SCHEMA.TABLES/ << /INFORMATION_SCHEMA.COLUMNS/ << /^SELECT @@TRANCOUNT/  
 end
 
 ActiveRecord::ConnectionAdapters::SQLServerAdapter.class_eval do
@@ -94,6 +95,8 @@ module ActiveRecord
     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 @@ module ActiveRecord
     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
 

data/test/cases/transaction_test_sqlserver.rb

@@ -0,0 +1,93 @@
+require 'cases/sqlserver_helper'
+require 'models/ship'
+require 'models/developer'
+
+class TransactionTestSqlserver < ActiveRecord::TestCase
+  
+  self.use_transactional_fixtures = false
+  
+  setup :delete_ships
+  
+  context 'Testing transaction basics' do
+    
+    should 'allow ActiveRecord::Rollback to work in 1 transaction block' do
+      Ship.transaction do
+        Ship.create! :name => 'Black Pearl'
+        raise ActiveRecord::Rollback
+      end
+      assert_no_ships
+    end
+    
+    should 'allow nested transactions to totally rollback' do
+      begin
+        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_ships
+      end
+    end
+
+  end
+  
+  context 'Testing #outside_transaction?' do
+  
+    should 'work in simple usage' do
+      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 Ship.connection.outside_transaction?
+      Ship.transaction do
+        assert !Ship.connection.outside_transaction?
+        Ship.transaction do
+          assert !Ship.connection.outside_transaction?
+        end
+      end
+      assert Ship.connection.outside_transaction?
+    end
+    
+    should 'not call rollback if no transaction is active' do
+      assert_raise RuntimeError do
+        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
+      Ship.transaction do
+        Ship.transaction do
+          Ship.connection.rollback_db_transaction
+        end
+        assert_equal 0, Ship.connection.open_transactions
+      end
+      assert_equal 0, Ship.connection.open_transactions
+    end
+    
+  end unless active_record_2_point_2?
+  
+  
+  
+  protected
+  
+  def delete_ships
+    Ship.delete_all
+  end
+  
+  def assert_no_ships
+    assert Ship.count.zero?, "Expected Ship to have no models but it did have:\n#{Ship.all.inspect}"
+  end
+  
+end
+

data/test/schema/sqlserver_specific_schema.rb

@@ -25,6 +25,7 @@ ActiveRecord::Schema.define do
     t.column :time,       :time
     t.column :datetime,   :datetime
     t.column :timestamp,  :timestamp
+    t.column :smalldatetime, :smalldatetime
   end
   
   create_table(:fk_test_has_fks, :force => true) { |t| t.column(:fk_id, :integer, :null => false) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails-sqlserver-2000-2005-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.2.13
+  version: 2.2.14
 platform: ruby
 authors: 
 - Ken Collins
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-08 00:00:00 -08:00
+date: 2009-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -71,6 +71,7 @@ summary: SQL Server 2000 & 2005 Adapter For Rails.
 test_files: 
 - test/cases/aaaa_create_tables_test_sqlserver.rb
 - test/cases/adapter_test_sqlserver.rb
+- test/cases/attribute_methods_test_sqlserver.rb
 - test/cases/basics_test_sqlserver.rb
 - test/cases/calculations_test_sqlserver.rb
 - test/cases/column_test_sqlserver.rb
@@ -78,6 +79,7 @@ test_files:
 - test/cases/eager_association_test_sqlserver.rb
 - test/cases/execute_procedure_test_sqlserver.rb
 - test/cases/inheritance_test_sqlserver.rb
+- test/cases/method_scoping_test_sqlserver.rb
 - test/cases/migration_test_sqlserver.rb
 - test/cases/offset_and_limit_test_sqlserver.rb
 - test/cases/pessimistic_locking_test_sqlserver.rb
@@ -86,6 +88,7 @@ test_files:
 - test/cases/specific_schema_test_sqlserver.rb
 - test/cases/sqlserver_helper.rb
 - test/cases/table_name_test_sqlserver.rb
+- test/cases/transaction_test_sqlserver.rb
 - test/cases/unicode_test_sqlserver.rb
 - test/connections/native_sqlserver/connection.rb
 - test/connections/native_sqlserver_odbc/connection.rb