Minor tweaks for Rails 3.1.0.beta1. Prepare to release gem.

Author: metaskills

CHANGELOG

@@ -1,4 +1,9 @@
 
+* 3.1.0.beta1 *
+
+It just works! Uses "EXEC sp_executesql ..." for just about everything now!
+
+
 * 3.0.15 *
 
 * Way better schema support! Thanks to @ianic! Fixes #61

Gemfile

@@ -2,9 +2,6 @@
 source :rubygems
 
 gemspec :path => ENV['RAILS_SOURCE']
-# TODO: [Rails31] Remove this rack hack.
-gem 'rack', :git => 'git://github.com/rack/rack.git'  # master e8563a6 2011-03-30
-gem 'arel', :path => ENV['AREL']
 
 group :tinytds do
   if ENV['TINYTDS_SOURCE']

Rakefile

@@ -22,7 +22,7 @@ end
 
 
 task :test => ['test:dblib']
-
+task :default => [:test]
 
 namespace :test do
 

activerecord-sqlserver-adapter.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.name          = "activerecord-sqlserver-adapter"
-  s.version       = "3.0.15"
+  s.version       = "3.1.0.beta1"
   s.summary       = "SQL Server 2005 and 2008 Adapter For ActiveRecord."
   s.description   = "SQL Server 2005 and 2008 Adapter For ActiveRecord"
 

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -15,18 +15,26 @@ def execute(sql, name = nil)
           end
         end
 
-        def exec_query(sql, name = 'SQL', binds = [])
-          if id_insert_table_name = query_requires_identity_insert?(sql)
-            with_identity_insert_enabled(id_insert_table_name) do
-              binds.empty? ? raw_select(sql, name, binds, :ar_result => true) : do_exec_query(sql, name, binds)
-            end
+        def exec_query(sql, name = 'SQL', binds = [], sqlserver_options = {})
+          if id_insert_table_name = sqlserver_options[:insert] ? query_requires_identity_insert?(sql) : nil
+            with_identity_insert_enabled(id_insert_table_name) { do_exec_query(sql, name, binds) }
           else
-            binds.empty? ? raw_select(sql, name, binds, :ar_result => true) : do_exec_query(sql, name, binds)
+            do_exec_query(sql, name, binds)
           end
         end
 
         def exec_insert(sql, name, binds)
-          exec_query(sql, name, binds)
+          exec_query sql, name, binds, :insert => true
+        end
+        
+        def exec_delete(sql, name, binds)
+          sql << "; SELECT @@ROWCOUNT AS AffectedRows"
+          super.rows.first.first
+        end
+
+        def exec_update(sql, name, binds)
+          sql << "; SELECT @@ROWCOUNT AS AffectedRows"
+          super.rows.first.first
         end
 
         def outside_transaction?
@@ -71,13 +79,6 @@ def empty_insert_statement_value
         def case_sensitive_modifier(node)
           node.acts_like?(:string) ? Arel::Nodes::Bin.new(node) : node
         end
