Use correct CLR types for fields with value converters

Christian Käser · Christian Käser · commit 6fd81dc436c7 · 2019-08-19T16:10:03.000+02:00
diff --git a/FileContextCore/Serializer/BSONSerializer.cs b/FileContextCore/Serializer/BSONSerializer.cs
@@ -20,7 +20,7 @@ public BSONSerializer(IEntityType _entityType)
         {
             entityType = _entityType;
             propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();
-            typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();
+            typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();
         }
 
         public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)
diff --git a/FileContextCore/Serializer/CSVSerializer.cs b/FileContextCore/Serializer/CSVSerializer.cs
@@ -19,7 +19,7 @@ public CSVSerializer(IEntityType _entityType)
         {
             entityType = _entityType;
             propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();
-            typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();
+            typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();
         }
 
         public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)
diff --git a/FileContextCore/Serializer/EXCELSerializer.cs b/FileContextCore/Serializer/EXCELSerializer.cs
@@ -38,7 +38,7 @@ public EXCELSerializer(IEntityType _entityType, string _password, string databas
         {
             entityType = _entityType;
             propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();
-            typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();
+            typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();
             password = _password;
             this.databaseName = databaseName;
 
diff --git a/FileContextCore/Serializer/JSONSerializer.cs b/FileContextCore/Serializer/JSONSerializer.cs
@@ -17,7 +17,7 @@ public JSONSerializer(IEntityType _entityType)
         {
             entityType = _entityType;
             propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();
-            typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();
+            typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();
         }
 
         public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)
diff --git a/FileContextCore/Serializer/XMLSerializer.cs b/FileContextCore/Serializer/XMLSerializer.cs
@@ -21,7 +21,7 @@ public XMLSerializer(IEntityType _entityType)
         {
             entityType = _entityType;
             propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();
-            typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();
+            typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();
         }
 
         public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public BSONSerializer(IEntityType _entityType)`
`20`	`20`	`{`
`21`	`21`	`entityType = _entityType;`
`22`	`22`	`propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();`
`23`		`- typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();`
	`23`	`+ typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public CSVSerializer(IEntityType _entityType)`
`19`	`19`	`{`
`20`	`20`	`entityType = _entityType;`
`21`	`21`	`propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();`
`22`		`- typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();`
	`22`	`+ typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public EXCELSerializer(IEntityType _entityType, string _password, string databas`
`38`	`38`	`{`
`39`	`39`	`entityType = _entityType;`
`40`	`40`	`propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();`
`41`		`- typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();`
	`41`	`+ typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();`
`42`	`42`	`password = _password;`
`43`	`43`	`this.databaseName = databaseName;`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public JSONSerializer(IEntityType _entityType)`
`17`	`17`	`{`
`18`	`18`	`entityType = _entityType;`
`19`	`19`	`propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();`
`20`		`- typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();`
	`20`	`+ typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public XMLSerializer(IEntityType _entityType)`
`21`	`21`	`{`
`22`	`22`	`entityType = _entityType;`
`23`	`23`	`propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();`
`24`		`- typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();`
	`24`	`+ typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)`