From ddd5e81a67f930f61de0175a86a19bced2c77b3e Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Wed, 24 Apr 2019 16:35:35 +0800
Subject: [PATCH] update

---
 FreeSql.Tests/UnitTest1.cs           | 2 +-
 FreeSql/Internal/CommonExpression.cs | 8 ++++++++
 readme.md                            | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/FreeSql.Tests/UnitTest1.cs b/FreeSql.Tests/UnitTest1.cs
index a2c5b50e..12349313 100644
--- a/FreeSql.Tests/UnitTest1.cs
+++ b/FreeSql.Tests/UnitTest1.cs
@@ -201,7 +201,7 @@ namespace FreeSql.Tests {
 			.Having(a => a.Count() > 0 && a.Avg(a.Key.mod4) > 0 && a.Max(a.Key.mod4) > 0)
 			.Having(a => a.Count() < 300 || a.Avg(a.Key.mod4) < 100)
 			.OrderBy(a => a.Key.tt2)
-			.OrderByDescending(a => a.Count()).ToSql(a => new { a.Key.mod4, a.Key.tt2 });
+			.OrderByDescending(a => a.Count()).ToSql(a => new { a.Key.mod4, a.Key.tt2, max = a.Max("a.id"), max2 = Convert.ToInt64("max(a.id)") });
 
 			var groupbysql2 = g.mysql.Select<TestInfo>().From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
 				.Where(a => a.Id == 1)
diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs
index 5515d00f..dff01dca 100644
--- a/FreeSql/Internal/CommonExpression.cs
+++ b/FreeSql/Internal/CommonExpression.cs
@@ -345,6 +345,14 @@ namespace FreeSql.Internal {
 						return $"{tmpleft} {tmptryoper} {tmpright}";
 					}
 					if (callType.FullName.StartsWith("FreeSql.ISelectGroupingAggregate`")) {
+						//if (exp3.Type == typeof(string) && exp3.Arguments.Any() && exp3.Arguments[0].NodeType == ExpressionType.Constant) {
+						//	switch (exp3.Method.Name) {
+						//		case "Sum": return $"sum({(exp3.Arguments[0] as ConstantExpression)?.Value})";
+						//		case "Avg": return $"avg({(exp3.Arguments[0] as ConstantExpression)?.Value})";
+						//		case "Max": return $"max({(exp3.Arguments[0] as ConstantExpression)?.Value})";
+						//		case "Min": return $"min({(exp3.Arguments[0] as ConstantExpression)?.Value})";
+						//	}
+						//}
 						switch (exp3.Method.Name) {
 							case "Count": return "count(1)";
 							case "Sum": return $"sum({ExpressionLambdaToSql(exp3.Arguments[0], _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName, isDisableDiyParse, style)})";
diff --git a/readme.md b/readme.md
index 524cbb82..8f7991c9 100644
--- a/readme.md
+++ b/readme.md
@@ -114,7 +114,7 @@ using (var uow = fsql.CreateUnitOfWork()) {
 public class SongContext : DbContext {
 
     public DbSet<Song> Songs { get; set; }
-    public DbSet<Song> Tags { get; set; }
+    public DbSet<Tag> Tags { get; set; }
 
     protected override void OnConfiguring(DbContextOptionsBuilder builder) {
         builder.UseFreeSql(fsql);