@nicia-ai/typegraph 0.9.1 → 0.9.2

package/dist/index.cjs

@@ -2522,14 +2522,8 @@ function compileAggregateExprFromSource(expr, dialect) {
   const { field: field2 } = expr;
   const fn = expr.function;
   switch (fn) {
-    case "count": {
-      const cteAlias = `cte_${field2.alias}`;
-      return drizzleOrm.sql`COUNT(${drizzleOrm.sql.raw(cteAlias)}.${drizzleOrm.sql.raw(field2.alias)}_id)`;
-    }
-    case "countDistinct": {
-      const cteAlias = `cte_${field2.alias}`;
-      return drizzleOrm.sql`COUNT(DISTINCT ${drizzleOrm.sql.raw(cteAlias)}.${drizzleOrm.sql.raw(field2.alias)}_id)`;
-    }
+    case "count":
+    case "countDistinct":
     case "sum":
     case "avg":
     case "min":
@@ -2541,6 +2535,9 @@ function compileAggregateExprFromSource(expr, dialect) {
         field2.valueType,
         cteAlias
       );
+      if (fn === "countDistinct") {
+        return drizzleOrm.sql`COUNT(DISTINCT ${column})`;
+      }
       return drizzleOrm.sql`${drizzleOrm.sql.raw(fn.toUpperCase())}(${column})`;
     }
     default: {
@@ -3650,19 +3647,17 @@ function compilePrefixedSelect(ast, prefix, dialect) {
 function compileFieldValueForSetOp(source, prefix, alias, dialect) {
   if ("__type" in source && source.__type === "aggregate") {
     const { field: field2, function: fn } = source;
-    const cteName = `cte_${prefix}_${field2.alias}`;
     switch (fn) {
-      case "count": {
-        return drizzleOrm.sql`COUNT(${drizzleOrm.sql.raw(cteName)}.${drizzleOrm.sql.raw(field2.alias)}_id)`;
-      }
-      case "countDistinct": {
-        return drizzleOrm.sql`COUNT(DISTINCT ${drizzleOrm.sql.raw(cteName)}.${drizzleOrm.sql.raw(field2.alias)}_id)`;
-      }
+      case "count":
+      case "countDistinct":
       case "sum":
       case "avg":
       case "min":
       case "max": {
         const column = compileFieldColumnForSetOp(field2, prefix, dialect);
+        if (fn === "countDistinct") {
+          return drizzleOrm.sql`COUNT(DISTINCT ${column})`;
+        }
         return drizzleOrm.sql`${drizzleOrm.sql.raw(fn.toUpperCase())}(${column})`;
       }
       default: {
@@ -3876,9 +3871,7 @@ function collectRequiredColumnsByAlias2(ast) {
         markFieldRefAsRequired(requiredColumnsByAlias, source);
       } else {
         addRequiredColumn(requiredColumnsByAlias, source.field.alias, "id");
-        if (source.function !== "count" && source.function !== "countDistinct") {
-          markFieldRefAsRequired(requiredColumnsByAlias, source.field);
-        }
+        markFieldRefAsRequired(requiredColumnsByAlias, source.field);
       }
     }
   }