Altered limited_update_conditions regex conditions, the .* would greedily fail if the where_sql had WHERE in a table or field, etc.

Author: metaskills

CHANGELOG

@@ -1,7 +1,8 @@
 
 MASTER
 
-* 
+* Altered limited_update_conditions regex conditions, the .* would greedily fail 
+  if the where_sql had WHERE in a table or field, etc. [Ransom Briggs]
 
 * Changing test to allow ENV['ARUNIT_DB_NAME'] as the database name for the test units. 
   Matches up with AR conventions. [Ransom Briggs]

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -522,7 +522,7 @@ def case_sensitive_equality_operator
       end
 
       def limited_update_conditions(where_sql, quoted_table_name, quoted_primary_key)
-        match_data = where_sql.match(/(.*)WHERE/)
+        match_data = where_sql.match(/^(.*?[\]\) ])WHERE[\[\( ]/)
         limit = match_data[1]
         where_sql.sub!(limit,'')
         "WHERE #{quoted_primary_key} IN (SELECT #{limit} #{quoted_primary_key} FROM #{quoted_table_name} #{where_sql})"

test/cases/adapter_test_sqlserver.rb

@@ -128,6 +128,15 @@ def setup
       assert !@connection.send(:insert_sql?,'UPDATE...')
       assert !@connection.send(:insert_sql?,'SELECT...')
     end
+    
+    context 'for #limited_update_conditions' do
+    
+      should 'only match up to the first WHERE' do
+        where_sql = "TOP 1 WHERE ([posts].author_id = 1 and [posts].columnWHEREname = 2)  ORDER BY posts.id"
+        assert_equal "WHERE bar IN (SELECT TOP 1  bar FROM foo WHERE ([posts].author_id = 1 and [posts].columnWHEREname = 2)  ORDER BY posts.id)", @connection.limited_update_conditions(where_sql, 'foo', 'bar')
+      end
+    
+    end
 
     context 'for #sql_for_association_limiting?' do