Skip to content

Commit 78b25ef

Browse files
author
lawrence
committed
SQL Server fix: add_lock! logs warning and continues nicely.
git-svn-id: http://dev.rubyonrails.org/svn/rails/adapters/sqlserver@7985 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1 parent 1fc3622 commit 78b25ef

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,11 @@ def add_limit_offset!(sql, options)
417417
end
418418
end
419419

420+
def add_lock!(sql, options)
421+
@logger.info "Warning: SQLServer :lock option '#{options[:lock].inspect}' not supported" if @logger && options.has_key?(:lock)
422+
sql
423+
end
424+
420425
def recreate_database(name)
421426
drop_database(name)
422427
create_database(name)

0 commit comments

Comments
 (0)