aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRaimonds Simanovskis <raimonds.simanovskis@gmail.com>2010-05-17 00:19:18 +0300
committerRaimonds Simanovskis <raimonds.simanovskis@gmail.com>2010-06-04 22:44:04 +0300
commitc51fa6bdfc202f78907a7d1cb6bce7b0e2562913 (patch)
tree09ac73a72092103c7d4b3191a696e5d321fcbdd0 /activerecord/lib
parentb0fdd290f4b186e6da9c550336ee610970f2e8a3 (diff)
downloadrails-c51fa6bdfc202f78907a7d1cb6bce7b0e2562913.tar.gz
rails-c51fa6bdfc202f78907a7d1cb6bce7b0e2562913.tar.bz2
rails-c51fa6bdfc202f78907a7d1cb6bce7b0e2562913.zip
ignore raw_sql_ table alias that is used by Oracle adapter
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/relation.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index b6b4085ec0..99c914d7fc 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -364,7 +364,8 @@ module ActiveRecord
def tables_in_string(string)
return [] if string.blank?
# always convert table names to downcase as in Oracle quoted table names are in uppercase
- string.scan(/([a-zA-Z_][\.\w]+).?\./).flatten.map(&:downcase).uniq
+ # ignore raw_sql_ that is used by Oracle adapter as alias for limit/offset subqueries
+ string.scan(/([a-zA-Z_][\.\w]+).?\./).flatten.map(&:downcase).uniq - ['raw_sql_']
end
end