[Rails3] Sync abstract adapter directory structure - Quoting

Author: metaskills

activerecord-sqlserver-adapter.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
     "lib/active_record/connection_adapters/sqlserver_adapter.rb",
     "lib/active_record/connection_adapters/sqlserver_adapter/core_ext/active_record.rb",
     "lib/active_record/connection_adapters/sqlserver_adapter/core_ext/odbc.rb",
-    "lib/active_record/connection_adapters/sqlserver_adapter/database_limits.rb" ]
+    "lib/active_record/connection_adapters/sqlserver_adapter/database_limits.rb",
+    "lib/active_record/connection_adapters/sqlserver_adapter/quoting.rb" ]
   s.test_files = [
     "test/cases/aaaa_create_tables_test_sqlserver.rb",
     "test/cases/adapter_test_sqlserver.rb",

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -2,6 +2,7 @@
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/sqlserver_adapter/core_ext/active_record'
 require 'active_record/connection_adapters/sqlserver_adapter/database_limits'
+require 'active_record/connection_adapters/sqlserver_adapter/quoting'
 require 'active_support/core_ext/kernel/requires'
 require 'base64'
 
@@ -162,6 +163,7 @@ def simplified_datetime
 
     class SQLServerAdapter < AbstractAdapter
 
+      include SqlserverAdapter::Quoting
       include SqlserverAdapter::DatabaseLimits
 
       ADAPTER_NAME                = 'SQLServer'.freeze
@@ -283,57 +285,6 @@ def native_binary_database_type
         @@native_binary_database_type || ((sqlserver_2005? || sqlserver_2008?) ? 'varbinary(max)' : 'image')
       end
 
-      
-      # QUOTING ==================================================#
-      
-      def quote(value, column = nil)
-        case value
-        when String, ActiveSupport::Multibyte::Chars
-          if column && column.type == :binary
-            column.class.string_to_binary(value)
-          elsif column && column.respond_to?(:is_utf8?) && column.is_utf8?
-            quoted_utf8_value(value)
-          else
-            super
-          end
-        else
-          super
-        end
-      end
-      
-      def quote_string(string)
-        string.to_s.gsub(/\'/, "''")
-      end
-      
-      def quote_column_name(column_name)
-        column_name.to_s.split('.').map{ |name| name =~ /^\[.*\]$/ ? 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
-
-      def quoted_false
-        '0'
-      end
-      
-      def quoted_date(value)
-        if value.acts_like?(:time) && value.respond_to?(:usec)
-          "#{super}.#{sprintf("%03d",value.usec/1000)}"
-        else
-          super
-        end
-      end
-      
-      def quoted_utf8_value(value)
-        "N'#{quote_string(value)}'"
-      end
-      
       # REFERENTIAL INTEGRITY ====================================#
 
       def disable_referential_integrity

lib/active_record/connection_adapters/sqlserver_adapter/quoting.rb

@@ -0,0 +1,57 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SqlserverAdapter
+      module Quoting
+        
+        def quote(value, column = nil)
+          case value
+          when String, ActiveSupport::Multibyte::Chars
+            if column && column.type == :binary
+              column.class.string_to_binary(value)
+            elsif column && column.respond_to?(:is_utf8?) && column.is_utf8?
+              quoted_utf8_value(value)
+            else
+              super
+            end
+          else
+            super
+          end
+        end
+
+        def quote_string(string)
+          string.to_s.gsub(/\'/, "''")
+        end
+
+        def quote_column_name(column_name)
+          column_name.to_s.split('.').map{ |name| name =~ /^\[.*\]$/ ? 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
+
+        def quoted_false
+          '0'
+        end
+
+        def quoted_date(value)
+          if value.acts_like?(:time) && value.respond_to?(:usec)
+            "#{super}.#{sprintf("%03d",value.usec/1000)}"
+          else
+            super
+          end
+        end
+
+        def quoted_utf8_value(value)
+          "N'#{quote_string(value)}'"
+        end
+        
+      end
+    end
+  end
+end