Implement #quote_table_name that first checks if table name is quoted already. Add tests which was removed from ActiveRecord a short while ago that caught this.

Author: metaskills

2000-2005-adapter.gemspec

@@ -40,7 +40,8 @@ Gem::Specification.new do |s|
     "test/connections/native_sqlserver/connection.rb",
     "test/connections/native_sqlserver_odbc/connection.rb",
     "test/migrations/transaction_table/1_table_will_never_be_created.rb",
-    "test/schema/sqlserver_specific_schema.rb" ]
+    "test/schema/sqlserver_specific_schema.rb",
+    "test/schema/table_name_test_sqlserver.rb" ]
   s.rdoc_options = ["--line-numbers", "--inline-source", "--main", "README.rdoc"]
   s.extra_rdoc_files = ["README.rdoc"]
 end

README.rdoc

@@ -48,9 +48,9 @@ First, you will need Ruby DBI and Ruby ODBC. To my knowledge the ADO DBD for DBI
 
 It should be noted that this version of the adapter was developed using both the ancient 0.0.23 version of DBI up to the current stable release of 0.4.0. Because later versions of DBI will be changing many things, IT IS HIGHLY RECOMMENDED that you max your install to version 0.4.0 which the examples below show. For the time being we are not supporting DBI versions higher than 0.4.0. The good news is that if you were using a very old DBI with ADO, technically this adapter will still work for you, but be warned your path is getting old and may not be supported for long.
 
-  $ sudo gem install dbi --version 0.4.0
-  $ sudo gem install dbd-odbc --version 0.2.4
-  $ sudo gem install rails-sqlserver-2000-2005-adapter
+  $ gem install dbi --version 0.4.0
+  $ gem install dbd-odbc --version 0.2.4
+  $ gem install rails-sqlserver-2000-2005-adapter
 
 Optionally configure your gem dependencies in your rails environment.rb file.
 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -223,6 +223,11 @@ def quote_column_name(column_name)
         column_name.to_s.split('.').map{ |name| "[#{name}]" }.join('.')
       end
 
+      def quote_table_name(table_name)
+        return table_name if table_name =~ /^\[.*\]$/
+        quote_column_name(table_name)
+      end
+      
       def quoted_true
         '1'
       end

test/cases/table_name_test_sqlserver.rb

@@ -0,0 +1,23 @@
+require 'cases/sqlserver_helper'
+require 'models/order'
+
+class TableNameTestSqlserver < ActiveRecord::TestCase
+  
+  self.use_transactional_fixtures = false
+  
+  def setup
+    Order.table_name = '[orders]'
+    Order.reset_column_information
+  end
+  
+  should 'load columns with escaped table name for model' do
+    assert_equal 4, Order.columns.length
+    
+  end
+  
+  should 'not re-escape table name if it is escaped already for SQL queries' do
+    assert_sql(/SELECT \* FROM \[orders\]/) { Order.all }
+  end
+  
+  
+end