Bladeren bron

fix using unknown function string_agg on mysql/mariadb

Pouria Ezzati 1 jaar geleden
bovenliggende
commit
73614171d1
1 gewijzigde bestanden met toevoegingen van 8 en 2 verwijderingen
  1. 8 2
      server/queries/user.queries.js

+ 8 - 2
server/queries/user.queries.js

@@ -160,7 +160,10 @@ async function getAdmin(match, params) {
   
   query.leftJoin(
     knex("domains")
-    .select("user_id", knex.raw("string_agg(address, ', ') AS domains"))
+    .select("user_id", knex.isMySQL
+      ? knex.raw("group_concat(address SEPARATOR ', ') AS domains")
+      : knex.raw("string_agg(address, ', ') AS domains")
+    )
     .groupBy("user_id").as("d"),
     "users.id",
     "d.user_id"
@@ -193,7 +196,10 @@ async function totalAdmin(match, params) {
     query.andWhere("domains", params?.domains ? "is not" : "is", null);
     query.leftJoin(
       knex("domains")
-        .select("user_id", knex.raw("string_agg(address, ', ') AS domains"))
+        .select("user_id", knex.isMySQL
+          ? knex.raw("group_concat(address SEPARATOR ', ') AS domains")
+          : knex.raw("string_agg(address, ', ') AS domains")
+        )
         .groupBy("user_id").as("d"),
       "users.id",
       "d.user_id"