Leave quoted column names as is. Resolves ticket #36 [Vince Puzzella]

Author: metaskills

CHANGELOG

@@ -1,6 +1,8 @@
 
 MASTER
 
+* Leave quoted column names as is. Resolves ticket #36 [Vince Puzzella]
+
 * Changing add_limit! in ActiveRecord::Base for SQLServer so that it passes through any scoped :order 
   parameters. Resolves ticket #35 [Murray Steele]
 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -309,7 +309,7 @@ def quote_string(string)
       end
 
       def quote_column_name(column_name)
-        column_name.to_s.split('.').map{ |name| "[#{name}]" }.join('.')
+        column_name.to_s.split('.').map{ |name| name =~ /^\[.*\]$/ ? name : "[#{name}]" }.join('.')
       end
 
       def quote_table_name(table_name)

test/cases/adapter_test_sqlserver.rb

@@ -372,6 +372,11 @@ def setup
       assert_equal '[foo].[bar]', @connection.quote_column_name('foo.bar')
     end
 
+    should 'not quote already quoted column names with brackets' do
+      assert_equal '[foo]', @connection.quote_column_name('[foo]')
+      assert_equal '[foo].[bar]', @connection.quote_column_name('[foo].[bar]')
+    end
+    
     should 'quote table names like columns' do
       assert_equal '[foo].[bar]', @connection.quote_column_name('foo.bar')
       assert_equal '[foo].[bar].[baz]', @connection.quote_column_name('foo.bar.baz')