0.0.12 处理order有关键字时出错的问题

haptear · haptear · commit 1a42fa51e1e8 · 2022-05-26T08:58:36.000+08:00
diff --git a/APIJSON.NET/APIJSON.NET/appsettings.json b/APIJSON.NET/APIJSON.NET/appsettings.json
@@ -1,8 +1,7 @@
 {
   "ConnectionStrings": {
     "DbType": 0, //0:MySql,1:SqlServer,2:Sqlite
-    "ConnectionString": "Server=192.168.2.25;Database=yunwei1.8;Uid=root;Pwd=xmjk;Port=3306;Character Set=utf8;"
-    //"ConnectionString": "Server=119.29.9.25;Port=3306;Database=test;Uid=root;Pwd=1q,2w.3e?;CharSet=UTF8;"
+    "ConnectionString": "Server=localhost;Port=3306;Database=test;Uid=root;Pwd=test;CharSet=UTF8;"
   },
   "CorsUrls": "http://localhost:5000,http://localhost5001",
   "Authentication": {
diff --git a/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj b/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj
@@ -2,8 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.0.11</Version>
+    <Version>0.0.12</Version>
     <Description>
+		0.0.12 处理order有关键字时出错的问题
 		0.0.11 升级sqlSugarCore版本 解决如果查找字段是关键字(例如:key)时出错的问题
 		0.0.10 处理别名如果为关键字的缺陷
 		0.0.8 清理SelectTable 支持重载
diff --git a/APIJSON.NET/APIJSONCommon/SelectTable.cs b/APIJSON.NET/APIJSONCommon/SelectTable.cs
@@ -534,7 +534,7 @@ private void ProcessColumn(string subtable, string selectrole, JObject values, I
                         {
                             throw new Exception("别名不能超过20个字符");
                         }
-                        str.Append(ziduan[0] + " as `" + ReplaceSQLChar(ziduan[1]) + "`,");
+                        str.Append("`"+ ziduan[0] + "`" + " as `" + ReplaceSQLChar(ziduan[1]) + "`,");
                     }
                     else
                         str.Append("`" + ziduan[0] + "`" + ",");
@@ -645,15 +645,15 @@ private void ProcessOrder(string subtable, JObject values, ISugarQueryable<Expan
                     {
                         if (item.EndsWith("-"))
                         {
-                            tb.OrderBy($"{col} desc");
+                            tb.OrderBy($"`{col}` desc");
                         }
                         else if (item.EndsWith("+"))
                         {
-                            tb.OrderBy($"{col} asc");
+                            tb.OrderBy($"`{col}` asc");
                         }
                         else
                         {
-                            tb.OrderBy($"{col}");
+                            tb.OrderBy($"`{col}`");
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ private void ProcessColumn(string subtable, string selectrole, JObject values, I`
`534`	`534`	`{`
`535`	`535`	`throw new Exception("别名不能超过20个字符");`
`536`	`536`	`}`
`537`		- str.Append(ziduan[0] + " as `" + ReplaceSQLChar(ziduan[1]) + "`,");
	`537`	+ str.Append("`"+ ziduan[0] + "`" + " as `" + ReplaceSQLChar(ziduan[1]) + "`,");
`538`	`538`	`}`
`539`	`539`	`else`
`540`	`540`	str.Append("`" + ziduan[0] + "`" + ",");
`@@ -645,15 +645,15 @@ private void ProcessOrder(string subtable, JObject values, ISugarQueryable<Expan`
`645`	`645`	`{`
`646`	`646`	`if (item.EndsWith("-"))`
`647`	`647`	`{`
`648`		`- tb.OrderBy($"{col} desc");`
	`648`	+ tb.OrderBy($"`{col}` desc");
`649`	`649`	`}`
`650`	`650`	`else if (item.EndsWith("+"))`
`651`	`651`	`{`
`652`		`- tb.OrderBy($"{col} asc");`
	`652`	+ tb.OrderBy($"`{col}` asc");
`653`	`653`	`}`
`654`	`654`	`else`
`655`	`655`	`{`
`656`		`- tb.OrderBy($"{col}");`
	`656`	+ tb.OrderBy($"`{col}`");
`657`	`657`	`}`
`658`	`658`	`}`
`659`	`659`	`}`