Skip to content

Commit 66ecd2e

Browse files
committed
Update execute_procedure method a bit to remove excess code.
1 parent e798bab commit 66ecd2e

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

2000-2005-adapter.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |s|
22
s.name = "2000-2005-adapter"
3-
s.version = "2.2.7"
3+
s.version = "2.2.8"
44
s.date = "2009-01-09"
55
s.summary = "SQL Server 2000 & 2005 Adapter For Rails."
66
s.email = "ken@metaskills.net"

CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ MASTER
44
*
55

66

7+
* 2.2.8 (January 9th, 2009)
8+
9+
* Update execute_procedure method a bit to remove excess code. [Ken Collins]
10+
11+
712
* 2.2.7 (January 9th, 2009)
813

914
* Created a connection#execute_procedure method that takes can take any number of ruby objects as variables

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def simplified_datetime
150150
class SQLServerAdapter < AbstractAdapter
151151

152152
ADAPTER_NAME = 'SQLServer'.freeze
153-
VERSION = '2.2.7'.freeze
153+
VERSION = '2.2.8'.freeze
154154
DATABASE_VERSION_REGEXP = /Microsoft SQL Server\s+(\d{4})/
155155
SUPPORTED_VERSIONS = [2000,2005].freeze
156156
LIMITABLE_TYPES = ['string','integer','float','char','nchar','varchar','nvarchar'].freeze
@@ -335,10 +335,9 @@ def execute(sql, name = nil, &block)
335335
end
336336

337337
def execute_procedure(proc_name, *variables)
338-
holders = (1..variables.size).to_a.map{|n|'?'}.join(', ')
339-
statement = "EXEC #{proc_name} #{holders}".strip
340-
sql = statement.gsub('?') { quote(variables.shift) }
341-
select(sql,'PROCEDURE',true).inject([]) do |results,row|
338+
vars = variables.map{ |v| quote(v) }.join(', ')
339+
sql = "EXEC #{proc_name} #{vars}".strip
340+
select(sql,'Execute Procedure',true).inject([]) do |results,row|
342341
results << row.with_indifferent_access
343342
end
344343
end

0 commit comments

Comments
 (0)