diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 5 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 0ccf3ccc3f..29c7bfc934 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Reverted old select_limited_ids_list postgresql fix that caused issues in mysql. Closes #5851 [Rick] + * Removes the ability for eager loaded conditions to be interpolated, since there is no model instance to use as a context for interpolation. #5553 [turnip@turnipspatch.com] * Added timeout option to SQLite3 configurations to deal more gracefully with SQLite3::BusyException, now the connection can instead retry for x seconds to see if the db clears up before throwing that exception #6126 [wreese@gmail.com] diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 459484f8c2..6f70830295 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1196,11 +1196,10 @@ module ActiveRecord sql = "SELECT " sql << "DISTINCT #{table_name}." if include_eager_conditions?(options) || include_eager_order?(options) sql << primary_key - sql << ", #{options[:order].split(',').collect { |s| s.split.first } * ', '}" if options[:order] && (include_eager_conditions?(options) || include_eager_order?(options)) sql << " FROM #{table_name} " if include_eager_conditions?(options) || include_eager_order?(options) - sql << join_dependency.join_associations.collect{|join| join.association_join }.join + sql << join_dependency.join_associations.collect(&:association_join).join add_joins!(sql, options, scope) end @@ -1209,7 +1208,7 @@ module ActiveRecord add_limit!(sql, options, scope) return sanitize_sql(sql) end - + # Checks if the conditions reference a table other than the current model table def include_eager_conditions?(options) # look in both sets of conditions diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index a2eaac549e..aa2a6ca71b 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -111,6 +111,10 @@ module ActiveRecord 63 end + def requires_order_columns_in_distinct_clause? # :nodoc: + true + end + # QUOTING ================================================== def quote(value, column = nil) |