From 470b1f4147ea3bb445c004693aaadf01db031b3b Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Wed, 1 Dec 2021 12:20:06 +0100
Subject: [PATCH] Fixed issue with long groups list
---
.../main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java | 4 ++--
.../java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/private-rows-extension/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java b/private-rows-extension/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java
index b660db9..de28e10 100644
--- a/private-rows-extension/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java
+++ b/private-rows-extension/src/main/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutor.java
@@ -14,11 +14,11 @@ public class PrivateRowsQueryExecutor extends QueryExecutor {
if (jobOwner instanceof CustomJobOwner) {
CustomJobOwner user = (CustomJobOwner) jobOwner;
- statement.execute("SET my.tap_groups = \"{"
+ statement.execute("SET my.tap_groups = '{"
+ String.join(",", user.getGroups().stream()
.map(g -> g.replace("'", "''"))
.collect(Collectors.toList()))
- + "}\"");
+ + "}'");
}
return super.executeQuery(statement, sql, jobOwner);
diff --git a/private-rows-extension/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java b/private-rows-extension/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java
index 58443f7..7d5a9e5 100644
--- a/private-rows-extension/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java
+++ b/private-rows-extension/src/test/java/it/inaf/ia2/vollt/PrivateRowsQueryExecutorTest.java
@@ -19,11 +19,11 @@ 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);
- verify(mockedStatement).execute(eq("SET my.tap_groups = \"{}\""));
+ verify(mockedStatement).execute(eq("SET my.tap_groups = '{}'"));
}
}
--
GitLab