Simple sqlserver specific test for #quote_string. Move all idenity insert methods around for org.

Author: metaskills

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -840,8 +840,41 @@ def pk_and_sequence_for(table_name)
         @connection["AutoCommit"] = true
       end
 
+      
       private
 
+      # IDENTITY INSERTS =========================================#
+      
+      def with_identity_insert_enabled(table_name, &block)
+        set_identity_insert(table_name, true)
+        yield
+      ensure
+        set_identity_insert(table_name, false)
+      end
+      
+      def set_identity_insert(table_name, enable = true)
+        execute "SET IDENTITY_INSERT #{table_name} #{enable ? 'ON' : 'OFF'}"
+      rescue Exception => e
+        raise ActiveRecordError, "IDENTITY_INSERT could not be turned #{enable ? 'ON' : 'OFF'} for table #{table_name}"
+      end
+      
+      def query_requires_identity_insert?(sql)
+        table_name = get_table_name(sql)
+        id_column = identity_column(table_name)
+        sql =~ /INSERT[^(]+\([^)]*\[#{id_column}\][^)]*\)/ ? table_name : nil
+      end
+      
+      def identity_column(table_name)
+        @table_columns ||= {}
+        @table_columns[table_name] = columns(table_name) if @table_columns[table_name] == nil
+        @table_columns[table_name].each do |col|
+          return col.name if col.identity
+        end
+        return nil
+      end
+      
+      
+      
       def __indexes(table_name, name = nil)
         indexes = []
         execute("EXEC sp_helpindex '#{table_name}'", name) do |handle|
@@ -875,23 +908,7 @@ def select(sql, name = nil, ignore_special_columns = false)
         end
         result
       end
-
-      # Turns IDENTITY_INSERT ON for table during execution of the block
-      # N.B. This sets the state of IDENTITY_INSERT to OFF after the
-      # block has been executed without regard to its previous state
-      def with_identity_insert_enabled(table_name, &block)
-        set_identity_insert(table_name, true)
-        yield
-      ensure
-        set_identity_insert(table_name, false)
-      end
-
-      def set_identity_insert(table_name, enable = true)
-        execute "SET IDENTITY_INSERT #{table_name} #{enable ? 'ON' : 'OFF'}"
-      rescue Exception => e
-        raise ActiveRecordError, "IDENTITY_INSERT could not be turned #{enable ? 'ON' : 'OFF'} for table #{table_name}"
-      end
-
+      
       def get_table_name(sql)
         if sql =~ /^\s*insert\s+into\s+([^\(\s]+)\s*|^\s*update\s+([^\(\s]+)\s*/i
           $1 || $2
@@ -901,23 +918,7 @@ def get_table_name(sql)
           nil
         end
       end
-
-      def identity_column(table_name)
-        @table_columns ||= {}
-        @table_columns[table_name] = columns(table_name) if @table_columns[table_name] == nil
-        @table_columns[table_name].each do |col|
-          return col.name if col.identity
-        end
-
-        return nil
-      end
-
-      def query_requires_identity_insert?(sql)
-        table_name = get_table_name(sql)
-        id_column = identity_column(table_name)
-        sql =~ /INSERT[^(]+\([^)]*\[#{id_column}\][^)]*\)/ ? table_name : nil
-      end
-
+      
       def change_order_direction(order)
         order.split(",").collect {|fragment|
           case fragment

test/cases/adapter_test_sqlserver.rb

@@ -3,9 +3,7 @@
 require 'models/topic'
 
 class AdapterTestSqlserver < ActiveRecord::TestCase
-  
-  fixtures :binaries
-  
+    
   def setup
     @connection = ActiveRecord::Base.connection
   end
@@ -66,6 +64,11 @@ def setup
       assert_equal '0', @connection.quoted_false
     end
 
+    should 'not escape backslash characters like abstract adapter' do
+      string_with_backslashs = "\\n"
+      assert_equal string_with_backslashs, @connection.quote_string(string_with_backslashs)
+    end
+    
   end
 
   context 'For DatabaseStatements' do

test/cases/connection_test_sqlserver.rb

@@ -13,7 +13,7 @@ def setup
   end
 
 
-  should 'affecte rows' do
+  should 'affect rows' do
     assert Topic.connection.instance_variable_get("@connection")["AutoCommit"]
     topic_data = { 1 => { "content" => "1 updated" }, 2 => { "content" => "2 updated" } }
     updated = Topic.update(topic_data.keys, topic_data.values)