activerecord-sqlserver-adapter 2.3.19 → 2.3.20

data/CHANGELOG

@@ -1,4 +1,9 @@
 
+* 2.3.20 *
+
+* Fixes quote column names and passes tests for ActiveRecord 2.3.14.
+
+
 * 2.3.19 *
 
 * Allow drop_database to be called even when DB does not exist.

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -147,7 +147,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '2.3.19'.freeze
+      VERSION                     = '2.3.20'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS          = [2000,2005,2008].freeze
       LIMITABLE_TYPES             = ['string','integer','float','char','nchar','varchar','nvarchar'].to_set.freeze
@@ -284,7 +284,7 @@ module ActiveRecord
       
       def quote_column_name(name)
         @sqlserver_quoted_column_and_table_names[name] ||= 
-          name.to_s.split('.').map{ |n| n =~ /^\[.*\]$/ ? n : "[#{n}]" }.join('.')
+          name.to_s.split('.').map{ |n| n =~ /^\[.*\]$/ ? n : "[#{n.to_s.gsub(']', ']]')}]" }.join('.')
       end
       
       def quote_table_name(name)

data/test/cases/basics_test_sqlserver.rb

@@ -8,6 +8,7 @@ end
 class BasicsTest < ActiveRecord::TestCase
   
   COERCED_TESTS = [
+    :test_column_names_are_escaped,
     :test_read_attributes_before_type_cast_on_datetime, 
     :test_preserving_date_objects,
     :test_to_xml ]
@@ -16,6 +17,10 @@ class BasicsTest < ActiveRecord::TestCase
   
   fixtures :developers
   
+  def test_coerced_column_names_are_escaped
+    assert_equal "[foo]]bar]", ActiveRecord::Base.connection.quote_column_name("foo]bar")
+  end
+  
   def test_coerced_test_read_attributes_before_type_cast_on_datetime
     developer = Developer.find(:first)
     if developer.created_at_before_type_cast.is_a?(String)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 43
   prerelease: 
   segments: 
   - 2
   - 3
-  - 19
-  version: 2.3.19
+  - 20
+  version: 2.3.20
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-19 00:00:00 -04:00
+date: 2011-08-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency