[Rails3] Remove special column (text,ntext,binary) equality/order hacks on all SELECT statements. This is moot since 2005/2008 test using the correct data types and if users are using equality/order SQL on these types, they should get the errors that come with them.

Author: metaskills

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -126,7 +126,7 @@ def limited_update_conditions(where_sql, quoted_table_name, quoted_primary_key)
         def execute_procedure(proc_name, *variables)
           vars = variables.map{ |v| quote(v) }.join(', ')
           sql = "EXEC #{proc_name} #{vars}".strip
-          select(sql,'Execute Procedure',true).inject([]) do |results,row|
+          select(sql,'Execute Procedure').inject([]) do |results,row|
             if row.kind_of?(Array)
               results << row.inject([]) { |rs,r| rs << r.with_indifferent_access }
             else
@@ -165,8 +165,7 @@ def run_with_isolation_level(isolation_level)
 
         protected
 
-        def select(sql, name = nil, ignore_special_columns = false)
-          repair_special_columns(sql) unless ignore_special_columns
+        def select(sql, name = nil)
           fields_and_row_sets = raw_select(sql,name)
           final_result_set = fields_and_row_sets.inject([]) do |rs,fields_and_rows|
             fields, rows = fields_and_rows

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -202,7 +202,7 @@ def column_definitions(table_name)
             WHERE columns.TABLE_NAME = '#{table_name}'
             ORDER BY columns.ordinal_position
           }.gsub(/[ \t\r\n]+/,' ')
-          results = info_schema_query { select(sql,nil,true) }
+          results = info_schema_query { select(sql,nil) }
           results.collect do |ci|
             ci.symbolize_keys!
             ci[:type] = case ci[:type]

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -92,10 +92,6 @@ def is_identity?
         @sqlserver_options[:is_identity]
       end
 
-      def is_special?
-        sql_type =~ /^text|ntext|image$/
-      end
-      
       def is_utf8?
         sql_type =~ /nvarchar|ntext|nchar/i
       end
@@ -476,21 +472,6 @@ def finish_statement_handle(handle)
         end
         handle
       end
-      
-      # HELPER METHODS ===========================================#
-      
-      def special_columns(table_name)
-        columns(table_name).select(&:is_special?).map(&:name)
-      end
-      
-      def repair_special_columns(sql)
-        special_cols = special_columns(get_table_name(sql))
-        for col in special_cols.to_a
-          sql.gsub!(/((\.|\s|\()\[?#{col.to_s}\]?)\s?=\s?/, '\1 LIKE ')
-          sql.gsub!(/ORDER BY #{col.to_s}/i, '')
-        end
-        sql
-      end
 
     end #class SQLServerAdapter < AbstractAdapter