SONAR-19783 Fix filter for (non-)managed groups

diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/ExternalGroupDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/ExternalGroupDaoIT.java
index a1a93e24fbddaf23fb4b7b66ee25b82d9bdb72f0..9b78af7cfc44a33e9c364b22dea87fc7f3dbb365 100644 (file)
--- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/ExternalGroupDaoIT.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/ExternalGroupDaoIT.java
@@ -121,7 +121,7 @@ public class ExternalGroupDaoIT {
     String filterManagedUser = underTest.getManagedGroupSqlFilter(true);
     assertThat(filterManagedUser).isEqualTo(
       "(exists (select group_uuid from external_groups eg where eg.group_uuid = uuid) "
-        + "or exists (select group_uuid from github_orgs_groups gog eg where gog.group_uuid = uuid))");
+        + "or exists (select group_uuid from github_orgs_groups gog where gog.group_uuid = uuid))");
   }
 
   @Test
@@ -129,7 +129,7 @@ public class ExternalGroupDaoIT {
     String filterNonManagedUser = underTest.getManagedGroupSqlFilter(false);
     assertThat(filterNonManagedUser).isEqualTo(
       "(not exists (select group_uuid from external_groups eg where eg.group_uuid = uuid) "
-        + "and not exists (select group_uuid from github_orgs_groups gog eg where gog.group_uuid = uuid))");
+        + "and not exists (select group_uuid from github_orgs_groups gog where gog.group_uuid = uuid))");
   }
 
   private List<ExternalGroupDto> createAndInsertExternalGroupDtos(String provider, int numberOfGroups) {

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/ExternalGroupDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/ExternalGroupDao.java
index 4275912b1b5ed1990fcca892f26ba4ecfc367310..8986dd2621fd89be9a5bfafcb3fda18ab6827bdf 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/ExternalGroupDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/ExternalGroupDao.java
@@ -53,10 +53,10 @@ public class ExternalGroupDao implements Dao {
   public String getManagedGroupSqlFilter(boolean filterByManaged) {
     if (filterByManaged) {
       return  "(exists (select group_uuid from external_groups eg where eg.group_uuid = uuid) "
-        + "or exists (select group_uuid from github_orgs_groups gog eg where gog.group_uuid = uuid))";
+        + "or exists (select group_uuid from github_orgs_groups gog where gog.group_uuid = uuid))";
     }
     return "(not exists (select group_uuid from external_groups eg where eg.group_uuid = uuid) "
-      + "and not exists (select group_uuid from github_orgs_groups gog eg where gog.group_uuid = uuid))";
+      + "and not exists (select group_uuid from github_orgs_groups gog where gog.group_uuid = uuid))";
   }
 
   public void deleteByExternalIdentityProvider(DbSession dbSession, String externalIdentityProvider) {