Switch to better abstract execute that mimics PostgreSQL adapter by using #raw_select as single method for type casting straigt DBI values. This kept #select_rows from duplicating work. Added a alias method chain to #raw_select since #select (and maybe more) will use it. Note, some thing may look odd, but I have to point out that DBI's execute does not return the handle when a block is given... a bug in my opinion.

Author: metaskills

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -357,7 +357,7 @@ def quoted_false
       end
 
       # TODO: I get the feeling this needs to go and that it is patching something else wrong.
-      def quoted_date(value)
+      def quoted_date(value)      
         if value.acts_like?(:time)
           value.strftime("%Y%m%d %H:%M:%S")
         elsif value.acts_like?(:date)
@@ -375,40 +375,16 @@ def quoted_date(value)
       # DATABASE STATEMENTS ======================================
 
       def select_rows(sql, name = nil)
-        rows = []
-        repair_special_columns(sql)
-        log(sql, name) do
-          @connection.select_all(sql) do |row|
-            record = []
-            row.each do |col|
-              if col.is_a? DBI::Timestamp
-                record << col.to_time
-              else
-                record << col
-              end
-            end
-            rows << record
-          end
-        end
-        rows
+        raw_select(sql,name).last
       end
 
-      def execute(sql, name = nil)
+      def execute(sql, name = nil, &block)
         if table_name = query_requires_identity_insert?(sql)
-          log(sql, name) do
-            with_identity_insert_enabled(table_name) do
-              @connection.execute(sql) do |handle|
-                yield(handle) if block_given?
-              end
-            end
-          end
+          handle = with_identity_insert_enabled(table_name) { raw_execute(sql,name,&block) }
         else
-          log(sql, name) do
-            @connection.execute(sql) do |handle|
-              yield(handle) if block_given?
-            end
-          end
+          handle = raw_execute(sql,name,&block)
         end
+        finish_statement_handle(handle)
       end
 
       def begin_db_transaction
@@ -511,18 +487,14 @@ def empty_insert_statement(table_name)
 
       def select(sql, name = nil, ignore_special_columns = false)
         repair_special_columns(sql) unless ignore_special_columns
+        fields, rows = raw_select(sql,name)
         result = []
-        execute(sql) do |handle|
-          handle.each do |row|
-            row_hash = {}
-            row.each_with_index do |value, i|
-              if value.is_a? DBI::Timestamp
-                value = DateTime.new(value.year, value.month, value.day, value.hour, value.minute, value.sec)
-              end
-              row_hash[handle.column_names[i]] = value
-            end
-            result << row_hash
+        for row in rows
+          row_hash = {}
+          fields.each_with_index do |f, i|
+            row_hash[f] = row[i]
           end
+          result << row_hash
         end
         result
       end
@@ -777,6 +749,11 @@ def disconnect!
         @connection.disconnect rescue nil
       end
 
+      def finish_statement_handle(handle)
+        handle.finish if handle && handle.respond_to?(:finish) && !handle.finished?
+        handle
+      end
+      
 
       # RAKE UTILITY METHODS =====================================#
 
@@ -828,6 +805,48 @@ def remove_database_connections_and_rollback(name)
 
       private
 
+      # DATABASE STATEMENTS ======================================
+      
+      def raw_execute(sql, name = nil, &block)
+        log(sql, name) do
+          if block_given?
+            @connection.execute(sql) { |handle| yield(handle) }
+          else
+            @connection.execute(sql)
+          end
+        end
+      end
+      
+      def raw_select(sql, name = nil)
+        handle = raw_execute(sql,name)
+        fields = handle.column_names
+        results = handle_as_array(handle)
+        rows = results.inject([]) do |rows,row|
+          row.each_with_index do |value, i|
+            if value.is_a? DBI::Timestamp
+              row[i] = value.to_time
+              # TODO: Let's revisit this and the whole DB time thing.
+              # row[i] = DateTime.new(value.year, value.month, value.day, value.hour, value.minute, value.sec)
+            end
+          end
+          rows << row
+        end
+        return fields, rows
+      end
+      
+      def query(sql, name = nil)
+        handle = raw_execute(sql,name)
+        handle_as_array(handle)
+      end
+      
+      def handle_as_array(handle)
+        array = handle.inject([]) do |rows,row|
+          rows << row.inject([]){ |values,value| values << value }
+        end
+        finish_statement_handle(handle)
+        array
+      end
+      
       # IDENTITY INSERTS =========================================#
 
       def with_identity_insert_enabled(table_name, &block)
