From 5132170c727342d547c4d664ba198eb0d8e5ff1b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 7 Nov 2005 09:54:28 +0000 Subject: Fixed faulty regex in get_table_name method (SQLServerAdapter) (closes #2639) [Ryan Tomayko] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2910 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 a1b424f260..de40780a5a 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -447,9 +447,9 @@ module ActiveRecord end def get_table_name(sql) - if sql =~ /into\s*([^\(\s]+)\s*|update\s*([^\(\s]+)\s*/i + if sql =~ /^\s*insert\s+into\s+([^\(\s]+)\s*|^\s*update\s+([^\(\s]+)\s*/i $1 - elsif sql =~ /from\s*([^\(\s]+)\s*/i + elsif sql =~ /from\s+([^\(\s]+)\s*/i $1 else nil -- cgit v1.2.3