Refactor the table AUTHORS

* add primary key
* rename the column COMMITTER to LOGIN

2 files changed, 41 insertions, 5 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/262_create_authors.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/262_create_authors.rb
index f43c3b4a909..c9ca527aa16 100644
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/262_create_authors.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/262_create_authors.rb
@@ -24,11 +24,7 @@
 class CreateAuthors < ActiveRecord::Migration
 
   def self.up
-    create_table 'authors', :id => false do |t|
-      t.column 'person_id', :integer, :null => false
-      t.column 'committer', :string, :null => true, :limit => 100
-      t.timestamps
-    end
+    # removed in version 2.15, see migration 283
   end
 
 end
diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/283_add_authors_primary_key.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/283_add_authors_primary_key.rb
new file mode 100644
index 00000000000..c129df42b1f
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/283_add_authors_primary_key.rb
@@ -0,0 +1,40 @@
+#
+# Sonar, entreprise quality control tool.
+# Copyright (C) 2008-2012 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# Sonar is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# Sonar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with Sonar; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+#
+
+#
+# Sonar 2.15
+#
+class AddAuthorsPrimaryKey < ActiveRecord::Migration
+
+  def self.up
+    begin
+      drop_table 'authors'
+    rescue
+      # table does not exist -> this is not an upgrade but a fresh install
+    end
+
+    create_table 'authors' do |t|
+      t.column 'person_id', :integer, :null => false
+      t.column 'login', :string, :null => true, :limit => 100
+      t.timestamps
+    end
+  end
+
+end