@@ -838,7 +857,8 @@ def with_identity_insert_enabled(table_name, &block)
       end
 
       def set_identity_insert(table_name, enable = true)
-        execute "SET IDENTITY_INSERT #{table_name} #{enable ? 'ON' : 'OFF'}"
+        sql = "SET IDENTITY_INSERT #{table_name} #{enable ? 'ON' : 'OFF'}"
+        log(sql,'IDENTITY_INSERT') { execute(sql) }
       rescue Exception => e
         raise ActiveRecordError, "IDENTITY_INSERT could not be turned #{enable ? 'ON' : 'OFF'} for table #{table_name}"
       end

test/cases/adapter_test_sqlserver.rb

@@ -1,6 +1,7 @@
 require 'cases/sqlserver_helper'
 require 'models/task'
 require 'models/topic'
+require 'models/reply'
 require 'models/joke'
 require 'models/subscriber'
 

test/cases/connection_test_sqlserver.rb

@@ -13,6 +13,36 @@ def setup
   end
 
 
+  should 'return finished DBI statment handle from #execute without block' do
+    handle = @connection.execute('SELECT * FROM [topics]')
+    assert_instance_of DBI::StatementHandle, handle
+    assert handle.finished?
+  end
+  
+  should 'finish DBI statment handle from #execute with block' do
+    assert_all_statements_used_are_closed do
+      @connection.execute('SELECT * FROM [topics]') { }
+    end
+  end
+  
+  should 'return an unfinished DBI statement handler from #raw_execute' do
+    handle = @connection.send(:raw_execute,'SELECT * FROM [topics]')
+    assert_instance_of DBI::StatementHandle, handle
+    assert !handle.finished?
+  end
+  
+  should 'finish connection from #query' do
+    assert_all_statements_used_are_closed do
+      @connection.send(:query,'SELECT * FROM [topics]')
+    end
+  end
+  
+  should 'finish connection from #raw_select' do
+    assert_all_statements_used_are_closed do
+      @connection.send(:raw_select,'SELECT * FROM [topics]')
+    end
+  end
+  
   should 'affect rows' do
     assert Topic.connection.instance_variable_get("@connection")["AutoCommit"]
     topic_data = { 1 => { "content" => "1 updated" }, 2 => { "content" => "2 updated" } }
@@ -28,21 +58,21 @@ def setup
       @connection.execute("SELECT 1")
     end
   end
-
+  
   should 'execute with block closes statement' do
     assert_all_statements_used_are_closed do
       @connection.execute("SELECT 1") do |sth|
         assert !sth.finished?, "Statement should still be alive within block"
       end
     end
   end
-
+  
   should 'insert with identity closes statement' do
     assert_all_statements_used_are_closed do
       @connection.insert("INSERT INTO accounts ([id], [firm_id],[credit_limit]) values (999, 1, 50)")
     end
   end
-
+  
   should 'insert without identity closes statement' do
     assert_all_statements_used_are_closed do
       @connection.insert("INSERT INTO accounts ([firm_id],[credit_limit]) values (1, 50)")

test/cases/sqlserver_helper.rb

@@ -18,6 +18,15 @@ class TableWithRealColumn < ActiveRecord::Base; end
   IGNORED_SQL << /SELECT SCOPE_IDENTITY/ << /INFORMATION_SCHEMA.TABLES/ << /INFORMATION_SCHEMA.COLUMNS/
 end
 
+ActiveRecord::ConnectionAdapters::SQLServerAdapter.class_eval do
+  def raw_select_with_query_record(sql, name = nil)
+    $queries_executed ||= []
+    $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
+    raw_select_without_query_record(sql,name)
+  end
+  alias_method_chain :raw_select, :query_record
+end
+
 module ActiveRecord 
   class TestCase < ActiveSupport::TestCase
     def assert_sql(*patterns_to_match)