From 4e22221ada607ae80ab2c1243fe9cdc9e3740ccd Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Fri, 26 Mar 2021 12:48:12 +0100
Subject: [PATCH] Removed quotes from group names

---
 .../main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java   | 2 +-
 .../java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/private-rows-extensions/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java b/private-rows-extensions/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java
index 92a4943..b660db9 100644
--- a/private-rows-extensions/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java
+++ b/private-rows-extensions/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java
@@ -16,7 +16,7 @@ public class PrivateRowsQueryExecutor extends QueryExecutor {
             CustomJobOwner user = (CustomJobOwner) jobOwner;
             statement.execute("SET my.tap_groups = \"{"
                     + String.join(",", user.getGroups().stream()
-                            .map(g -> "'" + g.replace("'", "''") + "'")
+                            .map(g -> g.replace("'", "''"))
                             .collect(Collectors.toList()))
                     + "}\"");
         }
diff --git a/private-rows-extensions/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java b/private-rows-extensions/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java
index 491598a..58443f7 100644
--- a/private-rows-extensions/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java
+++ b/private-rows-extensions/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java
@@ -19,7 +19,7 @@ public class PrivateRowsQueryExecutorTest {
         Statement mockedStatement = mock(Statement.class);
         queryExecutor.executeQuery(mockedStatement, "", user);
 
-        verify(mockedStatement).execute(eq("SET my.tap_groups = \"{'group1','group2'}\""));
+        verify(mockedStatement).execute(eq("SET my.tap_groups = \"{group1,group2}\""));
 
         user = new CustomJobOwner("anonymous", Arrays.asList());
         queryExecutor.executeQuery(mockedStatement, "", user);
-- 
GitLab