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

5 files changed, 18 insertions, 5 deletions

diff --git a/db/migrate/010_create_comments.rb b/db/migrate/010_create_comments.rb
index d804140b0..29e1116af 100644
--- a/db/migrate/010_create_comments.rb
+++ b/db/migrate/010_create_comments.rb
@@ -4,7 +4,7 @@ class CreateComments < ActiveRecord::Migration
       t.column :commented_type, :string, :limit => 30, :default => "", :null => false
       t.column :commented_id, :integer, :default => 0, :null => false
       t.column :author_id, :integer, :default => 0, :null => false
-      t.column :comment, :text
+      t.column :comments, :text
       t.column :created_on, :datetime, :null => false
       t.column :updated_on, :datetime, :null => false
     end
diff --git a/db/migrate/029_create_wiki_contents.rb b/db/migrate/029_create_wiki_contents.rb
index fde2d22d0..c5c9f2a45 100644
--- a/db/migrate/029_create_wiki_contents.rb
+++ b/db/migrate/029_create_wiki_contents.rb
@@ -4,7 +4,7 @@ class CreateWikiContents < ActiveRecord::Migration
       t.column :page_id, :integer, :null => false
       t.column :author_id, :integer
       t.column :text, :text
-      t.column :comment, :string, :limit => 255, :default => ""
+      t.column :comments, :string, :limit => 255, :default => ""
       t.column :updated_on, :datetime, :null => false
       t.column :version, :integer, :null => false
     end
@@ -16,7 +16,7 @@ class CreateWikiContents < ActiveRecord::Migration
       t.column :author_id, :integer
       t.column :data, :binary
       t.column :compression, :string, :limit => 6, :default => ""
-      t.column :comment, :string, :limit => 255, :default => ""
+      t.column :comments, :string, :limit => 255, :default => ""
       t.column :updated_on, :datetime, :null => false
       t.column :version, :integer, :null => false
     end
diff --git a/db/migrate/032_create_time_entries.rb b/db/migrate/032_create_time_entries.rb
index e055c13e6..9b9a54eb1 100644
--- a/db/migrate/032_create_time_entries.rb
+++ b/db/migrate/032_create_time_entries.rb
@@ -5,7 +5,7 @@ class CreateTimeEntries < ActiveRecord::Migration
       t.column :user_id,     :integer,  :null => false
       t.column :issue_id,    :integer
       t.column :hours,       :float,    :null => false
-      t.column :comment,     :string,   :limit => 255
+      t.column :comments,    :string,   :limit => 255
       t.column :activity_id, :integer,  :null => false
       t.column :spent_on,    :date,     :null => false
       t.column :tyear,       :integer,  :null => false
diff --git a/db/migrate/034_create_changesets.rb b/db/migrate/034_create_changesets.rb
index a78c8e36f..612fd46bb 100644
--- a/db/migrate/034_create_changesets.rb
+++ b/db/migrate/034_create_changesets.rb
@@ -5,7 +5,7 @@ class CreateChangesets < ActiveRecord::Migration
       t.column :revision, :integer, :null => false
       t.column :committer, :string, :limit => 30
       t.column :committed_on, :datetime, :null => false
-      t.column :comment, :text
+      t.column :comments, :text
     end
     add_index :changesets, [:repository_id, :revision], :unique => true, :name => :changesets_repos_rev
   end
diff --git a/db/migrate/041_rename_comment_to_comments.rb b/db/migrate/041_rename_comment_to_comments.rb
new file mode 100644
index 000000000..aedad0022
--- /dev/null
+++ b/db/migrate/041_rename_comment_to_comments.rb
@@ -0,0 +1,13 @@
+class RenameCommentToComments < ActiveRecord::Migration
+  def self.up
+    rename_column(:comments, :comment, :comments) if ActiveRecord::Base.connection.columns("comments").detect{|c| c.name == "comment"}
+    rename_column(:wiki_contents, :comment, :comments) if ActiveRecord::Base.connection.columns("wiki_contents").detect{|c| c.name == "comment"}
+    rename_column(:wiki_content_versions, :comment, :comments) if ActiveRecord::Base.connection.columns("wiki_content_versions").detect{|c| c.name == "comment"}
+    rename_column(:time_entries, :comment, :comments) if ActiveRecord::Base.connection.columns("time_entries").detect{|c| c.name == "comment"}
+    rename_column(:changesets, :comment, :comments) if ActiveRecord::Base.connection.columns("changesets").detect{|c| c.name == "comment"}
+  end
+
+  def self.down
+    raise IrreversibleMigration
+  end
+end