Changeset 7588

Timestamp:

09/22/07 23:51:03 (1 year ago)

Author:

bitsweat

Message:

Correctly quote id list for limited eager loading. Closes #7482.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/test/associations_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Correctly quote id list for limited eager loading.  #7482 [tmacedo]
-
-* Fixed that using version-targetted migrates would fail on loggers other than the default one #7430 [valeksenko]

trunk/activerecord/lib/active_record/associations.rb

@@ -1257 +1257 @@
-          end
-        end
-
+
-        def select_limited_ids_list(options, join_dependency)
+          pk = columns_hash[primary_key]
+
-          connection.select_all(
-            construct_finder_sql_for_association_limiting(options, join_dependency),
-            "#{name} Load IDs For Limited Eager Loading"
-
+, pk
-        end
-

trunk/activerecord/test/associations_test.rb

@@ -1847 +1847 @@
-    join_dep  = ActiveRecord::Associations::ClassMethods::JoinDependency.new(join_base, :developers, nil)
-    projects  = Project.send(:select_limited_ids_list, {:order => 'developers.created_at'}, join_dep)
+    assert !projects.include?("'"), projects
-    assert_equal %w(1 2), projects.scan(/\d/).sort
-  end