]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-20548 updated the index for rule_impact_changes to not be unique
authorlukasz-jarocki-sonarsource <lukasz.jarocki@sonarsource.com>
Thu, 5 Oct 2023 14:31:10 +0000 (16:31 +0200)
committersonartech <sonartech@sonarsource.com>
Tue, 10 Oct 2023 20:02:44 +0000 (20:02 +0000)
server/sonar-db-dao/src/schema/schema-sq.ddl
server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTable.java [new file with mode: 0644]
server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForRuleImpactChangesTable.java [deleted file]
server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTableTest.java [new file with mode: 0644]
server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForRuleImpactChangesTableTest.java [deleted file]
server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTableTest/schema.sql [new file with mode: 0644]
server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForRuleImpactChangesTableTest/schema.sql [deleted file]

index f0c55b09ac931bf2eee5394dd03cb934930d7d32..f8fb47e1b5abdefb4a02c26d874e71cb9bb4913f 100644 (file)
@@ -900,7 +900,7 @@ CREATE TABLE "RULE_IMPACT_CHANGES"(
     "OLD_SEVERITY" CHARACTER VARYING(40) NOT NULL,
     "RULE_CHANGE_UUID" CHARACTER VARYING(40) NOT NULL
 );
-CREATE UNIQUE NULLS DISTINCT INDEX "UNIQ_RULE_IMPACT_CHANGES" ON "RULE_IMPACT_CHANGES"("RULE_CHANGE_UUID" NULLS FIRST, "NEW_SOFTWARE_QUALITY" NULLS FIRST, "NEW_SEVERITY" NULLS FIRST);
+CREATE INDEX "RULE_IMPACT_CHANGES_R_C_UUID" ON "RULE_IMPACT_CHANGES"("RULE_CHANGE_UUID" NULLS FIRST);
 
 CREATE TABLE "RULE_REPOSITORIES"(
     "KEE" CHARACTER VARYING(200) NOT NULL,
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTable.java
new file mode 100644 (file)
index 0000000..75a3e56
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2023 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.
+ */
+package org.sonar.server.platform.db.migration.version.v103;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import org.sonar.db.Database;
+import org.sonar.db.DatabaseUtils;
+import org.sonar.server.platform.db.migration.sql.CreateIndexBuilder;
+import org.sonar.server.platform.db.migration.step.DdlChange;
+
+public class CreateIndexForRuleImpactChangesTable extends DdlChange {
+
+  static final String INDEX_NAME = "rule_impact_changes_r_c_uuid";
+  static final String TABLE_NAME = "rule_impact_changes";
+
+  public CreateIndexForRuleImpactChangesTable(Database db) {
+    super(db);
+  }
+
+  @Override
+  public void execute(Context context) throws SQLException {
+    try (Connection connection = getDatabase().getDataSource().getConnection()) {
+      createUniqueIndex(context, connection);
+    }
+  }
+
+  private static void createUniqueIndex(Context context, Connection connection) {
+    if (!DatabaseUtils.indexExistsIgnoreCase(TABLE_NAME, INDEX_NAME, connection)) {
+      context.execute(new CreateIndexBuilder()
+        .setTable(TABLE_NAME)
+        .setName(INDEX_NAME)
+        .addColumn("rule_change_uuid")
+        .setUnique(false)
+        .build());
+    }
+  }
+}
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForRuleImpactChangesTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForRuleImpactChangesTable.java
deleted file mode 100644 (file)
index 874999e..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2023 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program 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.
- *
- * This program 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.
- */
-package org.sonar.server.platform.db.migration.version.v103;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import org.sonar.db.Database;
-import org.sonar.db.DatabaseUtils;
-import org.sonar.server.platform.db.migration.sql.CreateIndexBuilder;
-import org.sonar.server.platform.db.migration.step.DdlChange;
-
-public class CreateUniqueIndexForRuleImpactChangesTable extends DdlChange {
-
-  static final String INDEX_NAME = "uniq_rule_impact_changes";
-  static final String TABLE_NAME = "rule_impact_changes";
-
-  public CreateUniqueIndexForRuleImpactChangesTable(Database db) {
-    super(db);
-  }
-
-  @Override
-  public void execute(Context context) throws SQLException {
-    try (Connection connection = getDatabase().getDataSource().getConnection()) {
-      createUniqueIndex(context, connection);
-    }
-  }
-
-  private static void createUniqueIndex(Context context, Connection connection) {
-    if (!DatabaseUtils.indexExistsIgnoreCase(TABLE_NAME, INDEX_NAME, connection)) {
-      context.execute(new CreateIndexBuilder()
-        .setTable(TABLE_NAME)
-        .setName(INDEX_NAME)
-        .addColumn("rule_change_uuid")
-        .addColumn("new_software_quality")
-        .addColumn("new_severity")
-        .setUnique(true)
-        .build());
-    }
-  }
-}
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTableTest.java
new file mode 100644 (file)
index 0000000..9236c69
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2023 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.
+ */
+package org.sonar.server.platform.db.migration.version.v103;
+
+import java.sql.SQLException;
+import org.junit.Rule;
+import org.junit.Test;
+import org.sonar.db.CoreDbTester;
+
+public class CreateIndexForRuleImpactChangesTableTest {
+
+  static final String INDEX_NAME = "rule_impact_changes_r_c_uuid";
+  static final String TABLE_NAME = "rule_impact_changes";
+  @Rule
+  public final CoreDbTester db = CoreDbTester.createForSchema(CreateIndexForRuleImpactChangesTableTest.class, "schema.sql");
+
+  private final CreateIndexForRuleImpactChangesTable underTest = new CreateIndexForRuleImpactChangesTable(db.database());
+
+  @Test
+  public void migration_should_create_index() throws SQLException {
+    db.assertIndexDoesNotExist(TABLE_NAME, INDEX_NAME);
+
+    underTest.execute();
+
+    db.assertIndex(TABLE_NAME, INDEX_NAME, "rule_change_uuid");
+  }
+
+  @Test
+  public void migration_should_be_reentrant() throws SQLException {
+    underTest.execute();
+    underTest.execute();
+
+    db.assertIndex(TABLE_NAME, INDEX_NAME, "rule_change_uuid");
+  }
+}
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForRuleImpactChangesTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForRuleImpactChangesTableTest.java
deleted file mode 100644 (file)
index 8289826..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2023 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program 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.
- *
- * This program 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.
- */
-package org.sonar.server.platform.db.migration.version.v103;
-
-import java.sql.SQLException;
-import org.junit.Rule;
-import org.junit.Test;
-import org.sonar.db.CoreDbTester;
-
-public class CreateUniqueIndexForRuleImpactChangesTableTest {
-
-  static final String INDEX_NAME = "uniq_rule_impact_changes";
-  static final String TABLE_NAME = "rule_impact_changes";
-  @Rule
-  public final CoreDbTester db = CoreDbTester.createForSchema(CreateUniqueIndexForRuleImpactChangesTableTest.class, "schema.sql");
-
-  private final CreateUniqueIndexForRuleImpactChangesTable underTest = new CreateUniqueIndexForRuleImpactChangesTable(db.database());
-
-  @Test
-  public void migration_should_create_index() throws SQLException {
-    db.assertIndexDoesNotExist(TABLE_NAME, INDEX_NAME);
-
-    underTest.execute();
-
-    db.assertUniqueIndex(TABLE_NAME, INDEX_NAME, "rule_change_uuid", "new_software_quality", "new_severity");
-  }
-
-  @Test
-  public void migration_should_be_reentrant() throws SQLException {
-    underTest.execute();
-    underTest.execute();
-
-    db.assertUniqueIndex(TABLE_NAME, INDEX_NAME, "rule_change_uuid", "new_software_quality", "new_severity");
-  }
-}
diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTableTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v103/CreateIndexForRuleImpactChangesTableTest/schema.sql
new file mode 100644 (file)
index 0000000..c4b945c
--- /dev/null
@@ -0,0 +1,7 @@
+CREATE TABLE "RULE_IMPACT_CHANGES"(
+    "NEW_SOFTWARE_QUALITY" CHARACTER VARYING(40) NOT NULL,
+    "OLD_SOFTWARE_QUALITY" CHARACTER VARYING(40) NOT NULL,
+    "NEW_SEVERITY" CHARACTER VARYING(40) NOT NULL,
+    "OLD_SEVERITY" CHARACTER VARYING(40) NOT NULL,
+    "RULE_CHANGE_UUID" CHARACTER VARYING(40) NOT NULL
+);
\ No newline at end of file
diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForRuleImpactChangesTableTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v103/CreateUniqueIndexForRuleImpactChangesTableTest/schema.sql
deleted file mode 100644 (file)
index c4b945c..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE "RULE_IMPACT_CHANGES"(
-    "NEW_SOFTWARE_QUALITY" CHARACTER VARYING(40) NOT NULL,
-    "OLD_SOFTWARE_QUALITY" CHARACTER VARYING(40) NOT NULL,
-    "NEW_SEVERITY" CHARACTER VARYING(40) NOT NULL,
-    "OLD_SEVERITY" CHARACTER VARYING(40) NOT NULL,
-    "RULE_CHANGE_UUID" CHARACTER VARYING(40) NOT NULL
-);
\ No newline at end of file