@@ -219,7 +219,7 @@ module WillPaginate join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merge_includes(scope(:find, :include), options[:include]), options[:joins]) sql = "SELECT #{options[:select]} FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} " sql << join_dependency.join_associations.collect{|join| join.association_join }.join - add_joins!(sql, options, scope) + add_joins!(sql, options[:joins], scope) add_conditions!(sql, options[:conditions], scope) add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit]) @@ -277,9 +277,9 @@ module WillPaginate # scope_out adds a 'with_finder' method which acts like with_scope, if it's present # then execute the count with the scoping provided by the with_finder send(scoper, &counter) - elsif match = /^find_(all_by|by)_([_a-zA-Z]\w*)$/.match(finder) + elsif finder =~ /^find_(all_by|by)_([_a-zA-Z]\w*)$/ # extract conditions from calls like "paginate_by_foo_and_bar" - attribute_names = extract_attribute_names_from_match(match) + attribute_names = $2.split('_and_') conditions = construct_attributes_from_arguments(attribute_names, args) with_scope(:find => { :conditions => conditions }, &counter) else lib/will_paginate/finder.rb c42328a27e615da94ed800f061a2db69a2cc7588 Sheldon Conaty sconaty@picklematrix.com http://github.com/dhennessy/will_paginate/commit/1db43a3fd2c630cb1dc0b97c7cf6bd45c2961b9c 1db43a3fd2c630cb1dc0b97c7cf6bd45c2961b9c 2008-12-23T03:14:50-08:00 2008-12-23T03:14:50-08:00 Add support for rails 2.2.2 eecccbcadaf2ce26fbd2184fca280eeadd102b98 Sheldon Conaty sconaty@picklematrix.com