SONAR-13221 PERM_TEMPLATES_GROUPS

18 files changed, 52 insertions, 61 deletions

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTable.java
index 42d6af094a7..17e67b99e83 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTable.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTable.java
@@ -17,22 +17,22 @@
  * 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.v83.permtemplatesusers;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import java.sql.SQLException;
 import org.sonar.db.Database;
 import org.sonar.server.platform.db.migration.step.DdlChange;
 import org.sonar.server.platform.db.migration.version.v83.util.AddPrimaryKeyBuilder;
 
-public class AddPrimaryKeyOnUuidColumnOfPermTemplatesUsersTable extends DdlChange {
+public class AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTable extends DdlChange {
 
-  public AddPrimaryKeyOnUuidColumnOfPermTemplatesUsersTable(Database db) {
+  public AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTable(Database db) {
     super(db);
   }
 
   @Override
   public void execute(Context context) throws SQLException {
-    context.execute(new AddPrimaryKeyBuilder("perm_templates_users", "uuid").build());
+    context.execute(new AddPrimaryKeyBuilder("perm_templates_groups", "uuid").build());
   }
 
 }
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTable.java
index 1fc2d72952a..1ec142aa6bf 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTable.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTable.java
@@ -17,15 +17,15 @@
  * 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.v83.permtemplatesusers;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import org.sonar.db.Database;
 import org.sonar.server.platform.db.migration.version.v83.common.AddUuidColumnToTable;
 
-public class AddUuidColumnToPermTemplatesUsersTable extends AddUuidColumnToTable {
-  private static final String TABLE = "perm_templates_users";
+public class AddUuidColumnToPermTemplatesGroupsTable extends AddUuidColumnToTable {
+  private static final String TABLE = "perm_templates_groups";
 
-  public AddUuidColumnToPermTemplatesUsersTable(Database db) {
+  public AddUuidColumnToPermTemplatesGroupsTable(Database db) {
     super(db, TABLE);
   }
 }
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTable.java
index 978a431df6d..e3401f9633a 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTable.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTable.java
@@ -17,15 +17,15 @@
  * 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.v83.permtemplatesusers;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import org.sonar.db.Database;
 import org.sonar.server.platform.db.migration.version.v83.common.DropIdColumn;
 
-public class DropIdColumnOfPermTemplatesUsersTable extends DropIdColumn {
-  private static final String TABLE = "perm_templates_users";
+public class DropIdColumnOfPermTemplatesGroupsTable extends DropIdColumn {
+  private static final String TABLE = "perm_templates_groups";
 
-  public DropIdColumnOfPermTemplatesUsersTable(Database db) {
+  public DropIdColumnOfPermTemplatesGroupsTable(Database db) {
     super(db, TABLE);
   }
 }
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTable.java
index 46bf6a4c8c6..c84fbd431be 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTable.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTable.java
@@ -17,16 +17,16 @@
  * 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.v83.permtemplatesusers;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import org.sonar.db.Database;
 import org.sonar.server.platform.db.migration.version.v83.common.DropPrimaryKeyOnIdColumn;
 import org.sonar.server.platform.db.migration.version.v83.util.DropPrimaryKeySqlGenerator;
 
-public class DropPrimaryKeyOnIdColumnOfPermTemplatesUsersTable extends DropPrimaryKeyOnIdColumn {
-  private static final String TABLE_NAME = "perm_templates_users";
+public class DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTable extends DropPrimaryKeyOnIdColumn {
+  private static final String TABLE_NAME = "perm_templates_groups";
 
-  public DropPrimaryKeyOnIdColumnOfPermTemplatesUsersTable(Database db, DropPrimaryKeySqlGenerator dropPrimaryKeySqlGenerator) {
+  public DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTable(Database db, DropPrimaryKeySqlGenerator dropPrimaryKeySqlGenerator) {
     super(db, dropPrimaryKeySqlGenerator, TABLE_NAME);
   }
 }
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullable.java
index 6c2b9bedca3..39919e02343 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullable.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullable.java
@@ -17,15 +17,15 @@
  * 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.v83.permtemplatesusers;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import org.sonar.db.Database;
 import org.sonar.server.platform.db.migration.version.v83.common.MakeUuidColumnNotNullable;
 
-public class MakePermTemplatesUsersUuidColumnNotNullable extends MakeUuidColumnNotNullable {
-  private static final String TABLE = "perm_templates_users";
+public class MakePermTemplatesGroupsUuidColumnNotNullable extends MakeUuidColumnNotNullable {
+  private static final String TABLE = "perm_templates_groups";
 
-  public MakePermTemplatesUsersUuidColumnNotNullable(Database db) {
+  public MakePermTemplatesGroupsUuidColumnNotNullable(Database db) {
     super(db, TABLE);
   }
 }
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuid.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuid.java
index e15d013b4a4..6b1f0d0c6d4 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuid.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuid.java
@@ -17,7 +17,7 @@
  * 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.v83.permtemplatesusers;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import java.sql.SQLException;
 import org.sonar.core.util.UuidFactory;
@@ -25,11 +25,11 @@ import org.sonar.db.Database;
 import org.sonar.server.platform.db.migration.step.DataChange;
 import org.sonar.server.platform.db.migration.step.MassUpdate;
 
-public class PopulatePermTemplatesUsersUuid extends DataChange {
+public class PopulatePermTemplatesGroupsUuid extends DataChange {
 
   private final UuidFactory uuidFactory;
 
-  public PopulatePermTemplatesUsersUuid(Database db, UuidFactory uuidFactory) {
+  public PopulatePermTemplatesGroupsUuid(Database db, UuidFactory uuidFactory) {
     super(db);
     this.uuidFactory = uuidFactory;
   }
@@ -38,8 +38,8 @@ public class PopulatePermTemplatesUsersUuid extends DataChange {
   protected void execute(Context context) throws SQLException {
     MassUpdate massUpdate = context.prepareMassUpdate();
 
-    massUpdate.select("select id from perm_templates_users where uuid is null order by id asc");
-    massUpdate.update("update perm_templates_users set uuid = ? where id = ?");
+    massUpdate.select("select id from perm_templates_groups where uuid is null order by id asc");
+    massUpdate.update("update perm_templates_groups set uuid = ? where id = ?");
 
     massUpdate.execute((row, update) -> {
       update.setString(1, uuidFactory.create());
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTableTest.java
index a11d47f56c2..f85823cf6fa 100644
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTableTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTableTest.java
@@ -17,14 +17,13 @@
  * 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.v83.permtemplategroups;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import java.sql.SQLException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.db.CoreDbTester;
 import org.sonar.server.platform.db.migration.step.DdlChange;
-import org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups.AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTable;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTableTest.java
index 1a8b7e40800..8b57eedd269 100644
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTableTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTableTest.java
@@ -17,17 +17,15 @@
  * 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.v83.permtemplategroups;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import java.sql.SQLException;
 import java.sql.Types;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonar.core.util.UuidFactoryFast;
 import org.sonar.db.CoreDbTester;
 import org.sonar.server.platform.db.migration.step.DdlChange;
-import org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups.AddUuidColumnToPermTemplatesGroupsTable;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -38,8 +36,6 @@ public class AddUuidColumnToPermTemplatesGroupsTableTest {
 
   private DdlChange underTest = new AddUuidColumnToPermTemplatesGroupsTable(db.database());
 
-  private UuidFactoryFast uuidFactory = UuidFactoryFast.getInstance();
-
   @Before
   public void setup() {
     insertPermTemplatesGroups(1L);
@@ -60,7 +56,7 @@ public class AddUuidColumnToPermTemplatesGroupsTableTest {
   private void insertPermTemplatesGroups(Long id) {
     db.executeInsert("perm_templates_groups",
       "id", id,
-      "user_id", id + 1,
+      "group_id", id + 1,
       "template_id", id + 2,
       "permission_reference", "ref" + id);
   }
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTableTest.java
index 7b43a955ab5..6acaf675870 100644
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTableTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTableTest.java
@@ -17,14 +17,13 @@
  * 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.v83.permtemplategroups;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import java.sql.SQLException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.db.CoreDbTester;
 import org.sonar.server.platform.db.migration.step.DdlChange;
-import org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups.DropIdColumnOfPermTemplatesGroupsTable;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTableTest.java
index 5331ec4f683..d7732d98d60 100644
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTableTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTableTest.java
@@ -18,14 +18,13 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.platform.db.migration.version.v83.permtemplategroups;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import java.sql.SQLException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.db.CoreDbTester;
 import org.sonar.server.platform.db.migration.step.DdlChange;
-import org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups.DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTable;
 import org.sonar.server.platform.db.migration.version.v83.util.DropPrimaryKeySqlGenerator;
 import org.sonar.server.platform.db.migration.version.v83.util.SqlHelper;
 
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullableTest.java
index 45149db4899..b91e53744a1 100644
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullableTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullableTest.java
@@ -17,14 +17,13 @@
  * 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.v83.permtemplategroups;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import java.sql.SQLException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.db.CoreDbTester;
 import org.sonar.server.platform.db.migration.step.MigrationStep;
-import org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups.MakePermTemplatesGroupsUuidColumnNotNullable;
 
 import static java.sql.Types.VARCHAR;
 
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuidTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuidTest.java
index 78c8a928c87..d9b21363765 100644
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuidTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuidTest.java
@@ -17,7 +17,7 @@
  * 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.v83.permtemplategroups;
+package org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups;
 
 import java.sql.SQLException;
 import java.util.Objects;
@@ -28,7 +28,6 @@ import org.sonar.core.util.UuidFactory;
 import org.sonar.core.util.UuidFactoryFast;
 import org.sonar.db.CoreDbTester;
 import org.sonar.server.platform.db.migration.step.DataChange;
-import org.sonar.server.platform.db.migration.version.v83.permtemplatesgroups.PopulatePermTemplatesGroupsUuid;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -75,7 +74,7 @@ public class PopulatePermTemplatesGroupsUuidTest {
   private void insertPermTemplatesGroups(Long id) {
     db.executeInsert("perm_templates_groups",
       "id", id,
-      "user_id", id + 1,
+      "group_id", id + 1,
       "template_id", id + 2,
       "permission_reference", "ref" + id);
   }
diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTableTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTableTest/schema.sql
index 07a2bfd5bb7..f3319b5bc6f 100644
--- a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTableTest/schema.sql
+++ b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddPrimaryKeyOnUuidColumnOfPermTemplatesGroupsTableTest/schema.sql
@@ -1,7 +1,7 @@
-CREATE TABLE "PERM_TEMPLATES_USERS"(
-    "ID" INTEGER NOT NULL AUTO_INCREMENT (1,1),
+CREATE TABLE "PERM_TEMPLATES_GROUPS"(
+    "ID" INTEGER NOT NULL,
     "UUID" VARCHAR(40) NOT NULL,
-    "USER_ID" INTEGER NOT NULL,
+    "GROUP_ID" INTEGER,
     "TEMPLATE_ID" INTEGER NOT NULL,
     "PERMISSION_REFERENCE" VARCHAR(64) NOT NULL,
     "CREATED_AT" TIMESTAMP,
diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTableTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTableTest/schema.sql
index 285b963b8cd..fa6baad81b0 100644
--- a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTableTest/schema.sql
+++ b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/AddUuidColumnToPermTemplatesGroupsTableTest/schema.sql
@@ -1,9 +1,9 @@
-CREATE TABLE "PERM_TEMPLATES_USERS"(
+CREATE TABLE "PERM_TEMPLATES_GROUPS"(
     "ID" INTEGER NOT NULL AUTO_INCREMENT (1,1),
-    "USER_ID" INTEGER NOT NULL,
+    "GROUP_ID" INTEGER,
     "TEMPLATE_ID" INTEGER NOT NULL,
     "PERMISSION_REFERENCE" VARCHAR(64) NOT NULL,
     "CREATED_AT" TIMESTAMP,
     "UPDATED_AT" TIMESTAMP
 );
-ALTER TABLE "PERM_TEMPLATES_USERS" ADD CONSTRAINT "PK_PERM_TEMPLATES_USERS" PRIMARY KEY("ID");
+ALTER TABLE "PERM_TEMPLATES_GROUPS" ADD CONSTRAINT "PK_PERM_TEMPLATES_GROUPS" PRIMARY KEY("ID");
diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTableTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTableTest/schema.sql
index d6e978cbe1d..395419e5803 100644
--- a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTableTest/schema.sql
+++ b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropIdColumnOfPermTemplatesGroupsTableTest/schema.sql
@@ -1,10 +1,10 @@
-CREATE TABLE "PERM_TEMPLATES_USERS"(
-    "ID" INTEGER NOT NULL AUTO_INCREMENT (1,1),
+CREATE TABLE "PERM_TEMPLATES_GROUPS"(
+    "ID" INTEGER NOT NULL,
     "UUID" VARCHAR(40) NOT NULL,
-    "USER_ID" INTEGER NOT NULL,
+    "GROUP_ID" INTEGER,
     "TEMPLATE_ID" INTEGER NOT NULL,
     "PERMISSION_REFERENCE" VARCHAR(64) NOT NULL,
     "CREATED_AT" TIMESTAMP,
     "UPDATED_AT" TIMESTAMP
 );
-ALTER TABLE "PERM_TEMPLATES_USERS" ADD CONSTRAINT "PK_PERM_TEMPLATES_USERS" PRIMARY KEY("UUID");
+ALTER TABLE "PERM_TEMPLATES_GROUPS" ADD CONSTRAINT "PK_PERM_TEMPLATES_GROUPS" PRIMARY KEY("UUID");
diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTableTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTableTest/schema.sql
index dc2d8b31e74..dcef0db3e5e 100644
--- a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTableTest/schema.sql
+++ b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/DropPrimaryKeyOnIdColumnOfPermTemplatesGroupsTableTest/schema.sql
@@ -1,10 +1,10 @@
-CREATE TABLE "PERM_TEMPLATES_USERS"(
+CREATE TABLE "PERM_TEMPLATES_GROUPS"(
     "ID" INTEGER NOT NULL AUTO_INCREMENT (1,1),
     "UUID" VARCHAR(40) NOT NULL,
-    "USER_ID" INTEGER NOT NULL,
+    "GROUP_ID" INTEGER,
     "TEMPLATE_ID" INTEGER NOT NULL,
     "PERMISSION_REFERENCE" VARCHAR(64) NOT NULL,
     "CREATED_AT" TIMESTAMP,
     "UPDATED_AT" TIMESTAMP
 );
-ALTER TABLE "PERM_TEMPLATES_USERS" ADD CONSTRAINT "PK_PERM_TEMPLATES_USERS" PRIMARY KEY("ID");
+ALTER TABLE "PERM_TEMPLATES_GROUPS" ADD CONSTRAINT "PK_PERM_TEMPLATES_GROUPS" PRIMARY KEY("ID");
diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullableTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullableTest/schema.sql
index 23c2c4f21e6..a1d04848527 100644
--- a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullableTest/schema.sql
+++ b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/MakePermTemplatesGroupsUuidColumnNotNullableTest/schema.sql
@@ -1,10 +1,10 @@
-CREATE TABLE "PERM_TEMPLATES_USERS"(
+CREATE TABLE "PERM_TEMPLATES_GROUPS"(
     "ID" INTEGER NOT NULL AUTO_INCREMENT (1,1),
     "UUID" VARCHAR(40),
-    "USER_ID" INTEGER NOT NULL,
+    "GROUP_ID" INTEGER,
     "TEMPLATE_ID" INTEGER NOT NULL,
     "PERMISSION_REFERENCE" VARCHAR(64) NOT NULL,
     "CREATED_AT" TIMESTAMP,
     "UPDATED_AT" TIMESTAMP
 );
-ALTER TABLE "PERM_TEMPLATES_USERS" ADD CONSTRAINT "PK_PERM_TEMPLATES_USERS" PRIMARY KEY("ID");
+ALTER TABLE "PERM_TEMPLATES_GROUPS" ADD CONSTRAINT "PK_PERM_TEMPLATES_GROUPS" PRIMARY KEY("ID");
diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuidTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuidTest/schema.sql
index 23c2c4f21e6..a1d04848527 100644
--- a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuidTest/schema.sql
+++ b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v83/permtemplatesgroups/PopulatePermTemplatesGroupsUuidTest/schema.sql
@@ -1,10 +1,10 @@
-CREATE TABLE "PERM_TEMPLATES_USERS"(
+CREATE TABLE "PERM_TEMPLATES_GROUPS"(
     "ID" INTEGER NOT NULL AUTO_INCREMENT (1,1),
     "UUID" VARCHAR(40),
-    "USER_ID" INTEGER NOT NULL,
+    "GROUP_ID" INTEGER,
     "TEMPLATE_ID" INTEGER NOT NULL,
     "PERMISSION_REFERENCE" VARCHAR(64) NOT NULL,
     "CREATED_AT" TIMESTAMP,
     "UPDATED_AT" TIMESTAMP
 );
-ALTER TABLE "PERM_TEMPLATES_USERS" ADD CONSTRAINT "PK_PERM_TEMPLATES_USERS" PRIMARY KEY("ID");
+ALTER TABLE "PERM_TEMPLATES_GROUPS" ADD CONSTRAINT "PK_PERM_TEMPLATES_GROUPS" PRIMARY KEY("ID");