DateOnly/TimeOnly support

ChangeLog/7.1.0-RC-dev.txt

@@ -1,2 +1,3 @@
+[main] Add support for new .NET 6 DateOnly and TimeOnly types
 [main] Updated BitFaster.Caching package reference to v2.0.0
 [sqlserver] Updated Microsoft.Data.SqlClient package reference to v5.0.0

Extensions/TestCommon/TestCommon.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />

Extensions/Xtensive.Orm.Reprocessing/Xtensive.Orm.Reprocessing.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Readme.txt" />

Extensions/Xtensive.Orm.Security/Xtensive.Orm.Security.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />

Extensions/Xtensive.Orm.Tracking/Xtensive.Orm.Tracking.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />

Extensions/Xtensive.Orm.Web/Xtensive.Orm.Web.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />

Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/Constants.cs

@@ -14,5 +14,9 @@ internal static class Constants
 
     // cannot use "FFF" cause it may lead to empty string for fractions part.
     public const string DateTimeFormatString = @"''\'yyyy\.MM\.dd HH\:mm\:ss\.fff\'''";
+#if NET6_0_OR_GREATER
+    public const string DateFormatString = @"''\'yyyy\.MM\.dd\'''";
+    public const string TimeFormatString = @"''\'HH\:mm\:ss\.ffff\'''";
+#endif
   }
 }

Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v2_5/Compiler.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2022 Xtensive LLC.
+// Copyright (C) 2011-2023 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Csaba Beer
@@ -101,6 +101,31 @@ public override void Visit(SqlExtract node)
           Visit(CastToLong(node.Operand));
           return;
       }
+#if NET6_0_OR_GREATER
+      if (((node.IsDatePart && node.DatePart == SqlDatePart.DayOfYear)
+          || (node.IsDateTimePart && node.DateTimePart == SqlDateTimePart.DayOfYear))) {
+        if (!case_SqlDateTimePart_DayOfYear) {
+          case_SqlDateTimePart_DayOfYear = true;
+          Visit(SqlDml.Add(node, SqlDml.Literal(1)));
+          case_SqlDateTimePart_DayOfYear = false;
+        }
+        else {
+          base.Visit(node);
+        }
+        return;
+      }
+      else if (node.IsSecondExtraction) {
+        if (!case_SqlDateTimePart_Second) {
+          case_SqlDateTimePart_Second = true;
+          Visit(SqlDml.Truncate(node));
+          case_SqlDateTimePart_Second = false;
+        }
+        else {
+          base.Visit(node);
+        }
+        return;
+      }
+#else
       switch (node.DateTimePart) {
         case SqlDateTimePart.DayOfYear:
           if (!case_SqlDateTimePart_DayOfYear) {
@@ -123,6 +148,8 @@ public override void Visit(SqlExtract node)
           }
           return;
       }
+#endif
+
       base.Visit(node);
     }
 
@@ -149,6 +176,14 @@ public override void Visit(SqlBinary node)
         case SqlNodeType.DateTimeMinusDateTime:
           DateTimeSubtractDateTime(node.Left, node.Right).AcceptVisitor(this);
           return;
+#if NET6_0_OR_GREATER
+        case SqlNodeType.TimePlusInterval:
+          TimeAddInterval(node.Left, node.Right).AcceptVisitor(this);
+          return;
+        case SqlNodeType.TimeMinusTime:
+          TimeSubtractTime(node.Left, node.Right).AcceptVisitor(this);
+          return;
+#endif
         case SqlNodeType.Modulo:
           Visit(SqlDml.FunctionCall(translator.TranslateToString(SqlNodeType.Modulo), node.Left, node.Right));
           return;
