Skip to content

Commit 90d4a19

Browse files
committed
Ruby ODBC compatibility.
1 parent 068df84 commit 90d4a19

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/active_record/connection_adapters/sqlserver/database_statements.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ def execute(sql, name = nil)
1616
end
1717

1818
def exec_query(sql, name = 'SQL', binds = [])
19-
return raw_select(sql, name, binds, :ar_result => true) if binds.empty?
2019
if id_insert_table_name = query_requires_identity_insert?(sql)
21-
with_identity_insert_enabled(id_insert_table_name) { do_exec_query(sql, name, binds) }
20+
with_identity_insert_enabled(id_insert_table_name) do
21+
binds.empty? ? raw_select(sql, name, binds, :ar_result => true) : do_exec_query(sql, name, binds)
22+
end
2223
else
23-
do_exec_query(sql, name, binds)
24+
binds.empty? ? raw_select(sql, name, binds, :ar_result => true) : do_exec_query(sql, name, binds)
2425
end
2526
end
2627

2728
def exec_insert(sql, name, binds)
28-
sql = "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"
2929
exec_query(sql, name, binds)
3030
end
3131

0 commit comments

Comments
 (0)