@@ -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] CHANGELOG @@ -309,7 +309,7 @@ module ActiveRecord 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) lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -372,6 +372,11 @@ class AdapterTestSqlserver < ActiveRecord::TestCase 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') test/cases/adapter_test_sqlserver.rb cfad9bf8cda72b2c2ca1dacc0d5dfb34bfe4f04e Ken Collins ken@metaskills.net http://github.com/rails-sqlserver/2000-2005-adapter/commit/32ff3920b2755f10ff15267e880cdf0a91973146 32ff3920b2755f10ff15267e880cdf0a91973146 2009-06-18T07:15:47-07:00 2009-06-18T07:15:47-07:00 Leave quoted column names as is. Resolves ticket #36 [Vince Puzzella] ca65167377a6f0d9650480a32ff41070e692c345 Ken Collins ken@metaskills.net