From 7a61aea544b0940327b6a7546d6f78d061d7ebcf Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Fri, 21 Dec 2018 19:46:03 +0800 Subject: [PATCH] =?UTF-8?q?sqlserver=20=E8=A1=A8=E8=BE=BE=E5=BC=8F?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Docs/expression.md | 2 +- .../SqlServer/SqlServerAdo/SqlServerAdo.cs | 4 +- FreeSql/SqlServer/SqlServerExpression.cs | 48 +++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Docs/expression.md b/Docs/expression.md index d64cd144..5e68fe13 100644 --- a/Docs/expression.md +++ b/Docs/expression.md @@ -71,7 +71,7 @@ | a.ToString() | date_format(a, '%Y-%m-%d %H:%i:%s.%f') | convert(varchar, a, 121) | - | 转换字符串 | ### 时间对象 -| 表达式 | MySql | SqlServer | PostgreSQL | 功能说明 | +| 表达式 | MySql(微秒) | SqlServer(秒) | PostgreSQL | 功能说明 | | - | - | - | - | - | | TimeSpan.Zero | 0 | 0 | - | 0微秒 | | TimeSpan.MaxValue | 922337203685477580 | 922337203685477580 | - | 最大微秒时间 | diff --git a/FreeSql/SqlServer/SqlServerAdo/SqlServerAdo.cs b/FreeSql/SqlServer/SqlServerAdo/SqlServerAdo.cs index 3ec4a953..1fc5714d 100644 --- a/FreeSql/SqlServer/SqlServerAdo/SqlServerAdo.cs +++ b/FreeSql/SqlServer/SqlServerAdo/SqlServerAdo.cs @@ -37,9 +37,9 @@ namespace FreeSql.SqlServer { else if (param is DateTime?) return string.Concat("'", (param as DateTime?).Value.ToString("yyyy-MM-dd HH:mm:ss.fff"), "'"); else if (param is TimeSpan) - return ((TimeSpan)param).Ticks / 10; + return ((TimeSpan)param).TotalSeconds; else if (param is TimeSpan?) - return (param as TimeSpan?).Value.Ticks / 10; + return (param as TimeSpan?).Value.TotalSeconds; else if (param is IEnumerable) { var sb = new StringBuilder(); var ie = param as IEnumerable; diff --git a/FreeSql/SqlServer/SqlServerExpression.cs b/FreeSql/SqlServer/SqlServerExpression.cs index 3e8a0487..1158839f 100644 --- a/FreeSql/SqlServer/SqlServerExpression.cs +++ b/FreeSql/SqlServer/SqlServerExpression.cs @@ -37,7 +37,7 @@ namespace FreeSql.SqlServer { var left = ExpressionLambdaToSql(exp.Expression, _tables, _selectColumnMap, tbtype, isQuoteName); switch (exp.Member.Name) { case "Date": return $"convert(char(10),{left},120)"; - case "TimeOfDay": return $"(datediff(millisecond, '1970-1-1 ' + convert(varchar, {left}, 14), {left}) * 1000 + 62135596800000000)"; + case "TimeOfDay": return $"datediff(second, '1970-1-1 ' + convert(varchar, {left}, 14), {left})"; case "DayOfWeek": return $"(datepart(weekday, {left}) - 1)"; case "Day": return $"datepart(day, {left})"; case "DayOfYear": return $"datepart(dayofyear, {left})"; @@ -47,7 +47,7 @@ namespace FreeSql.SqlServer { case "Minute": return $"datepart(minute, {left})"; case "Second": return $"datepart(second, {left})"; case "Millisecond": return $"datepart(millisecond, {left})"; - case "Ticks": return $"(datediff(millisecond, '1970-1-1', {left}) * 10000 + 621355968000000000)"; + case "Ticks": return $"datediff(second, '1970-1-1', {left})"; } return null; } @@ -62,17 +62,17 @@ namespace FreeSql.SqlServer { } var left = ExpressionLambdaToSql(exp.Expression, _tables, _selectColumnMap, tbtype, isQuoteName); switch (exp.Member.Name) { - case "Days": return $"(({left}) div {(long)1000000 * 60 * 60 * 24})"; - case "Hours": return $"(({left}) div {(long)1000000 * 60 * 60} mod 24)"; - case "Milliseconds": return $"(({left}) div 1000 mod 1000)"; - case "Minutes": return $"(({left}) div {(long)1000000 * 60} mod 60)"; - case "Seconds": return $"(({left}) div 1000000 mod 60)"; - case "Ticks": return $"(({left}) * 10)"; - case "TotalDays": return $"(({left}) / {(long)1000000 * 60 * 60 * 24})"; - case "TotalHours": return $"(({left}) / {(long)1000000 * 60 * 60})"; - case "TotalMilliseconds": return $"(({left}) / 1000)"; - case "TotalMinutes": return $"(({left}) / {(long)1000000 * 60})"; - case "TotalSeconds": return $"(({left}) / 1000000)"; + case "Days": return $"floor(({left}) / {60 * 60 * 24})"; + case "Hours": return $"floor(({left}) / {60 * 60} % 24)"; + case "Milliseconds": return $"(cast({left} as bigint) * 1000)"; + case "Minutes": return $"floor(({left}) / 60 % 60)"; + case "Seconds": return $"(({left}) % 60)"; + case "Ticks": return $"(cast({left} as bigint) * 10000000)"; + case "TotalDays": return $"(({left}) / {60 * 60 * 24})"; + case "TotalHours": return $"(({left}) / {60 * 60})"; + case "TotalMilliseconds": return $"(cast({left} as bigint) * 1000)"; + case "TotalMinutes": return $"(({left}) / 60)"; + case "TotalSeconds": return $"({left})"; } return null; } @@ -162,20 +162,20 @@ namespace FreeSql.SqlServer { var left = ExpressionLambdaToSql(exp.Object, _tables, _selectColumnMap, tbtype, isQuoteName); var args1 = exp.Arguments.Count == 0 ? null : ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName); switch (exp.Method.Name) { - case "Add": return $"dateadd(millisecond, {args1} / 1000, {left})"; + case "Add": return $"dateadd(second, {args1}, {left})"; case "AddDays": return $"dateadd(day, {args1}, {left})"; case "AddHours": return $"dateadd(hour, {args1}, {left})"; - case "AddMilliseconds": return $"dateadd(millisecond, {args1}, {left})"; + case "AddMilliseconds": return $"dateadd(second, {args1} / 1000, {left})"; case "AddMinutes": return $"dateadd(minute, {args1}, {left})"; case "AddMonths": return $"dateadd(month, {args1}, {left})"; case "AddSeconds": return $"dateadd(second, {args1}, {left})"; - case "AddTicks": return $"dateadd(millisecond, {args1} / 10000, {left})"; + case "AddTicks": return $"dateadd(second, {args1} / 10000000, {left})"; case "AddYears": return $"dateadd(year, {args1}, {left})"; case "Subtract": if (exp.Arguments[0].Type.FullName == "System.DateTime" || exp.Arguments[0].Type.GenericTypeArguments.FirstOrDefault()?.FullName == "System.DateTime") - return $"(datediff(millisecond, {args1}, {left}) * 1000)"; + return $"datediff(second, {args1}, {left})"; if (exp.Arguments[0].Type.FullName == "System.TimeSpan" || exp.Arguments[0].Type.GenericTypeArguments.FirstOrDefault()?.FullName == "System.TimeSpan") - return $"dateadd(millisecond, {args1} / -1000, {left})"; + return $"dateadd(second, {args1} * -1, {left})"; break; case "Equals": return $"({left} = {ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})"; case "CompareTo": return $"(({left}) - ({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)}))"; @@ -188,12 +188,12 @@ namespace FreeSql.SqlServer { switch (exp.Method.Name) { case "Compare": return $"(({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)}) - ({ExpressionLambdaToSql(exp.Arguments[1], _tables, _selectColumnMap, tbtype, isQuoteName)}))"; case "Equals": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} = {ExpressionLambdaToSql(exp.Arguments[1], _tables, _selectColumnMap, tbtype, isQuoteName)})"; - case "FromDays": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} * {(long)1000000 * 60 * 60 * 24})"; - case "FromHours": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} * {(long)1000000 * 60 * 60})"; - case "FromMilliseconds": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} * 1000)"; - case "FromMinutes": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} * {(long)1000000 * 60})"; - case "FromSeconds": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} * 1000000)"; - case "FromTicks": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} / 10)"; + case "FromDays": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} * {60 * 60 * 24})"; + case "FromHours": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} * {60 * 60})"; + case "FromMilliseconds": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} / 1000)"; + case "FromMinutes": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} * 60)"; + case "FromSeconds": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})"; + case "FromTicks": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} / 10000000)"; case "Parse": return $"cast({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} as bigint)"; case "ParseExact": case "TryParse":