From d4daf7bba7dda756ab4700016e9b4b31f6127a1e Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Mon, 11 Feb 2008 02:50:58 +0000 Subject: Fix eager loading with pre-quoted table names. Closes #11046 [danielmorrison, Koz, Jeremy Kemper] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8856 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/associations.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index cb17b6e483..3ff2d5db6b 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1379,7 +1379,7 @@ module ActiveRecord end end return false unless conditions.any? - conditions.join(' ').scan(/([\.\w]+)\.\w+/).flatten.any? do |condition_table_name| + conditions.join(' ').scan(/([\.\w]+).?\./).flatten.any? do |condition_table_name| condition_table_name != table_name end end @@ -1388,7 +1388,7 @@ module ActiveRecord def include_eager_order?(options) order = options[:order] return false unless order - order.to_s.scan(/([\.\w]+)\.\w+/).flatten.any? do |order_table_name| + order.to_s.scan(/([\.\w]+).?\./).flatten.any? do |order_table_name| order_table_name != table_name end end -- cgit v1.2.3