diff options
| author | Rick Olson <technoweenie@gmail.com> | 2006-10-13 08:52:33 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2006-10-13 08:52:33 +0000 |
| commit | 2c6b6e2866c89b8158811c649c5292eda5d24012 (patch) | |
| tree | 2914d243ed4bcbc66e5b5a6dbcb4a2d85a587a10 /activerecord/lib/active_record/associations.rb | |
| parent | e789b26e652d9f0ee6ca538615b8d570cb4c91b5 (diff) | |
| download | rails-2c6b6e2866c89b8158811c649c5292eda5d24012.tar.gz rails-2c6b6e2866c89b8158811c649c5292eda5d24012.tar.bz2 rails-2c6b6e2866c89b8158811c649c5292eda5d24012.zip | |
automatically add primary key to #select_limited_ids_list order by clause for databases that require order columns in the distinct statements (postgresql) [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5292 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index d52695d162..505ebea9f6 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1197,6 +1197,7 @@ module ActiveRecord sql = "SELECT " if is_distinct ordered_columns = options[:order].to_s.split(',').collect! { |s| s.split.first } + options[:order] = "#{table_name}.#{primary_key}, #{options[:order]}" if options[:order] && connection.requires_order_columns_in_distinct_clause? sql << connection.distinct("#{table_name}.#{primary_key}", ordered_columns) else sql << primary_key |