added chat messages

ent/spray_query.go

@@ -422,6 +422,10 @@ func (sq *SprayQuery) sqlCount(ctx context.Context) (int, error) {
 	if len(sq.modifiers) > 0 {
 		_spec.Modifiers = sq.modifiers
 	}
+	_spec.Node.Columns = sq.fields
+	if len(sq.fields) > 0 {
+		_spec.Unique = sq.unique != nil && *sq.unique
+	}
 	return sqlgraph.CountNodes(ctx, sq.driver, _spec)
 }
 
@@ -493,6 +497,9 @@ func (sq *SprayQuery) sqlQuery(ctx context.Context) *sql.Selector {
 		selector = sq.sql
 		selector.Select(selector.Columns(columns...)...)
 	}
+	if sq.unique != nil && *sq.unique {
+		selector.Distinct()
+	}
 	for _, m := range sq.modifiers {
 		m(selector)
 	}
@@ -780,9 +787,7 @@ func (sgb *SprayGroupBy) sqlQuery() *sql.Selector {
 		for _, f := range sgb.fields {
 			columns = append(columns, selector.C(f))
 		}
-		for _, c := range aggregation {
-			columns = append(columns, c)
-		}
+		columns = append(columns, aggregation...)
 		selector.Select(columns...)
 	}
 	return selector.GroupBy(selector.Columns(sgb.fields...)...)