0
@@ -1679,19 +1679,19 @@ module ActiveRecord
0
               else            all << cond
0
             end
0
           end
0
-          conditions.join(' ').scan(/([\.\w]+).?\./).flatten
0
+          conditions.join(' ').scan(/([\.a-zA-Z_]+).?\./).flatten
0
         end
0
 
0
         def order_tables(options)
0
           order = [options[:order], scope(:find, :order) ].join(", ")
0
           return [] unless order && order.is_a?(String)
0
-          order.scan(/([\.\w]+).?\./).flatten
0
+          order.scan(/([\.a-zA-Z_]+).?\./).flatten
0
         end
0
 
0
         def selects_tables(options)
0
           select = options[:select]
0
           return [] unless select && select.is_a?(String)
0
-          select.scan(/"?([\.\w]+)"?.?\./).flatten
0
+          select.scan(/"?([\.a-zA-Z_]+)"?.?\./).flatten
0
         end
0
 
0
         # Checks if the conditions reference a table other than the current model table

0
@@ -559,6 +559,13 @@ class EagerAssociationTest < ActiveRecord::TestCase
0
     assert_nothing_raised { Post.find(:all, :include => 'comments') }
0
   end
0
 
0
+  def test_eager_with_floating_point_numbers
0
+    assert_queries(2) do
0
+      # Before changes, the floating point numbers will be interpreted as table names and will cause this to run in one query
0
+      Comment.find :all, :conditions => "123.456 = 123.456", :include => :post
0
+    end
0
+  end
0
+
0
   def test_preconfigured_includes_with_belongs_to
0
     author = posts(:welcome).author_with_posts
0
     assert_no_queries {assert_equal 5, author.posts.size}