Skip to content

Commit 41ea3b7

Browse files
author
Anna
committed
regex should allow insert tabl_name without 'into'
1 parent fbfffca commit 41ea3b7

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ def remove_indexes(table_name, column_name)
264264
# === SQLServer Specific (Misc Helpers) ========================= #
265265

266266
def get_table_name(sql)
267-
if sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)\s+INTO\s+([^\(\s]+)\s*|^\s*update\s+([^\(\s]+)\s*/i
268-
$2 || $3
267+
if sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)(\s+INTO)?\s+([^\(\s]+)\s*|^\s*update\s+([^\(\s]+)\s*/i
268+
$3 || $4
269269
elsif sql =~ /FROM\s+([^\(\s]+)\s*/i
270270
$1
271271
else
@@ -326,7 +326,8 @@ def views_real_column_name(table_name,column_name)
326326
# === SQLServer Specific (Identity Inserts) ===================== #
327327

328328
def query_requires_identity_insert?(sql)
329-
if insert_sql?(sql)
329+
330+
if insert_sql?(sql)
330331
table_name = get_table_name(sql)
331332
id_column = identity_column(table_name)
332333
id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? quote_table_name(table_name) : false

0 commit comments

Comments
 (0)