TimeOnly and DateOnly compilers use their own SqlDml.Extract()

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Providers/Expressions/MemberCompilers/DateOnlyCompilers.cs

@@ -19,27 +19,27 @@ internal static class DateOnlyCompilers
 
     [Compiler(typeof(DateOnly), "Year", TargetKind.PropertyGet)]
     public static SqlExpression DateOnlyYear(SqlExpression _this) =>
-      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDateTimePart.Year, _this));
+      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDatePart.Year, _this));
 
     [Compiler(typeof(DateOnly), "Month", TargetKind.PropertyGet)]
     public static SqlExpression DateOnlyMonth(SqlExpression _this) =>
-      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDateTimePart.Month, _this));
+      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDatePart.Month, _this));
 
     [Compiler(typeof(DateOnly), "Day", TargetKind.PropertyGet)]
     public static SqlExpression DateOnlyDay(SqlExpression _this) =>
-      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDateTimePart.Day, _this));
+      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDatePart.Day, _this));
 
 
     [Compiler(typeof(DateOnly), "DayOfYear", TargetKind.PropertyGet)]
     public static SqlExpression DateOnlyDayOfYear(SqlExpression _this)
     {
-      return ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDateTimePart.DayOfYear, _this));
+      return ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDatePart.DayOfYear, _this));
     }
 
     [Compiler(typeof(DateOnly), "DayOfWeek", TargetKind.PropertyGet)]
     public static SqlExpression DateOnlyDayOfWeek(SqlExpression _this)
     {
-      var baseExpression = ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDateTimePart.DayOfWeek, _this));
+      var baseExpression = ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDatePart.DayOfWeek, _this));
       var context = ExpressionTranslationContext.Current;
       if (context == null) {
         return baseExpression;
@@ -137,15 +137,15 @@ public static SqlExpression DateOnlyToStringIso(SqlExpression _this)
     public static SqlExpression DateOnlyToStringIso(SqlExpression _this, [Type(typeof(string))] SqlExpression value)
     {
       throw new NotImplementedException();
-      //var stringValue = value as SqlLiteral<string>;
+      var stringValue = value as SqlLiteral<string>;
 
-      //if (stringValue == null)
-      //  throw new NotSupportedException(Strings.ExTranslationOfDateTimeToStringWithArbitraryArgumentsIsNotSupported);
+      if (stringValue == null)
+        throw new NotSupportedException(Strings.ExTranslationOfDateTimeToStringWithArbitraryArgumentsIsNotSupported);
 
-      //if (!stringValue.Value.Equals("s"))
-      //  throw new NotSupportedException(Strings.ExTranslationOfDateTimeToStringWithArbitraryArgumentsIsNotSupported);
+      if (!stringValue.Value.Equals("s"))
+        throw new NotSupportedException(Strings.ExTranslationOfDateTimeToStringWithArbitraryArgumentsIsNotSupported);
 
-      //return SqlDml.DateTimeToStringIso(_this);
+      return SqlDml.DateTimeToStringIso(_this);
     }
   }
 #endif

Orm/Xtensive.Orm/Orm/Providers/Expressions/MemberCompilers/TimeOnlyCompilers.cs

@@ -21,19 +21,19 @@ internal static class TimeOnlyCompilers
 
     [Compiler(typeof(TimeOnly), "Hour", TargetKind.PropertyGet)]
     public static SqlExpression TimeOnlyHour(SqlExpression _this) =>
-      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDateTimePart.Hour, _this));
+      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlTimePart.Hour, _this));
 
     [Compiler(typeof(TimeOnly), "Minute", TargetKind.PropertyGet)]
     public static SqlExpression TimeOnlyMinute(SqlExpression _this) =>
-      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDateTimePart.Minute, _this));
+      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlTimePart.Minute, _this));
 
     [Compiler(typeof(TimeOnly), "Second", TargetKind.PropertyGet)]
     public static SqlExpression TimeOnlySecond(SqlExpression _this) =>
-      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDateTimePart.Second, _this));
+      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlTimePart.Second, _this));
 
     [Compiler(typeof(TimeOnly), "Millisecond", TargetKind.PropertyGet)]
     public static SqlExpression TimeOnlyMillisecond(SqlExpression _this) =>
-      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlDateTimePart.Millisecond, _this));
+      ExpressionTranslationHelpers.ToInt(SqlDml.Extract(SqlTimePart.Millisecond, _this));
 
     [Compiler(typeof(TimeOnly), "Ticks", TargetKind.PropertyGet)]
     public static SqlExpression TimeOnlyTicks(SqlExpression _this)