Fixed: 10342 Creation of Schema in Oracle

Comment is a reserved keyword for Oracle. The five 'Comment' columns are renamed to 'Commments'.
Migration scripts were modified to let oracle users create the database. For the others, migration 41 will rename the columns (only if columns have the 'old' name).
Fixed also a few oracle specific issues.

Note: currently (in Rails 1.2.3), there's bug in Rails oracle adapter. See: http://dev.rubyonrails.org/ticket/7344
Attached patch is required for redMine to work properly.


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

6 files changed, 12 insertions, 12 deletions

diff --git a/test/fixtures/changesets.yml b/test/fixtures/changesets.yml
index 10adc5d8f..1fb8ba64b 100644
--- a/test/fixtures/changesets.yml
+++ b/test/fixtures/changesets.yml
@@ -4,7 +4,7 @@ changesets_001:
   committed_on: 2007-04-11 15:14:44 +02:00

   revision: 1

   id: 100

-  comment: My very first commit

+  comments: My very first commit

   repository_id: 10

   committer: dlopper

 changesets_002: 

@@ -12,7 +12,7 @@ changesets_002:
   committed_on: 2007-04-12 15:14:44 +02:00

   revision: 2

   id: 101

-  comment: 'This commit fixes #1, #2 and references #3'

+  comments: 'This commit fixes #1, #2 and references #3'

   repository_id: 10

   committer: dlopper

 changesets_003: 

@@ -20,7 +20,7 @@ changesets_003:
   committed_on: 2007-04-12 15:14:44 +02:00

   revision: 3

   id: 102

-  comment: |-

+  comments: |-

     A commit with wrong issue ids

     IssueID 666 3

   repository_id: 10

@@ -30,7 +30,7 @@ changesets_004:
   committed_on: 2007-04-12 15:14:44 +02:00

   revision: 4

   id: 103

-  comment: |-

+  comments: |-

     A commit with an issue id of an other project

     IssueID 4 2

   repository_id: 10

diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml
index 24a4546aa..b60a68b84 100644
--- a/test/fixtures/comments.yml
+++ b/test/fixtures/comments.yml
@@ -4,7 +4,7 @@ comments_001:
   commented_id: 1
   id: 1
   author_id: 1
-  comment: my first comment
+  comments: my first comment
   created_on: 2006-12-10 18:10:10 +01:00
   updated_on: 2006-12-10 18:10:10 +01:00
   
\ No newline at end of file
diff --git a/test/fixtures/wiki_content_versions.yml b/test/fixtures/wiki_content_versions.yml
index 784b3b03f..c433fc5dd 100644
--- a/test/fixtures/wiki_content_versions.yml
+++ b/test/fixtures/wiki_content_versions.yml
@@ -5,7 +5,7 @@ wiki_content_versions_001:
   id: 1

   version: 1

   author_id: 1

-  comment: Page creation

+  comments: Page creation

   wiki_content_id: 1

   compression: ""

   data: |-

@@ -18,7 +18,7 @@ wiki_content_versions_002:
   id: 2

   version: 2

   author_id: 1

-  comment: Small update

+  comments: Small update

   wiki_content_id: 1

   compression: ""

   data: |-

@@ -31,7 +31,7 @@ wiki_content_versions_003:
   id: 3

   version: 3

   author_id: 1

-  comment: ""

+  comments: ""

   wiki_content_id: 1

   compression: ""

   data: |-

diff --git a/test/fixtures/wiki_contents.yml b/test/fixtures/wiki_contents.yml
index ce1c8bd74..1f4ffc36d 100644
--- a/test/fixtures/wiki_contents.yml
+++ b/test/fixtures/wiki_contents.yml
@@ -9,4 +9,4 @@ wiki_contents_001:
   id: 1

   version: 3

   author_id: 1

-  comment: Gzip compression activated

+  comments: Gzip compression activated

diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index 301704a94..c07ee8273 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -26,7 +26,7 @@ class CommentTest < Test::Unit::TestCase
   end
   
   def test_create
-    comment = Comment.new(:commented => @news, :author => @jsmith, :comment => "my comment")
+    comment = Comment.new(:commented => @news, :author => @jsmith, :comments => "my comment")
     assert comment.save
     @news.reload
     assert_equal 2, @news.comments_count
diff --git a/test/unit/wiki_content_test.rb b/test/unit/wiki_content_test.rb
index a6b714ebe..a8c28ae21 100644
--- a/test/unit/wiki_content_test.rb
+++ b/test/unit/wiki_content_test.rb
@@ -27,7 +27,7 @@ class WikiContentTest < Test::Unit::TestCase
   
   def test_create
     page = WikiPage.new(:wiki => @wiki, :title => "Page")  
-    page.content = WikiContent.new(:text => "Content text", :author => User.find(1), :comment => "My comment")
+    page.content = WikiContent.new(:text => "Content text", :author => User.find(1), :comments => "My comment")
     assert page.save
     page.reload
     
@@ -36,7 +36,7 @@ class WikiContentTest < Test::Unit::TestCase
     assert_equal 1, content.version
     assert_equal 1, content.versions.length
     assert_equal "Content text", content.text
-    assert_equal "My comment", content.comment
+    assert_equal "My comment", content.comments
     assert_equal User.find(1), content.author
     assert_equal content.text, content.versions.last.text
   end