Add more features to the query generator

2026-04-18 14:59:23 +01:00
parent f3f1c42699
commit 9c5d39edfb
19 changed files with 375 additions and 83 deletions
@@ -13,24 +13,37 @@ export default function sqlGenGrabSelectFieldSQL({ selectFields, append_table_na
            const fld_name = `${String(fld.fieldName)}`;
            if (fld.count) {
                fld_str += `COUNT(${fld_name})`;
-                if (fld.count.alias) {
-                    fld_str += ` AS ${fld.count.alias}`;
-                }
            }
            else if (fld.sum) {
-                fld_str += `SUM(${fld_name}) AS ${fld.sum.alias}`;
+                fld_str += `SUM(${fld_name})`;
+            }
+            else if (fld.average) {
+                fld_str += `AVERAGE(${fld_name})`;
+            }
+            else if (fld.max) {
+                fld_str += `MAX(${fld_name})`;
+            }
+            else if (fld.min) {
+                fld_str += `MIN(${fld_name})`;
+            }
+            else if (fld.distinct) {
+                fld_str += `DISTINCT ${fld_name}`;
            }
            else if (fld.group_concat) {
                fld_str += sqlGenGrabConcatStr({
                    field: fld_name,
                    alias: fld.group_concat.alias,
                    separator: fld.group_concat.separator,
+                    distinct: fld.group_concat.distinct,
                });
            }
            else {
                fld_str +=
                    final_fld_name + (fld.alias ? ` as ${fld.alias}` : ``);
            }
+            if (fld.alias) {
+                fld_str += ` AS ${fld.alias}`;
+            }
        }
        else {
            fld_str += final_fld_name;