From c20713834a6f3e14286fb501029437708609eaff Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 9 Jul 2005 17:02:32 +0000 Subject: Fixed optimistic locking with SQL Server #1660 [tom@popdog.net] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1784 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../lib/active_record/connection_adapters/sqlserver_adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb') diff --git a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb index 1863a9be57..7b68283e57 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -236,9 +236,9 @@ module ActiveRecord end def execute(sql, name = nil) - if sql =~ /^INSERT/i + if sql =~ /^\s*INSERT/i insert(sql, name) - elsif sql =~ /^UPDATE|DELETE/i + elsif sql =~ /^\s*UPDATE|^\s*DELETE/i log(sql, name) do @connection.execute(sql) retVal = select_one("SELECT @@ROWCOUNT AS AffectedRows")["AffectedRows"] -- cgit v1.2.3