Add support for ,NET 6 DateOnly and TimeOnly data types

Author: mythz

src/ServiceStack.OrmLite.PostgreSQL/Converters/PostgreSqlDateOnlyConverter.cs

@@ -0,0 +1,34 @@
+using System;
+using ServiceStack.OrmLite.Converters;
+
+#if NET6_0
+namespace ServiceStack.OrmLite.PostgreSQL.Converters;
+
+public class PostgreSqlDateOnlyConverter : PostgreSqlDateTimeConverter
+{
+    public override string ToQuotedString(Type fieldType, object value)
+    {
+        var dateOnly = (DateOnly)value;
+        return DateTimeFmt(dateOnly.ToDateTime(default, DateTimeKind.Utc), "yyyy-MM-dd HH:mm:ss.fff");
+    }
+
+    public override object ToDbValue(Type fieldType, object value)
+    {
+        var dateOnly = (DateOnly)value;
+        var dateTime = dateOnly.ToDateTime(default, DateTimeKind.Utc);
+        if (dateTime.Kind != DateTimeKind.Utc)
+            dateTime = DateTime.SpecifyKind(dateTime, DateTimeKind.Utc);
+        return dateTime;
+    }
+
+    public override object FromDbValue(object value)
+    {
+        var dateTime = (DateTime)base.FromDbValue(value);
+        if (dateTime.Kind == DateTimeKind.Unspecified)
+            dateTime = dateTime.ToLocalTime();
+        var dateOnly = DateOnly.FromDateTime(dateTime);
+        return dateOnly;
+    }
+}
+
+#endif

src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs

@@ -72,6 +72,10 @@ public PostgreSqlDialectProvider()
             RegisterConverter<DateTimeOffset[]>(new PostgreSqlDateTimeOffsetTimeStampTzArrayConverter());
 
             RegisterConverter<XmlValue>(new PostgreSqlXmlConverter());
+            
+#if NET6_0
+            RegisterConverter<DateOnly>(new PostgreSqlDateOnlyConverter());
+#endif
 
             this.Variables = new Dictionary<string, string>
             {

src/ServiceStack.OrmLite/Converters/DateOnlyConverter.cs

@@ -0,0 +1,30 @@
+using System;
+
+#if NET6_0
+namespace ServiceStack.OrmLite.Converters;
+
+public class DateOnlyConverter : DateTimeConverter
+{
+    public override string ToQuotedString(Type fieldType, object value)
+    {
+        var dateOnly = (DateOnly)value;
+        return DateTimeFmt(dateOnly.ToDateTime(default, DateTimeKind.Local), "yyyy-MM-dd HH:mm:ss.fff");
+    }
+
+    public override object ToDbValue(Type fieldType, object value)
+    {
+        var dateOnly = (DateOnly)value;
+        return base.ToDbValue(typeof(DateTime), dateOnly.ToDateTime(default, DateTimeKind.Local));
+    }
+
+    public override object FromDbValue(object value)
+    {
+        var dateTime = (DateTime)base.FromDbValue(value);
+        if (dateTime.Kind != DateTimeKind.Local)
+            dateTime = DateTime.SpecifyKind(dateTime, DateTimeKind.Local);
+        var dateOnly = DateOnly.FromDateTime(dateTime);
+        return dateOnly;
+    }
+}
+
+#endif

src/ServiceStack.OrmLite/Converters/TimeOnlyConverter.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Globalization;
+
+#if NET6_0
+namespace ServiceStack.OrmLite.Converters;
+
+public class TimeOnlyConverter : TimeSpanAsIntConverter
+{
+    public override string ToQuotedString(Type fieldType, object value)
+    {
+        return ((TimeOnly)value).Ticks.ToString(CultureInfo.InvariantCulture);
+    }
+
+    public override object ToDbValue(Type fieldType, object value)
+    {
+        var timespan = (TimeOnly)value;
+        return timespan.Ticks;
+    }
+
+    public override object FromDbValue(Type fieldType, object value)
+    {
+        var ticks = (long)this.ConvertNumber(typeof(long), value);
+        var timeSpan = TimeSpan.FromTicks(ticks);
+        return TimeOnly.FromTimeSpan(timeSpan);
+    }
+}
+
+#endif

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -122,6 +122,11 @@ protected void InitColumnTypeMap()
             RegisterConverter<TimeSpan>(new TimeSpanAsIntConverter());
             RegisterConverter<DateTime>(new DateTimeConverter());
             RegisterConverter<DateTimeOffset>(new DateTimeOffsetConverter());
+
+#if NET6_0
+            RegisterConverter<DateOnly>(new DateOnlyConverter());
+            RegisterConverter<TimeOnly>(new TimeOnlyConverter());
+#endif
         }
 
         public string GetColumnTypeDefinition(Type columnType, int? fieldLength, int? scale)

