Merge pull request #31 from linq2db/master

Release 2.0.4

Author: sdanyliv

Build/linq2db.Default.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>2.0.3</Version>
+		<Version>2.0.4</Version>
 
 		<Description>Allows to execute Linq to DB (linq2db) queries in Entity Framework Core DbContext.</Description>
 		<Title>Linq to DB (linq2db) extensions for Entity Framework Core</Title>

Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs

@@ -391,6 +391,10 @@ public virtual void DefineConvertors(
 
 			foreach (var clrType in types)
 			{
+				// skipping enums
+				if (clrType.IsEnum)
+					continue;
+
 				var currentType = mappingSchema.GetDataType(clrType);
 				if (currentType != SqlDataType.Undefined)
 					continue;

Tests/LinqToDB.EntityFrameworkCore.Tests/JsonConverTests.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using LinqToDB.Data;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
@@ -24,9 +25,17 @@ public class EventScheduleItemBase
 			public int Id { get; set; }
 			public virtual LocalizedString NameLocalized { get; set; }
 		}
+		
+		public enum CrashEnum : byte
+		{
+			OneValue = 0,
+			OtherValue = 1
+		}
 
 		public class EventScheduleItem : EventScheduleItemBase
 		{
+			public CrashEnum CrashEnum { get; set; }
+			public Guid GuidColumn { get; set; }
 		}
 
 		public class JsonConvertContext : DbContext
@@ -58,6 +67,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 						.HasColumnName("NameLocalized_JSON")
 						.HasConversion(v => JsonConvert.SerializeObject(v),
 							v => JsonConvert.DeserializeObject<LocalizedString>(v));
+					entity.Property(e => e.CrashEnum).HasColumnType("tinyint");
+					entity.Property(e => e.GuidColumn).HasColumnType("uniqueidentifier");
 				});
 			}
 		}
@@ -86,13 +97,15 @@ public void TestJsonConvert()
 
 			using (var ctx = new JsonConvertContext(_options))
 			{
+				ctx.Database.EnsureDeleted();
 				ctx.Database.EnsureCreated();
 
 				ctx.EventScheduleItems.Delete();
 
 				ctx.EventScheduleItems.Add(new EventScheduleItem()
 				{
-					NameLocalized = new LocalizedString() { English = "English", German = "German", Slovak = "Slovak" }
+					NameLocalized = new LocalizedString() { English = "English", German = "German", Slovak = "Slovak" },
+					GuidColumn = Guid.NewGuid()
 				});
 				ctx.SaveChanges();
 
@@ -103,7 +116,9 @@ public void TestJsonConvert()
 					.Select(p => new
 					{
 						p.Id,
-						p.NameLocalized
+						p.NameLocalized,
+						p.CrashEnum,
+						p.GuidColumn
 					}).FirstOrDefault();
 
 				Assert.That(item.NameLocalized.English, Is.EqualTo("English"));

azure-pipelines.yml

@@ -1,8 +1,8 @@
 variables:
   solution: 'linq2db.EFCore.sln'
   build_configuration: 'Release'
-  assemblyVersion: 2.0.3
-  nugetVersion: 2.0.3
+  assemblyVersion: 2.0.4
+  nugetVersion: 2.0.4
   artifact_nugets: 'nugets'
 
 # build on commits to important branches (master + release branches):