fixed datacontract and datamember behavior

morrisjdev · morrisjdev · commit ba0119743971 · 2017-05-27T13:14:33.000+02:00
diff --git a/src/Example/Data/Context.cs b/src/Example/Data/Context.cs
@@ -18,10 +18,12 @@ public class Context : DbContext
 
         public DbSet<Messurement> Messurements { get; set; }
 
+        public DbSet<GenericTest<int>> Generics { get; set; }
+
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             //Default: JSON-Serialize
-            //optionsBuilder.UseFileContext();
+            optionsBuilder.UseFileContext();
 
             //JSON-Serialize + simple Encryption
             //optionsBuilder.UseFileContext(new FileContextCore.Serializer.JSONSerializer(), new FileContextCore.FileManager.EncryptedFileManager());
@@ -33,7 +35,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
             //optionsBuilder.UseFileContext(new FileContextCore.Serializer.CSVSerializer());
 
             //Excel
-            optionsBuilder.UseFileContext(new FileContextCore.CombinedManager.ExcelManager());
+            //optionsBuilder.UseFileContext(new FileContextCore.CombinedManager.ExcelManager());
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
diff --git a/src/Example/Data/Entities/GenericTest.cs b/src/Example/Data/Entities/GenericTest.cs
@@ -0,0 +1,12 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Example.Data.Entities
+{
+    public class GenericTest<T> : Base
+    {
+        public T Value { get; set; }
+
+    }
+}
diff --git a/src/Example/Data/Entities/User.cs b/src/Example/Data/Entities/User.cs
@@ -1,12 +1,15 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Threading.Tasks;
 
 namespace Example.Data.Entities
 {
+    [DataContract]
     public class User : Base
     {
+        [DataMember]
         public string Username { get; set; }
 
         public string Name { get; set; }
diff --git a/src/Example/Program.cs b/src/Example/Program.cs
@@ -78,6 +78,21 @@ public static void Main(string[] args)
             db.Messurements.Add(current);
             db.SaveChanges();
 
+            db.Generics.Add(new GenericTest<int>()
+            {
+                Value = 1
+            });
+
+            db.Generics.Add(new GenericTest<int>()
+            {
+                Value = 2
+            });
+
+
+            db.SaveChanges();
+
+            Console.WriteLine(db.Generics.Count());
+
             while (true)
             {
                 string result = Console.ReadLine();
diff --git a/src/FileContextCore/CombinedManager/ExcelManager.cs b/src/FileContextCore/CombinedManager/ExcelManager.cs
@@ -10,6 +10,9 @@
 
 namespace FileContextCore.CombinedManager
 {
+    /// <summary>
+    /// Used to read and write data of FileContext into Excel-Files (.xlsx)
+    /// </summary>
     public class ExcelManager : ICombinedManager
     {
         private string password = "";
diff --git a/src/FileContextCore/Extensions/FileContextServiceCollectionExtensions.cs b/src/FileContextCore/Extensions/FileContextServiceCollectionExtensions.cs
@@ -25,7 +25,6 @@ public static IServiceCollection AddEntityFrameworkFileContext(this IServiceColl
                 .Singleton<IDatabaseProvider, DatabaseProvider<FileContextProviderServices, FileContextOptionsExtension>>());
 
             services.TryAdd(new ServiceCollection()
-                //.AddSingleton<FileContextCache>()
                 .AddSingleton<FileContextModelSource>()
                 .AddSingleton<FileValueGeneratorCache>()
                 .AddScoped<FileContextValueGeneratorSelector>()
diff --git a/src/FileContextCore/FileContextCore.csproj b/src/FileContextCore/FileContextCore.csproj
@@ -19,16 +19,16 @@
     <RepositoryUrl>https://github.com/morrisjdev/FileContextCore</RepositoryUrl>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <Version>1.0.7</Version>
+    <Version>1.0.8</Version>
     <PackageTags>ef, database, file, db, filedb, json, xml, csv, xlsx, excel, dbcontext, entity framework</PackageTags>
     <PackageIconUrl>https://morrisj.net/img/morrisjdev_logo.png</PackageIconUrl>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="2.16.3" />
-    <PackageReference Include="EPPlus.Core" Version="1.3.1" />
+    <PackageReference Include="EPPlus.Core" Version="1.3.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
   </ItemGroup>
 
diff --git a/src/FileContextCore/Helper/QueryHelper.cs b/src/FileContextCore/Helper/QueryHelper.cs
@@ -4,6 +4,7 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.Storage;
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/FileContextCore/Properties/PublishProfiles/FolderProfile5.pubxml b/src/FileContextCore/Properties/PublishProfiles/FolderProfile5.pubxml
@@ -0,0 +1,13 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>Release</Configuration>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <PublishDir>bin\Release\PublishOutput</PublishDir>
+  </PropertyGroup>
+</Project>
diff --git a/src/FileContextCore/Query/ExpressionVisitors/FileContextEntityQueryableExpressionVisitor.cs b/src/FileContextCore/Query/ExpressionVisitors/FileContextEntityQueryableExpressionVisitor.cs
@@ -20,6 +20,7 @@
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Query.ExpressionVisitors.Internal;
 using Microsoft.EntityFrameworkCore.Query.Internal;
+using Microsoft.EntityFrameworkCore.Storage;
 
 namespace FileContextCore.Query.ExpressionVisitors
 {
@@ -28,7 +29,7 @@ class FileContextEntityQueryableExpressionVisitor : EntityQueryableExpressionVis
         private EntityQueryModelVisitor queryModelVisitor;
         private IQuerySource querySource;
 
-        public FileContextEntityQueryableExpressionVisitor(EntityQueryModelVisitor _queryModelVisitor, IQuerySource _querySource) : base(_queryModelVisitor)
+        public FileContextEntityQueryableExpressionVisitor(EntityQueryModelVisitor _queryModelVisitor, IQuerySource _querySource/*, IModel _model, IMaterializerFactory _materializerFactory*/) : base(_queryModelVisitor)
         {
             queryModelVisitor = _queryModelVisitor;
             querySource = _querySource;
diff --git a/src/FileContextCore/Query/ExpressionVisitors/FileContextEntityQueryableExpressionVisitorFactory.cs b/src/FileContextCore/Query/ExpressionVisitors/FileContextEntityQueryableExpressionVisitorFactory.cs
@@ -19,6 +19,6 @@ public FileContextEntityQueryableExpressionVisitorFactory()
 
         }
 
-        public ExpressionVisitor Create(EntityQueryModelVisitor queryModelVisitor, IQuerySource querySource) => new FileContextEntityQueryableExpressionVisitor(queryModelVisitor, querySource);
+        public ExpressionVisitor Create(EntityQueryModelVisitor queryModelVisitor, IQuerySource querySource) => new FileContextEntityQueryableExpressionVisitor(queryModelVisitor, querySource/*, model, materializerFactory*/);
     }
 }
diff --git a/src/FileContextCore/Query/FileContextMaterializerFactory.cs b/src/FileContextCore/Query/FileContextMaterializerFactory.cs
@@ -0,0 +1,78 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Query.Internal;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System.Linq;
+
+namespace FileContextCore.Query
+{
+    class FileContextMaterializerFactory : IMaterializerFactory
+    {
+        private IEntityMaterializerSource entityMaterializerSource;
+
+        public FileContextMaterializerFactory(IEntityMaterializerSource _entityMaterializerSource)
+        {
+            entityMaterializerSource = _entityMaterializerSource;
+        }
+
+        public virtual Expression<Func<IEntityType, ValueBuffer, object>> CreateMaterializer(IEntityType entityType)
+        {
+            ParameterExpression entityTypeParameter = Expression.Parameter(typeof(IEntityType), "entityType");
+
+            ParameterExpression valueBufferParameter = Expression.Parameter(typeof(ValueBuffer), "valueBuffer");
+
+            List<IEntityType> concreteEntityTypes = entityType.GetConcreteTypesInHierarchy().ToList();
+
+            if (concreteEntityTypes.Count == 1)
+            {
+                return Expression.Lambda<Func<IEntityType, ValueBuffer, object>>(
+                    entityMaterializerSource
+                        .CreateMaterializeExpression(
+                            concreteEntityTypes[0], valueBufferParameter),
+                    entityTypeParameter,
+                    valueBufferParameter);
+            }
+
+            LabelTarget returnLabelTarget = Expression.Label(typeof(object));
+
+            Expression[] blockExpressions = new Expression[]
+                {
+                    Expression.IfThen(
+                        Expression.Equal(
+                            entityTypeParameter,
+                            Expression.Constant(concreteEntityTypes[0])),
+                        Expression.Return(
+                            returnLabelTarget,
+                            entityMaterializerSource
+                                .CreateMaterializeExpression(
+                                    concreteEntityTypes[0], valueBufferParameter))),
+                    Expression.Label(
+                        returnLabelTarget,
+                        Expression.Default(returnLabelTarget.Type))
+                };
+
+            foreach (var concreteEntityType in concreteEntityTypes.Skip(1))
+            {
+                blockExpressions[0]
+                    = Expression.IfThenElse(
+                        Expression.Equal(
+                            entityTypeParameter,
+                            Expression.Constant(concreteEntityType)),
+                        Expression.Return(
+                            returnLabelTarget,
+                            entityMaterializerSource
+                                .CreateMaterializeExpression(concreteEntityType, valueBufferParameter)),
+                        blockExpressions[0]);
+            }
+
+            return Expression.Lambda<Func<IEntityType, ValueBuffer, object>>(
+                Expression.Block(blockExpressions),
+                entityTypeParameter,
+                valueBufferParameter);
+        }
+    }
+}
diff --git a/src/FileContextCore/Query/IMaterializerFactory.cs b/src/FileContextCore/Query/IMaterializerFactory.cs
@@ -0,0 +1,14 @@
+﻿using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+
+namespace FileContextCore.Query
+{
+    interface IMaterializerFactory
+    {
+        Expression<Func<IEntityType, ValueBuffer, object>> CreateMaterializer(IEntityType entityType);
+    }
+}
diff --git a/src/FileContextCore/Serializer/JSONSerializer.cs b/src/FileContextCore/Serializer/JSONSerializer.cs
@@ -53,7 +53,9 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
             JsonProperty prop = base.CreateProperty(member, memberSerialization);
             PropertyInfo propInfo = (PropertyInfo)member;
 
-            if(propInfo != null)
+            prop.Ignored = false;
+
+            if (propInfo != null)
             {
                 if(propInfo.GetMethod.IsVirtual && !propInfo.GetMethod.IsFinal)
                 {

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,15 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
	`4`	`+using System.Runtime.Serialization;`
`4`	`5`	`using System.Threading.Tasks;`
`5`	`6`
`6`	`7`	`namespace Example.Data.Entities`
`7`	`8`	`{`
	`9`	`+ [DataContract]`
`8`	`10`	`public class User : Base`
`9`	`11`	`{`
	`12`	`+ [DataMember]`
`10`	`13`	`public string Username { get; set; }`
`11`	`14`
`12`	`15`	`public string Name { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@`
`10`	`10`
`11`	`11`	`namespace FileContextCore.CombinedManager`
`12`	`12`	`{`
	`13`	`+ /// <summary>`
	`14`	`+ /// Used to read and write data of FileContext into Excel-Files (.xlsx)`
	`15`	`+ /// </summary>`
`13`	`16`	`public class ExcelManager : ICombinedManager`
`14`	`17`	`{`
`15`	`18`	`private string password = "";`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`using Microsoft.EntityFrameworkCore.Metadata.Internal;`
`21`	`21`	`using Microsoft.EntityFrameworkCore.Query.ExpressionVisitors.Internal;`
`22`	`22`	`using Microsoft.EntityFrameworkCore.Query.Internal;`
	`23`	`+using Microsoft.EntityFrameworkCore.Storage;`
`23`	`24`
`24`	`25`	`namespace FileContextCore.Query.ExpressionVisitors`
`25`	`26`	`{`
`@@ -28,7 +29,7 @@ class FileContextEntityQueryableExpressionVisitor : EntityQueryableExpressionVis`
`28`	`29`	`private EntityQueryModelVisitor queryModelVisitor;`
`29`	`30`	`private IQuerySource querySource;`
`30`	`31`
`31`		`- public FileContextEntityQueryableExpressionVisitor(EntityQueryModelVisitor _queryModelVisitor, IQuerySource _querySource) : base(_queryModelVisitor)`
	`32`	`+ public FileContextEntityQueryableExpressionVisitor(EntityQueryModelVisitor _queryModelVisitor, IQuerySource _querySource/, IModel _model, IMaterializerFactory _materializerFactory/) : base(_queryModelVisitor)`
`32`	`33`	`{`
`33`	`34`	`queryModelVisitor = _queryModelVisitor;`
`34`	`35`	`querySource = _querySource;`