Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 7900

Show
Ignore:
Timestamp:
10/15/07 04:44:40 (1 year ago)
Author:
lawrence
Message:

Fix test_scoped_find_limit_offset_including_has_many_association for SQL Server. Closes #9616 [lawrence]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • adapters/sqlserver/lib/active_record/connection_adapters/sqlserver_adapter.rb

    r7687 r7900  
    395395          sql << ") AS tmp1" 
    396396          if options[:order] 
    397             options[:order] = options[:order].split(',').map do |field| 
     397            order = options[:order].split(',').map do |field| 
    398398              parts = field.split(" ") 
    399399              tc = parts[0] 
     
    409409              parts.join(' ') 
    410410            end.join(', ') 
    411             sql << " ORDER BY #{change_order_direction(options[:order])}) AS tmp2 ORDER BY #{options[:order]}" 
     411            sql << " ORDER BY #{change_order_direction(order)}) AS tmp2 ORDER BY #{order}" 
    412412          else 
    413413            sql << " ) AS tmp2"