Move quoting methods into adapter section for it.

Author: metaskills

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -294,6 +294,25 @@ def supports_ddl_transactions?
         true
       end
 
+      def native_database_types
+        txt = sqlserver_2005? ? "varchar(max)"   : "text"
+        bin = sqlserver_2005? ? "varbinary(max)" : "image"
+        {
+          :primary_key => "int NOT NULL IDENTITY(1, 1) PRIMARY KEY",
+          :string      => { :name => "varchar", :limit => 255  },
+          :text        => { :name =>  txt },
+          :integer     => { :name => "int" },
+          :float       => { :name => "float", :limit => 8 },
+          :decimal     => { :name => "decimal" },
+          :datetime    => { :name => "datetime" },
+          :timestamp   => { :name => "datetime" },
+          :time        => { :name => "datetime" },
+          :date        => { :name => "datetime" },
+          :binary      => { :name =>  bin },
+          :boolean     => { :name => "bit"}
+        }
+      end
+      
       def database_version
         select_value "SELECT @@version"
       end
@@ -312,34 +331,63 @@ def sqlserver_2005?
 
       # QUOTING ==================================================#
 
+      def quote(value, column = nil)
+        return value.quoted_id if value.respond_to?(:quoted_id)
+        case value
+          when TrueClass             then '1'
+          when FalseClass            then '0'
+          when String, ActiveSupport::Multibyte::Chars
+            value = value.to_s
+            # for binary columns, don't quote the result of the string to binary
+            return column.class.string_to_binary(value) if column && column.type == :binary && column.class.respond_to?(:string_to_binary)
+            super
+          else
+            if value.acts_like?(:time)
+              "'#{value.strftime("%Y%m%d %H:%M:%S")}'"
+            elsif value.acts_like?(:date)
+              "'#{value.strftime("%Y%m%d")}'"
+            else
+              super
+            end
+        end
+      end
+
+      def quote_string(string)
+        string.gsub(/\'/, "''")
+      end
+      
+      # Quotes the given column identifier.
+      # 
+      #   quote_column_name('foo') # => '[foo]'
+      #   quote_column_name(:foo) # => '[foo]'
+      #   quote_column_name('foo.bar') # => '[foo].[bar]'
+      def quote_column_name(identifier)
+        identifier.to_s.split('.').collect do |name|
+          "[#{name}]"          
+        end.join(".")
+      end
+      
+      def quote_table_name(name)
+        name_split_on_dots = name.to_s.split('.')
+        if name_split_on_dots.length == 3
+          # name is on the form "foo.bar.baz"
+          "[#{name_split_on_dots[0]}].[#{name_split_on_dots[1]}].[#{name_split_on_dots[2]}]"
+        else
+          super(name)
+        end
+      end
+      
+      # REFERENTIAL INTEGRITY ====================================#
+      # TODO: Add #disable_referential_integrity if we can use it
 
 
+      # DATABASE STATEMENTS ======================================
+      
 
       # SCHEMA STATEMENTS ========================================#
 
-      def native_database_types
-        txt = sqlserver_2005? ? "varchar(max)"   : "text"
-        bin = sqlserver_2005? ? "varbinary(max)" : "image"
-        {
-          :primary_key => "int NOT NULL IDENTITY(1, 1) PRIMARY KEY",
-          :string      => { :name => "varchar", :limit => 255  },
-          :text        => { :name =>  txt },
-          :integer     => { :name => "int" },
-          :float       => { :name => "float", :limit => 8 },
-          :decimal     => { :name => "decimal" },
-          :datetime    => { :name => "datetime" },
-          :timestamp   => { :name => "datetime" },
-          :time        => { :name => "datetime" },
-          :date        => { :name => "datetime" },
-          :binary      => { :name =>  bin },
-          :boolean     => { :name => "bit"}
-        }
-      end
 
-
 
-
-
       def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
         # Remove limit for data types which do not require it
         # Valid:   ALTER TABLE sessions ALTER COLUMN [data] varchar(max)
@@ -514,59 +562,9 @@ def rollback_db_transaction
       ensure
         @connection["AutoCommit"] = true
       end
+      
 
-      def quote(value, column = nil)
-        return value.quoted_id if value.respond_to?(:quoted_id)
-
-        case value
-          when TrueClass             then '1'
-          when FalseClass            then '0'
-
-          when String, ActiveSupport::Multibyte::Chars
-            value = value.to_s
-
-            # for binary columns, don't quote the result of the string to binary
-            return column.class.string_to_binary(value) if column && column.type == :binary && column.class.respond_to?(:string_to_binary)
-            super
-          else
-            if value.acts_like?(:time)
-              "'#{value.strftime("%Y%m%d %H:%M:%S")}'"
-            elsif value.acts_like?(:date)
-              "'#{value.strftime("%Y%m%d")}'"
-            else
-              super
-            end
-        end
-      end
-
-      def quote_string(string)
-        string.gsub(/\'/, "''")
-      end
-
-      def quote_table_name(name)
-        name_split_on_dots = name.to_s.split('.')
-
-        if name_split_on_dots.length == 3
-          # name is on the form "foo.bar.baz"
-          "[#{name_split_on_dots[0]}].[#{name_split_on_dots[1]}].[#{name_split_on_dots[2]}]"
-        else
-          super(name)
-        end
-
-      end
 
-      # Quotes the given column identifier.
-      # 
-      # Examples
-      # 
-      #   quote_column_name('foo') # => '[foo]'
-      #   quote_column_name(:foo) # => '[foo]'
-      #   quote_column_name('foo.bar') # => '[foo].[bar]'
-      def quote_column_name(identifier)
-        identifier.to_s.split('.').collect do |name|
-          "[#{name}]"          
-        end.join(".")
-      end
 
       def add_limit_offset!(sql, options)
         if options[:offset]