SONAR-7844 merge migration creating and recreating CE_SCANNER_CONTEXT

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1308_create_table_scanner_context.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1308_create_table_scanner_context.rb
deleted file mode 100644 (file)
index 28b2aa4..0000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1308_create_table_scanner_context.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# SonarQube, open source software quality management tool.
-# Copyright (C) 2008-2014 SonarSource
-# mailto:contact AT sonarsource DOT com
-#
-# SonarQube 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.
-#
-# SonarQube 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 this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-
-#
-# SonarQube 6.1
-#
-class CreateTableScannerContext < ActiveRecord::Migration
-
-  def self.up
-    create_table 'scanner_context', :id => false do |t|
-      t.column 'analysis_uuid', :string, :limit => 40, :null => false
-      t.column 'data', :binary, :null => false
-      t.column 'created_at', :big_integer, :null => false
-      t.column 'updated_at', :big_integer, :null => false
-    end
-    add_primary_key 'scanner_context', 'analysis_uuid'
-  end
-end

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1309_recreate_table_scanner_context.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1309_recreate_table_scanner_context.rb
index 7dcea324a6e4c9de9f3ed130a9f0d7328921165e..c63899bce40cefce59ef652c72898732ae0ef539 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1309_recreate_table_scanner_context.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1309_recreate_table_scanner_context.rb
@@ -24,8 +24,6 @@
 class RecreateTableScannerContext < ActiveRecord::Migration
 
   def self.up
-    drop_table 'scanner_context'
-
     create_table 'ce_scanner_context', :id => false do |t|
       t.column 'task_uuid', :string, :limit => 40, :null => false
       t.column 'data', :binary, :null => false

diff --git a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
index 570a78cfaac599cf458c1f70a1d82d6d7e193ed8..4c6a4beb808c0167f13fa06d0e715645d6eb960a 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
+++ b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
@@ -493,7 +493,6 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1303');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1304');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1306');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1307');
-INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1308');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1309');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, EXTERNAL_IDENTITY, EXTERNAL_IDENTITY_PROVIDER, USER_LOCAL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT) VALUES (1, 'admin', 'Administrator', '', 'admin', 'sonarqube', true, 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482');