Merge branch '3031-syntax-error-in-install-extensions-managed-script-on-distributed-logs-cluster' into 'main-1.17'

fix: syntax error in install-extensions script on SGDistributedLogs

See merge request ongresinc/stackgres!1693

Author: teoincontatto

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsScript.java

@@ -88,6 +88,12 @@ private StackGresScript getScript(StackGresDistributedLogsContext context) {
             cluster.getMetadata().getNamespace(),
             cluster.getMetadata().getName()) + "'")
         .collect(Collectors.joining(","));
+    final String template1AndDatabaseList = Seq.of("'template1'")
+        .append(context.getConnectedClusters().stream()
+            .map(cluster -> "'" + FluentdUtil.databaseName(
+                cluster.getMetadata().getNamespace(),
+                cluster.getMetadata().getName()) + "'"))
+        .collect(Collectors.joining(","));
     final String databaseAndRetenentionList = context.getConnectedClusters().stream()
         .map(cluster -> "['" + FluentdUtil.databaseName(
             cluster.getMetadata().getNamespace(),
@@ -122,7 +128,7 @@ private StackGresScript getScript(StackGresDistributedLogsContext context) {
                 "/distributed-logs/install-extensions.sql"),
                 StandardCharsets.UTF_8)
             .read()).get().formatted(
-                Optional.of(databaseList).filter(Predicate.not(String::isEmpty)).orElse("null"),
+                Optional.of(template1AndDatabaseList).filter(Predicate.not(String::isEmpty)).orElse("null"),
                 timescaledbVersion,
                 isPendingRestart))
         .endScript()
@@ -136,7 +142,7 @@ private StackGresScript getScript(StackGresDistributedLogsContext context) {
                 "/distributed-logs/init.sql"),
                 StandardCharsets.UTF_8)
             .read()).get().formatted(
-                Optional.of(databaseList).filter(Predicate.not(String::isEmpty)).orElse("null")))
+                Optional.of(template1AndDatabaseList).filter(Predicate.not(String::isEmpty)).orElse("null")))
         .endScript()
         .addNewScript()
         .withId(2)

stackgres-k8s/src/operator/src/main/resources/distributed-logs/init.sql

@@ -1,7 +1,7 @@
 DO $distributedlogsinit$
 DECLARE database_name text;
 BEGIN
-  FOREACH database_name IN ARRAY ARRAY['template1',%1$s]
+  FOREACH database_name IN ARRAY ARRAY[%1$s]
   LOOP
     IF EXISTS (SELECT * FROM pg_database WHERE datname = database_name) THEN
       PERFORM dblink(

stackgres-k8s/src/operator/src/main/resources/distributed-logs/install-extensions.sql

@@ -2,7 +2,7 @@
 DO $upgradeextensions$
 DECLARE database_name text;
 BEGIN
-  FOREACH database_name IN ARRAY ARRAY['template1',%1$s]
+  FOREACH database_name IN ARRAY ARRAY[%1$s]
   LOOP
     IF EXISTS (SELECT * FROM pg_database WHERE datname = database_name) THEN
       PERFORM dblink(