Skip to content

Fixed select_rows() to actual support binds via do_exec_query() #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
annaswims merged 1 commit into from
May 6, 2014
Merged

Fixed select_rows() to actual support binds via do_exec_query() #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions lib/active_record/connection_adapters/sqlserver/database_statements.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Sqlserver
module DatabaseStatements

def select_rows(sql, name = nil, binds = [])
raw_select sql, name, binds, fetch: :rows
do_exec_query sql, name, binds, fetch: :rows
end

def execute(sql, name = nil)
Expand Down Expand Up @@ -327,7 +327,13 @@ def do_execute(sql, name = 'SQL')
end
end

def do_exec_query(sql, name, binds)
def do_exec_query(sql, name, binds, options = {})
# This allows non-AR code to utilize the binds
# handling code, e.g. select_rows()
if options[:fetch] != :rows
options[:ar_result] = true
end

explaining = name == 'EXPLAIN'
names_and_types = []
params = []
Expand Down Expand Up @@ -358,7 +364,7 @@ def do_exec_query(sql, name, binds)
sql = "EXEC sp_executesql #{quote(sql)}"
sql << ", #{quote(names_and_types.join(', '))}, #{params.join(', ')}" unless binds.empty?
end
raw_select sql, name, binds, ar_result: true
raw_select sql, name, binds, options
end

def raw_connection_do(sql)
Expand Down