@@ -170,34 +205,84 @@ public override void Visit(SqlBinary node)
     /// <inheritdoc/>
     public override void Visit(SqlFunctionCall node)
     {
+      var arguments = node.Arguments;
+
       switch (node.FunctionType) {
         case SqlFunctionType.Concat:
-          Visit(SqlDml.Concat(node.Arguments.ToArray(node.Arguments.Count)));
+          Visit(SqlDml.Concat(arguments.ToArray(node.Arguments.Count)));
           return;
         case SqlFunctionType.DateTimeTruncate:
-          Visit(SqlDml.Cast(node.Arguments[0], new SqlValueType("Date")));
+          Visit(SqlDml.Cast(arguments[0], new SqlValueType("Date")));
           return;
         case SqlFunctionType.IntervalToMilliseconds:
-          Visit(CastToLong(node.Arguments[0]) / NanosecondsPerMillisecond);
+          Visit(CastToLong(arguments[0]) / NanosecondsPerMillisecond);
           return;
         case SqlFunctionType.IntervalConstruct:
         case SqlFunctionType.IntervalToNanoseconds:
-          Visit(CastToLong(node.Arguments[0]));
+          Visit(CastToLong(arguments[0]));
           return;
         case SqlFunctionType.DateTimeAddMonths:
-          Visit(DateAddMonth(node.Arguments[0], node.Arguments[1]));
+          Visit(DateAddMonth(arguments[0], arguments[1]));
           return;
         case SqlFunctionType.DateTimeAddYears:
-          Visit(DateAddYear(node.Arguments[0], node.Arguments[1]));
+          Visit(DateAddYear(arguments[0], arguments[1]));
           return;
         case SqlFunctionType.DateTimeConstruct:
           Visit(DateAddDay(DateAddMonth(DateAddYear(SqlDml.Cast(SqlDml.Literal(new DateTime(2001, 1, 1)), SqlType.DateTime),
-            node.Arguments[0] - 2001),
-            node.Arguments[1] - 1),
-            node.Arguments[2] - 1));
+            arguments[0] - 2001),
+            arguments[1] - 1),
+            arguments[2] - 1));
+          return;
+#if NET6_0_OR_GREATER
+        case SqlFunctionType.DateAddYears:
+          Visit(DateAddYear(arguments[0], arguments[1]));
+          return;
+        case SqlFunctionType.DateAddMonths:
+          Visit(DateAddMonth(arguments[0], arguments[1]));
+          return;
+        case SqlFunctionType.DateAddDays:
+          Visit(DateAddDay(arguments[0], arguments[1]));
+          return;
+        case SqlFunctionType.DateConstruct:
+          Visit(DateAddDay(DateAddMonth(DateAddYear(SqlDml.Cast(SqlDml.Literal(new DateOnly(2001, 1, 1)), SqlType.Date),
+            arguments[0] - 2001),
+            arguments[1] - 1),
+            arguments[2] - 1));
+          return;
+        case SqlFunctionType.TimeAddHours:
+          Visit(DateAddHour(node.Arguments[0], node.Arguments[1]));
+          return;
+        case SqlFunctionType.TimeAddMinutes:
+          Visit(DateAddMinute(node.Arguments[0], node.Arguments[1]));
+          return;
+        case SqlFunctionType.TimeConstruct:
+          Visit(DateAddMillisecond(DateAddSecond(DateAddMinute(DateAddHour(SqlDml.Cast(SqlDml.Literal(new TimeOnly(0, 0, 0)), SqlType.Time),
+            arguments[0]),
+            arguments[1]),
+            arguments[2]),
+            arguments[3]));
           return;
+        case SqlFunctionType.DateToString:
+          Visit(DateToString(arguments[0]));
+          return;
+        case SqlFunctionType.TimeToString:
+          Visit(TimeToString(arguments[0]));
+          return;
+        case SqlFunctionType.DateToDateTime:
+          DateToDateTime(arguments[0]).AcceptVisitor(this);
+          return;
+        case SqlFunctionType.DateTimeToDate:
+          DateTimeToDate(arguments[0]).AcceptVisitor(this);
+          return;
+        case SqlFunctionType.DateTimeToTime:
+          DateTimeToTime(arguments[0]).AcceptVisitor(this);
+          return;
+        case SqlFunctionType.TimeToDateTime:
+          TimeToDateTime(arguments[0]).AcceptVisitor(this);
+          return;
+#endif
         case SqlFunctionType.DateTimeToStringIso:
-          Visit(DateTimeToStringIso(node.Arguments[0]));
+          Visit(DateTimeToStringIso(arguments[0]));
           return;
       }
 
@@ -223,6 +308,15 @@ protected static SqlExpression DateTimeSubtractDateTime(SqlExpression date1, Sql
         (CastToLong(DateDiffMillisecond(DateAddDay(date2, DateDiffDay(date2, date1)), date1)) *
           NanosecondsPerMillisecond);
     }
+#if NET6_0_OR_GREATER
+
+    protected static SqlExpression TimeSubtractTime(SqlExpression time1, SqlExpression time2)
+    {
+      return SqlDml.Modulo(
+        NanosecondsPerDay + CastToLong(DateDiffMillisecond(time2, time1)) * NanosecondsPerMillisecond,
+        NanosecondsPerDay);
+    }
+#endif
 
     protected static SqlExpression DateTimeAddInterval(SqlExpression date, SqlExpression interval)
     {
@@ -231,6 +325,9 @@ protected static SqlExpression DateTimeAddInterval(SqlExpression date, SqlExpres
         (interval / NanosecondsPerMillisecond) % (MillisecondsPerDay));
     }
 
+    protected static SqlExpression TimeAddInterval(SqlExpression time, SqlExpression interval) =>
+      DateAddMillisecond(time, (interval / NanosecondsPerMillisecond) % (MillisecondsPerDay));
+
     protected static SqlCast CastToLong(SqlExpression arg) => SqlDml.Cast(arg, SqlType.Int64);
 
     protected static SqlUserFunctionCall DateDiffDay(SqlExpression date1, SqlExpression date2) =>