-
-        def limited_update_conditions(where_sql, quoted_table_name, quoted_primary_key)
-          match_data = where_sql.match(/^(.*?[\]\) ])WHERE[\[\( ]/)
-          limit = match_data[1]
-          where_sql.sub!(limit,'')
-          "WHERE #{quoted_primary_key} IN (SELECT #{limit} #{quoted_primary_key} FROM #{quoted_table_name} #{where_sql})"
-        end
 
         # === SQLServer Specific ======================================== #
 
@@ -207,23 +208,8 @@ def select(sql, name = nil, binds = [])
           exec_query(sql, name, binds).to_a
         end
 
-        def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
-          super || select_value("SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident")
-        end
-        
-        def update_sql(sql, name = nil)
-          @update_sql = true
-          case @connection_options[:mode]
-          when :dblib
-            execute(sql, name)
-          else
-            execute(sql, name)
-            select_value('SELECT @@ROWCOUNT AS AffectedRows')
-          end
-        end
-        
         def sql_for_insert(sql, pk, id_value, sequence_name, binds)
-          sql = "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident" unless binds.empty?
+          sql = "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"# unless binds.empty?
           super
         end
 
@@ -268,7 +254,8 @@ def do_exec_query(sql, name, binds)
             quoted_value = ar_column ? quote(v,column) : quote(v,nil)
             params << "@#{index} = #{quoted_value}"
           end
-          sql = "EXEC sp_executesql #{statement}, #{quote(names_and_types.join(', '))}, #{params.join(', ')}"
+          sql = "EXEC sp_executesql #{statement}"
+          sql << ", #{quote(names_and_types.join(', '))}, #{params.join(', ')}" unless binds.empty?
           raw_select sql, name, binds, :ar_result => true
         end
 
@@ -341,7 +328,6 @@ def handle_to_names_and_values_dblib(handle, options={})
           options[:ar_result] ? ActiveRecord::Result.new(handle.fields, results) : results
         end
 
-        # TODO [Rails31] Use options[:ar_result]
         def handle_to_names_and_values_odbc(handle, options={})
           @connection.use_utc = ActiveRecord::Base.default_timezone == :utc
           if options[:ar_result]
@@ -358,7 +344,6 @@ def handle_to_names_and_values_odbc(handle, options={})
           end
         end
 
-        # TODO [Rails31] Use options[:ar_result]
         def handle_to_names_and_values_adonet(handle, options={})
           if handle.has_rows
             names = []

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -161,7 +161,7 @@ class SQLServerAdapter < AbstractAdapter
       include Sqlserver::Errors
 
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.0.15'.freeze
+      VERSION                     = '3.1.0.beta1'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011].freeze
 

test/cases/adapter_test_sqlserver.rb

@@ -120,15 +120,6 @@ def setup
       assert !@connection.send(:insert_sql?,'SELECT...')
     end
 
-    context 'for #limited_update_conditions' do
-    
-      should 'only match up to the first WHERE' do
-        where_sql = "TOP 1 WHERE ([posts].author_id = 1 and [posts].columnWHEREname = 2)  ORDER BY posts.id"
-        assert_equal "WHERE bar IN (SELECT TOP 1  bar FROM foo WHERE ([posts].author_id = 1 and [posts].columnWHEREname = 2)  ORDER BY posts.id)", @connection.limited_update_conditions(where_sql, 'foo', 'bar')
-      end
-    
-    end
-    
     context 'for #get_table_name' do
 
       should 'return quoted table name from basic INSERT, UPDATE and SELECT statements' do

test/cases/offset_and_limit_test_sqlserver.rb

@@ -37,11 +37,11 @@ class OffsetAndLimitTestSqlserver < ActiveRecord::TestCase
     end
 
     should 'not convert strings which look like integers to integers' do
-      assert_sql(/WHERE \[__rnt\]\.\[__rn\] > \(N'5'\)/) { Book.limit(10).offset('5').all }
+      assert_sql(/WHERE \[__rnt\]\.\[__rn\] > \(N''5''\)/) { Book.limit(10).offset('5').all }
     end
 
     should 'alter SQL to limit number of records returned offset by specified amount' do
-      sql = %|SELECT TOP (3) [__rnt].* FROM ( SELECT ROW_NUMBER() OVER (ORDER BY [books].[id] ASC) AS [__rn], [books].* FROM [books] ) AS [__rnt] WHERE [__rnt].[__rn] > (5)|
+      sql = %|EXEC sp_executesql N'SELECT TOP (3) [__rnt].* FROM ( SELECT ROW_NUMBER() OVER (ORDER BY [books].[id] ASC) AS [__rn], [books].* FROM [books] ) AS [__rnt] WHERE [__rnt].[__rn] > (5)'|
       assert_sql(sql) { Book.limit(3).offset(5).all }
     end
 

test/cases/sqlserver_helper.rb

@@ -82,9 +82,7 @@ def method_added(method)
 module ActiveRecord
   class SQLCounter
     IGNORED_SQL << %r|SELECT SCOPE_IDENTITY| << %r{INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)} << 
-                   %r|SELECT @@IDENTITY| << %r|SELECT @@ROWCOUNT| << %r|SELECT @@version| << %r|SELECT @@TRANCOUNT| <<
-                   %r{(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION}
-    
+                   %r|SELECT @@version| << %r|SELECT @@TRANCOUNT| << %r{(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION}
   end
 end