aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-10 19:18:07 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-10 19:18:07 +0000
commitc0bce43e903fe42645c16a8062ce1cd970217f40 (patch)
treec72089bbd6a62640956bbd5360ab05e23507727b /activerecord/lib/active_record/connection_adapters/abstract
parent63df6eb3821ba9723a3478f6331bd14b81be8140 (diff)
downloadrails-c0bce43e903fe42645c16a8062ce1cd970217f40.tar.gz
rails-c0bce43e903fe42645c16a8062ce1cd970217f40.tar.bz2
rails-c0bce43e903fe42645c16a8062ce1cd970217f40.zip
Oracle: fix limited id selection for eager loading. Closes #6515.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5480 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index a098c02829..599d04e593 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -280,8 +280,11 @@ module ActiveRecord
sql << " NOT NULL" if options[:null] == false
end
- # SELECT DISTINCT clause for a given set of columns. PostgreSQL overrides this for custom DISTINCT syntax.
- def distinct(columns, *order_columns)
+ # SELECT DISTINCT clause for a given set of columns and a given ORDER BY clause.
+ # Both PostgreSQL and Oracle overrides this for custom DISTINCT syntax.
+ #
+ # distinct("posts.id", "posts.created_at desc")
+ def distinct(columns, order_by)
"DISTINCT #{columns}"
end
end