@@ -271,6 +368,26 @@ protected static SqlUserFunctionCall BitXor(SqlExpression left, SqlExpression ri
 
     protected static SqlUserFunctionCall BitNot(SqlExpression operand) =>
       SqlDml.FunctionCall("BIN_NOT", operand);
+#if NET6_0_OR_GREATER
+
+    protected static SqlExpression TimeToDateTime(SqlExpression time) =>
+      SqlDml.Cast(time, SqlType.DateTime);
+
+    protected static SqlExpression DateTimeToTime(SqlExpression dateTime) =>
+      SqlDml.Cast(dateTime, SqlType.Time);
+
+    protected static SqlExpression DateToDateTime(SqlExpression date) =>
+      SqlDml.Cast(date, SqlType.DateTime);
+
+    protected static SqlExpression DateTimeToDate(SqlExpression dateTime) =>
+      SqlDml.Cast(dateTime, SqlType.Date);
+
+    protected static SqlFunctionCall DateToString(SqlExpression date) =>
+      SqlDml.Substring(date, 0, 10);
+
+    protected static SqlConcat TimeToString(SqlExpression time) =>
+      SqlDml.Concat(SqlDml.Substring(time, 0, 12), SqlDml.Literal("0000"));
+#endif
 
     protected static SqlConcat DateTimeToStringIso(SqlExpression dateTime)
     {
@@ -279,8 +396,8 @@ protected static SqlConcat DateTimeToStringIso(SqlExpression dateTime)
 
       return SqlDml.Concat(date, SqlDml.Literal("T"), time);
     }
-    
-    #endregion
+
+#endregion
 
     protected internal Compiler(SqlDriver driver)
       : base(driver)

Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v2_5/Extractor.cs

@@ -490,7 +490,7 @@ private static void ReadForeignKeyColumnData(DbDataReader reader, ref ForeignKey
         state.ReferencingTable = state.ReferencingSchema.Tables[reader.GetString(1).Trim()];
         state.ForeignKey = state.ReferencingTable.CreateForeignKey(reader.GetString(2).Trim());
         ReadConstraintProperties(state.ForeignKey, reader, 3, 4);
-        ReadCascadeAction(state.ForeignKey, reader, 5);
+        ReadCascadeAction(state.ForeignKey, reader, 5, 12);
         state.ReferencedTable = state.ReferencedSchema.Tables[reader.GetString(9).Trim()];
         state.ForeignKey.ReferencedTable = state.ReferencedTable;
       }
@@ -618,25 +618,25 @@ private static void ReadConstraintProperties(Constraint constraint,
       constraint.IsInitiallyDeferred = ReadStringOrNull(row, isInitiallyDeferredIndex) == "YES";
     }
 
-    private static void ReadCascadeAction(ForeignKey foreignKey, IDataRecord row, int deleteRuleIndex)
+    private static void ReadCascadeAction(ForeignKey foreignKey, IDataRecord row, int deleteRuleIndex, int updateRuleIndex)
     {
       var deleteRule = ReadStringOrNull(row, deleteRuleIndex);
-      switch (deleteRule) {
-        case "CASCADE":
-          foreignKey.OnDelete = ReferentialAction.Cascade;
-          return;
-        case "SET NULL":
-          foreignKey.OnDelete = ReferentialAction.SetNull;
-          return;
-        case "NO ACTION":
-          foreignKey.OnDelete = ReferentialAction.NoAction;
-          return;
-        case "RESTRICT": // behaves like NO ACTION
-          foreignKey.OnDelete = ReferentialAction.NoAction;
-          return;
-        case "SET DEFAULT":
-          foreignKey.OnDelete = ReferentialAction.SetDefault;
-          return;
+      foreignKey.OnDelete = GetRefAction(deleteRule);
+
+      var updateRule = ReadStringOrNull(row, updateRuleIndex);
+      foreignKey.OnUpdate = GetRefAction(updateRule);
+
+
+      static ReferentialAction GetRefAction(in string rawActionName)
+      {
+        return rawActionName switch {
+          "CASCADE" => ReferentialAction.Cascade,
+          "SET NULL" => ReferentialAction.SetNull,
+          "NO ACTION" => ReferentialAction.NoAction,
+          "RESTRICT" => ReferentialAction.NoAction,
+          "SET DEFAULT" => ReferentialAction.SetDefault,
+          _ => throw new ArgumentOutOfRangeException()
+        };
       }
     }
 

Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v2_5/ServerInfoProvider.cs

@@ -237,6 +237,11 @@ public override DataTypeCollection GetDataTypesInfo()
 
       dtc.DateTime = DataTypeInfo.Range(SqlType.DateTime, commonFeatures,
         ValueRange.DateTime, "timestamp");
+#if NET6_0_OR_GREATER
+
+      dtc.DateOnly = DataTypeInfo.Range(SqlType.Date, commonFeatures, ValueRange.DateOnly, "date");
+      dtc.TimeOnly = DataTypeInfo.Range(SqlType.Time, commonFeatures, ValueRange.TimeOnly, "time");
+#endif
 
       dtc.Char = DataTypeInfo.Stream(SqlType.Char, commonFeatures, MaxCharLength, "char");
       dtc.VarChar = DataTypeInfo.Stream(SqlType.VarChar, commonFeatures, MaxCharLength, "varchar");