Browse files

Reverted old select_limited_ids_list postgresql fix that caused issue…

…s in mysql. Closes #5851 [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5265 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1 parent 8e3bf70 commit c98b471ca46bb21491649d8ca56052e14a0d1bd7 @technoweenie technoweenie committed Oct 9, 2006
View
2 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]
View
5 activerecord/lib/active_record/associations.rb
@@ -1196,11 +1196,10 @@ def construct_finder_sql_for_association_limiting(options, join_dependency)
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 @@ def construct_finder_sql_for_association_limiting(options, join_dependency)
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
View
4 activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -111,6 +111,10 @@ def table_alias_length
63
end
+ def requires_order_columns_in_distinct_clause? # :nodoc:
+ true
+ end
+
# QUOTING ==================================================
def quote(value, column = nil)

0 comments on commit c98b471

Please sign in to comment.