@@ -127,7 +127,7 @@ module WillPaginate # def paginate_by_sql(sql, options) WillPaginate::Collection.create(*wp_parse_options(options)) do |pager| - query = sanitize_sql(sql) + query = sanitize_sql(sql.dup) original_query = query.dup # add limit, offset add_limit! query, :offset => pager.offset, :limit => pager.per_page lib/will_paginate/finder.rb @@ -397,6 +397,15 @@ class FinderTest < ActiveRecordTestCase Developer.paginate(options) assert_equal options, options_before end + + def test_paginate_by_sql_doesnt_change_original_query + query = 'SQL QUERY' + original_query = query.dup + Developer.expects(:find_by_sql).returns([]) + + Developer.paginate_by_sql query, :page => 1 + assert_equal original_query, query + end def test_paginated_each collection = stub('collection', :size => 5, :empty? => false, :per_page => 5) test/finder_test.rb 48d409a2f4d1ff11021aab217791b818703a8c59 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/mislav/will_paginate/commit/f54bc393f184a49ad4ba7d44b304719cf2fc9ba2 f54bc393f184a49ad4ba7d44b304719cf2fc9ba2 2008-08-27T14:38:55-07:00 2008-08-27T14:38:55-07:00 Ensure that paginate_by_sql doesn't change the original SQL query. Closes #235 d57c3aae57f3218a06b3860f9922ed67ba08255f Mislav Marohnić mislav.marohnic@gmail.com