Skip to content

Commit 0669737

Browse files
committed
fixes for .Net 6
1 parent 11f2a0d commit 0669737

File tree

5 files changed

+483
-517
lines changed

5 files changed

+483
-517
lines changed

Signum.Engine.Extensions/Dynamic/DynamicCSSOverrideLogic.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public static void Start(SchemaBuilder sb)
2929
}
3030
}
3131
}
32-
}
3332

3433
// In order to work this module, you should apply below mentioned changes to your index.cshtml file
3534
/*

Signum.Engine/Linq/ExpressionVisitor/DbExpressionNominator.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -837,8 +837,12 @@ protected override Expression VisitBinary(BinaryExpression b)
837837
b.Left is MemberExpression leftSide && leftSide.Member is PropertyInfo piLeft && ReflectionTools.PropertyEquals(piLeft, piDayNumber) &&
838838
b.Right is MemberExpression rightSide && rightSide.Member is PropertyInfo piRight && ReflectionTools.PropertyEquals(piRight, piDayNumber))
839839
{
840+
var diff = TrySqlDifference(SqlEnums.day, b.Type, leftSide.Expression!, rightSide.Expression!);
841+
if (diff == null)
842+
return b;
840843

841-
return TrySqlDifference(SqlEnums.day, b.Type, leftSide.Expression!, rightSide.Expression!) ?? b;
844+
845+
return Add(new SqlCastExpression(typeof(int), diff));
842846
}
843847

844848
b = SmartEqualizer.UnwrapPrimaryKeyBinary(b);
@@ -1610,7 +1614,7 @@ protected override Expression VisitMethodCall(MethodCallExpression m)
16101614
case "DateTimeExtensions.Quarter": return TrySqlFunction(null, GetDatePart(), m.Type, new SqlLiteralExpression(SqlEnums.quarter), m.Arguments.Single());
16111615
case "DateTimeExtensions.WeekNumber": return TrySqlFunction(null, GetDatePart(), m.Type, new SqlLiteralExpression(SqlEnums.week), m.Arguments.Single());
16121616

1613-
case "DateTimeExtensions.ToDate": return TrySqlCast(m.Type, m.GetArgument("dateTime"));
1617+
case "DateTimeExtensions.ToDateOnly": return TrySqlCast(m.Type, m.GetArgument("dateTime"));
16141618
case "DateTimeExtensions.ToDateTime": return TrySqlCast(m.Type, m.GetArgument("date"));
16151619
case "DateOnly.FromDateTime":return TrySqlCast(m.Type, m.GetArgument("dateTime"));
16161620

0 commit comments

Comments
 (0)