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

data/CHANGELOG

@@ -4,6 +4,14 @@ MASTER
 * 
 
 
+* 2.2.15 * (March 23rd, 2009)
+
+* Better add_lock! method that can add the lock to just about all the elements in the statement. This 
+  could be eager loaded associations, joins, etc. Done so that paginated results can easily add lock 
+  options for performance. Note, the tally count in add_limit_offset! use "WITH (NOLOCK)" explicitly 
+  as it can not hurt and is needed. [Ken Collins]
+
+
 * 2.2.14 * (March 17th, 2009)
 
 * Rails2.3 - Back passing tests on 2.2 work. Includes: (1) Created new test helpers that check ActiveRecord 

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.14'.freeze
+      VERSION                 = '2.2.15'.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
@@ -394,7 +394,9 @@ module ActiveRecord
         end
         # The business of adding limit/offset
         if options[:limit] and options[:offset]
-          total_rows = select_value("SELECT count(*) as TotalRows from (#{sql.sub(/\bSELECT(\s+DISTINCT)?\b/i, "SELECT#{$1} TOP 1000000000")}) tally").to_i
+          tally_sql = "SELECT count(*) as TotalRows from (#{sql.sub(/\bSELECT(\s+DISTINCT)?\b/i, "SELECT#{$1} TOP 1000000000")}) tally"
+          add_lock! tally_sql, :lock => 'WITH (NOLOCK)'
+          total_rows = select_value(tally_sql).to_i
           if (options[:limit] + options[:offset]) >= total_rows
             options[:limit] = (total_rows - options[:offset] >= 0) ? (total_rows - options[:offset]) : 0
           end
@@ -439,8 +441,8 @@ module ActiveRecord
         # http://blog.sqlauthority.com/2007/04/27/sql-server-2005-locking-hints-and-examples/
         return unless options[:lock]
         lock_type = options[:lock] == true ? 'WITH(HOLDLOCK, ROWLOCK)' : options[:lock]
-        from_table = sql.match(/FROM(.*)WHERE/im)[1]
-        sql.sub! from_table, "#{from_table}#{lock_type} "
+        sql.gsub! %r|LEFT OUTER JOIN\s+(.*?)\s+ON|im, "LEFT OUTER JOIN \\1 #{lock_type} ON"
+        sql.gsub! %r{FROM\s([\w\[\]\.]+)}im, "FROM \\1 #{lock_type}"
       end
       
       def empty_insert_statement(table_name)

data/test/cases/pessimistic_locking_test_sqlserver.rb

@@ -49,9 +49,34 @@ class PessimisticLockingTestSqlserver < ActiveRecord::TestCase
         end
       end
     end
+    
+    should 'simply add lock to find all' do
+      assert_sql %r|SELECT \* FROM \[people\] WITH \(NOLOCK\)| do
+        Person.all(:lock => 'WITH (NOLOCK)')
+      end
+    end
+
+  end
+  
+  context 'For paginated finds' do
+    
+    setup do
+      20.times { |n| Person.create!(:first_name => "Thing_#{n}") }
+    end
+    
+    should 'cope with un-locked paginated results' do
+      tally_not_locked = %r|SELECT count\(\*\) as TotalRows from \(SELECT TOP 1000000000 \* FROM \[people\]\s+WITH \(NOLOCK\) \) tally|
+      inner_tmp_not_locked = %r|SELECT TOP 15 \* FROM \[people\] WITH \(NOLOCK\)|
+      # Currently association limiting is not locked like the parent.
+      association_limiting_not_locked = %r|SELECT \[readers\]\.\* FROM \[readers\] WITH \(NOLOCK\) WHERE \(\[readers\]\.person_id IN \(1,2,3,4,5\)\)|
+      assert_sql(tally_not_locked,inner_tmp_not_locked) do
+        Person.all(:include => :readers, :lock => 'WITH (NOLOCK)', :limit => 5, :offset => 10)
+      end
+    end
 
   end
   
+  
   context 'For dueling concurrent connections' do
     
     use_concurrent_connections

data/test/cases/sqlserver_helper.rb

@@ -78,7 +78,8 @@ 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/ << /^SELECT @@TRANCOUNT/  
+  IGNORED_SQL << %r|SELECT SCOPE_IDENTITY| << %r{INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)}
+  IGNORED_SQL << %r|SELECT @@IDENTITY| << %r|SELECT @@ROWCOUNT| << %r|SELECT @@version| << %r|SELECT @@TRANCOUNT|
 end
 
 ActiveRecord::ConnectionAdapters::SQLServerAdapter.class_eval do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails-sqlserver-2000-2005-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.2.14
+  version: 2.2.15
 platform: ruby
 authors: 
 - Ken Collins
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-17 00:00:00 -07:00
+date: 2009-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: []