Postgresql 8.3 compatibility fix (#834).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1363 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index ce9ea28ca2bfea4d6f0b28c0e1e450fa3076939f..3e95ce111ce6bc352f311f7fe9d90d547bf4be50 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -35,6 +35,10 @@ class Changeset < ActiveRecord::Base
   validates_uniqueness_of :revision, :scope => :repository_id
   validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
   
+  def revision=(r)
+    write_attribute :revision, (r.nil? ? nil : r.to_s)
+  end
+  
   def comments=(comment)
     write_attribute(:comments, comment.strip)
   end

diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index 2442a8b8c59082692efcb288aba84292a9ae0c42..bbfe6952debaa6821f307dca8c5386e5f89c0c30 100644 (file)
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -41,22 +41,22 @@ class ChangesetTest < Test::Unit::TestCase
   end
 
   def test_previous
-    changeset = Changeset.find_by_revision(3)
-    assert_equal Changeset.find_by_revision(2), changeset.previous
+    changeset = Changeset.find_by_revision('3')
+    assert_equal Changeset.find_by_revision('2'), changeset.previous
   end
 
   def test_previous_nil
-    changeset = Changeset.find_by_revision(1)
+    changeset = Changeset.find_by_revision('1')
     assert_nil changeset.previous
   end
 
   def test_next
-    changeset = Changeset.find_by_revision(2)
-    assert_equal Changeset.find_by_revision(3), changeset.next
+    changeset = Changeset.find_by_revision('2')
+    assert_equal Changeset.find_by_revision('3'), changeset.next
   end
 
   def test_next_nil
-    changeset = Changeset.find_by_revision(4)
+    changeset = Changeset.find_by_revision('4')
     assert_nil changeset.next
   end
 end

diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb
index 15fcc867240879d7922fd62b62b9fa969508a36e..b7a3cf98e06de45d609b5a1a1764fcfcfd58fc86 100644 (file)
--- a/test/unit/repository_bazaar_test.rb
+++ b/test/unit/repository_bazaar_test.rb
@@ -36,13 +36,13 @@ class RepositoryBazaarTest < Test::Unit::TestCase
       
       assert_equal 4, @repository.changesets.count
       assert_equal 9, @repository.changes.count
-      assert_equal 'Initial import', @repository.changesets.find_by_revision(1).comments
+      assert_equal 'Initial import', @repository.changesets.find_by_revision('1').comments
     end
     
     def test_fetch_changesets_incremental
       @repository.fetch_changesets
       # Remove changesets with revision > 5
-      @repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy)
+      @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 2}
       @repository.reload
       assert_equal 2, @repository.changesets.count
       

diff --git a/test/unit/repository_darcs_test.rb b/test/unit/repository_darcs_test.rb
index 1228976f1ad60356056320bed355f614f2e1795c..1c8c1b8dda4dedafb7848fd958a06c02744bc0e9 100644 (file)
--- a/test/unit/repository_darcs_test.rb
+++ b/test/unit/repository_darcs_test.rb
@@ -35,13 +35,13 @@ class RepositoryDarcsTest < Test::Unit::TestCase
       
       assert_equal 6, @repository.changesets.count
       assert_equal 13, @repository.changes.count
-      assert_equal "Initial commit.", @repository.changesets.find_by_revision(1).comments
+      assert_equal "Initial commit.", @repository.changesets.find_by_revision('1').comments
     end
     
     def test_fetch_changesets_incremental
       @repository.fetch_changesets
       # Remove changesets with revision > 3
-      @repository.changesets.find(:all, :conditions => 'revision > 3').each(&:destroy)
+      @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 3}
       @repository.reload
       assert_equal 3, @repository.changesets.count
       

diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb
index e6cfdf9b25ccf825fb6d5d0d54606396b0f89c61..21ddf1e3a27f6848d341bba1292d08439cf9d959 100644 (file)
--- a/test/unit/repository_mercurial_test.rb
+++ b/test/unit/repository_mercurial_test.rb
@@ -35,13 +35,13 @@ class RepositoryMercurialTest < Test::Unit::TestCase
       
       assert_equal 6, @repository.changesets.count
       assert_equal 11, @repository.changes.count
-      assert_equal "Initial import.\nThe repository contains 3 files.", @repository.changesets.find_by_revision(0).comments
+      assert_equal "Initial import.\nThe repository contains 3 files.", @repository.changesets.find_by_revision('0').comments
     end
     
     def test_fetch_changesets_incremental
       @repository.fetch_changesets
       # Remove changesets with revision > 2
-      @repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy)
+      @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 2}
       @repository.reload
       assert_equal 3, @repository.changesets.count
       

diff --git a/test/unit/repository_subversion_test.rb b/test/unit/repository_subversion_test.rb
index 879feece894f3724e4d5ae6feb40f0a922ec20d5..7a1c9df4ae82e8eadfc8606586b589a6c419aea4 100644 (file)
--- a/test/unit/repository_subversion_test.rb
+++ b/test/unit/repository_subversion_test.rb
@@ -35,13 +35,13 @@ class RepositorySubversionTest < Test::Unit::TestCase
       
       assert_equal 8, @repository.changesets.count
       assert_equal 16, @repository.changes.count
-      assert_equal 'Initial import.', @repository.changesets.find_by_revision(1).comments
+      assert_equal 'Initial import.', @repository.changesets.find_by_revision('1').comments
     end
     
     def test_fetch_changesets_incremental
       @repository.fetch_changesets
       # Remove changesets with revision > 5
-      @repository.changesets.find(:all, :conditions => 'revision > 5').each(&:destroy)
+      @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 5}
       @repository.reload
       assert_equal 5, @repository.changesets.count