From 891ed84fe39e97f27f6cb86d93238c23ef944e9b 2011-03-11 07:46:23 From: Toshi MARUYAMA Date: 2011-03-11 07:46:23 Subject: [PATCH] Merged r5091 from trunk. scm: mercurial: add :order => 'id DESC' explicitly for MySQL test fails. Because :order => 'id DESC' is defined at 'has_many', there is no need to set 'order'. But, MySQL test fails. Sqlite3 and PostgreSQL pass. Is this MySQL bug? MySQL svn trunk test on Redmine CI server fails. But, svn 1.1-stable passes. If this is MySQL bug, this effects 1.1-stable, too. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5092 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb index 9ce3b63..4bc792b 100644 --- a/app/models/repository/mercurial.rb +++ b/app/models/repository/mercurial.rb @@ -58,7 +58,7 @@ class Repository::Mercurial < Repository # Returns the latest changesets for +path+; sorted by revision number def latest_changesets(path, rev, limit=10) if path.blank? - changesets.find(:all, :include => :user, :limit => limit) + changesets.find(:all, :include => :user, :limit => limit, :order => "id DESC") else changes.find(:all, :include => {:changeset => :user}, :conditions => ["path = ?", path.with_leading_slash], diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb index 0938c82..f1ce319 100644 --- a/test/unit/repository_mercurial_test.rb +++ b/test/unit/repository_mercurial_test.rb @@ -87,7 +87,8 @@ class RepositoryMercurialTest < ActiveSupport::TestCase # with_limit changesets = @repository.latest_changesets('', nil, 2) - assert_equal @repository.latest_changesets('', nil)[0, 2], changesets + # assert_equal @repository.latest_changesets('', nil)[0, 2], changesets + assert_equal %w|16 15|, changesets.collect(&:revision) # with_filepath changesets = @repository.latest_changesets('/sql_escape/percent%dir/percent%file1.txt', nil)