From ab7fa9a6bd0c1f4fb80203dffb4d636daf412864 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 24 Jan 2017 14:57:34 +0100
Subject: SONAR-8675 drop table resource_index

---
 sonar-db/src/main/java/org/sonar/db/version/SqTables.java   |  4 +---
 .../src/main/resources/org/sonar/db/version/rows-h2.sql     |  1 +
 .../src/main/resources/org/sonar/db/version/schema-h2.ddl   | 13 -------------
 3 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'sonar-db')

diff --git a/sonar-db/src/main/java/org/sonar/db/version/SqTables.java b/sonar-db/src/main/java/org/sonar/db/version/SqTables.java
index e08c27fdc89..b4c5af2e0f9 100644
--- a/sonar-db/src/main/java/org/sonar/db/version/SqTables.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/SqTables.java
@@ -27,8 +27,6 @@ public final class SqTables {
    * These tables are still involved in DB migrations, so potentially
    * incorrect collation must be fixed so that joins with other
    * tables are possible.
-   *
-   * @see org.sonar.db.charset.ColumnDef#isInSonarQubeTable()
    */
   public static final Set<String> OLD_DROPPED_TABLES = ImmutableSet.of(
     "active_dashboards",
@@ -38,6 +36,7 @@ public final class SqTables {
     "issue_filter_favourites",
     "measure_filters",
     "measure_filter_favourites",
+    "resource_index",
     "widgets",
     "widget_properties");
 
@@ -80,7 +79,6 @@ public final class SqTables {
     "project_qprofiles",
     "properties",
     "qprofile_changes",
-    "resource_index",
     "rules",
     "rules_parameters",
     "rules_profiles",
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 7bfcdc34def..d7ba8f8625d 100644
--- 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
@@ -520,6 +520,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1503');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1504');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1505');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1506');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1507');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, EXTERNAL_IDENTITY, EXTERNAL_IDENTITY_PROVIDER, USER_LOCAL, CRYPTED_PASSWORD, SALT, IS_ROOT, CREATED_AT, UPDATED_AT) VALUES (1, 'admin', 'Administrator', '', 'admin', 'sonarqube', true, 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', true, '1418215735482', '1418215735482');
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;
diff --git a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
index d5e8379eec4..1ca427b7046 100644
--- a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
+++ b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
@@ -399,19 +399,6 @@ CREATE TABLE "LOADED_TEMPLATES" (
 );
 
 
-CREATE TABLE "RESOURCE_INDEX" (
-  "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
-  "KEE" VARCHAR(400) NOT NULL,
-  "POSITION" INTEGER NOT NULL,
-  "NAME_SIZE" INTEGER NOT NULL,
-  "COMPONENT_UUID" VARCHAR(50) NOT NULL,
-  "ROOT_COMPONENT_UUID" VARCHAR(50) NOT NULL,
-  "QUALIFIER" VARCHAR(10) NOT NULL
-);
-CREATE INDEX "RESOURCE_INDEX_KEY" ON "RESOURCE_INDEX" ("KEE");
-CREATE INDEX "RESOURCE_INDEX_COMPONENT" ON "RESOURCE_INDEX" ("COMPONENT_UUID");
-
-
 CREATE TABLE "AUTHORS" (
   "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
   "PERSON_ID" INTEGER,
-- 
cgit v1.2.3