tests/ServiceStack.OrmLite.Tests/Expression/SqlExpressionTests.cs

@@ -4,8 +4,6 @@
 using System.Linq;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
-#if !NETCORE_SUPPORT
-#endif
 using ServiceStack.OrmLite.Tests.UseCase;
 using ServiceStack.Text;
 

tests/ServiceStack.OrmLite.Tests/Net6TypeTests.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Data;
+using System.Linq;
+using NUnit.Framework;
+
+#if NET6_0
+namespace ServiceStack.OrmLite.Tests;
+
+public class Net6TypeTests : OrmLiteTestBase
+{
+    private class DateOnlyObject
+    {
+        public DateOnly Test { get; set; }
+        public DateOnly? TestNullable { get; set; }
+    }
+
+    private static DateOnlyObject InsertAndSelectDateOnly(IDbConnection db, DateOnly dateTime)
+    {
+        db.DeleteAll<DateOnlyObject>();
+        db.Insert(new DateOnlyObject { Test = dateTime, TestNullable = dateTime });
+        var x = db.Select<DateOnlyObject>().First();
+        return x;
+    }
+
+    [Test]
+    public void Can_insert_and_query_DateOnly()
+    {
+        // OrmLiteUtils.PrintSql();
+        using var db = OpenDbConnection();
+        db.DropAndCreateTable<DateOnlyObject>();
+
+        DateOnly dateTime;
+        DateOnlyObject x;
+
+        dateTime = new DateOnly(2013, 1, 13);
+        x = InsertAndSelectDateOnly(db, dateTime);
+        Assert.That(x.Test, Is.EqualTo(dateTime));
+        Assert.That(x.TestNullable!.Value, Is.EqualTo(x.Test));
+        x = db.Select<DateOnlyObject>(d => d.Test == dateTime).FirstOrDefault();
+        Assert.That(x, Is.Not.Null);
+    }
+
+    private class TimeOnlyObject
+    {
+        public TimeOnly Test { get; set; }
+        public TimeOnly? TestNullable { get; set; }
+    }
+
+    private static TimeOnlyObject InsertAndSelectTimeOnly(IDbConnection db, TimeOnly timeOnly)
+    {
+        db.DeleteAll<TimeOnlyObject>();
+        db.Insert(new TimeOnlyObject { Test = timeOnly, TestNullable = timeOnly });
+        var x = db.Select<TimeOnlyObject>().First();
+        return x;
+    }
+
+    [Test]
+    public void Can_insert_and_query_TimeOnly()
+    {
+        OrmLiteUtils.PrintSql();
+        using var db = OpenDbConnection();
+        db.DropAndCreateTable<TimeOnlyObject>();
+
+        TimeOnly timeOnly;
+        TimeOnlyObject x;
+
+        timeOnly = new TimeOnly(13, 14, 15);
+        x = InsertAndSelectTimeOnly(db, timeOnly);
+        Assert.That(x.Test, Is.EqualTo(timeOnly));
+        Assert.That(x.TestNullable!.Value, Is.EqualTo(x.Test));
+        x = db.Select<TimeOnlyObject>(d => d.Test == timeOnly).FirstOrDefault();
+        Assert.That(x, Is.Not.Null);
+    }
+
+}
+
+#endif

tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj

@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETCORE;NET6_0</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>