RUSSEK-Software/DynamORM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
grzegorz.russek
2021-04-22 13:22:47 +00:00
parent 7ce3a00613
commit 68a81020e4
8 changed files with 104 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
AmalgamationTool/DynamORM.Amalgamation.cs
View File

@@ -2983,7 +2983,7 @@ namespace DynamORM
{
schema = ReadSchema(tableName, owner)
.Where(x => x.Name != null)
.DistinctBy(x => x.Name)
.DistinctBy(x => x.Name.ToLower())
.ToDictionary(k => k.Name.ToLower(), k => k);
Schema[tableName.ToLower()] = schema;
@@ -13538,10 +13538,16 @@ namespace DynamORM
}
else if (Type == typeof(string) && val.GetType() == typeof(Guid))
return val.ToString();
else if (Type == typeof(Guid) && val.GetType() == typeof(string))
else if (Type == typeof(Guid))
{
Guid g;
return Guid.TryParse((string)val, out g) ? g : Guid.Empty;
if (val.GetType() == typeof(byte[]))
return new Guid((byte[])val);
else if (val.GetType() == typeof(string))
{
Guid g;
return Guid.TryParse((string)val, out g) ? g : Guid.Empty;
}
else return (nullable) ? null : (object)Guid.Empty;
}
else if (!typeof(IConvertible).IsAssignableFrom(type) && (IsDataContract || (!type.IsValueType && val is IDictionary<string, object>)))
return val.Map(type);
@@ -13995,10 +14001,10 @@ namespace DynamORM
{
MakeQueryWhere(mapper, query);
bool any = false;
if (_changedFields.Any())
{
bool any = false;
foreach (var cf in _changedFields)
{
var cn = mapper.PropertyMap[cf.Key];
@@ -14018,12 +14024,32 @@ namespace DynamORM
query.Values(cn, cf.Value);
any = true;
}
if (!any)
query.Set(x => this);
}
else
query.Set(x => this);
if (!any)
foreach (var pmk in mapper.ColumnsMap)
{
var pm = pmk.Value;
var val = pm.Get(this);
var cn = pm.Name;
if (pm.Ignore)
continue;
if (pm.Column != null)
{
if (!string.IsNullOrEmpty(pm.Column.Name))
cn = pm.Column.Name;
if (pm.Column.IsKey)
continue;
if (!pm.Column.AllowNull && val == null)
continue;
}
query.Values(cn, val);
}
if (query.Execute() == 0)
return false;

2
DynamORM.Core/DynamORM.Core.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Description>Dynamic Object-Relational Mapping library.</Description>
<Copyright>Copyright © RUSSEK Software 2012-2019</Copyright>
<Company>RUSSEK Software</Company>

2
DynamORM.Tests/DynamORM.Tests.csproj
View File

@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DynamORM.Tests</RootNamespace>
<AssemblyName>DynamORM.Tests</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>

2
DynamORM.Tests/Properties/Resources.Designer.cs generated
View File

@@ -19,7 +19,7 @@ namespace DynamORM.Tests.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {

2
DynamORM/DynamicDatabase.cs
View File

@@ -1524,7 +1524,7 @@ namespace DynamORM
{
schema = ReadSchema(tableName, owner)
.Where(x => x.Name != null)
.DistinctBy(x => x.Name)
.DistinctBy(x => x.Name.ToLower())
.ToDictionary(k => k.Name.ToLower(), k => k);
Schema[tableName.ToLower()] = schema;

29
DynamORM/Helpers/FrameworkTools.cs
View File

@@ -67,10 +67,27 @@ namespace DynamORM.Helpers
{
ParameterExpression param = Expression.Parameter(typeof(InvokeMemberBinder), "o");
try
{
return Expression.Lambda<Func<InvokeMemberBinder, IList<Type>>>(
Expression.TypeAs(
Expression.Field(
Expression.TypeAs(param, binderType), "typeArguments"),
typeof(IList<Type>)), param).Compile();
}
catch
{
}
PropertyInfo prop = binderType.GetProperty("TypeArguments");
if (!prop.CanRead)
return null;
return Expression.Lambda<Func<InvokeMemberBinder, IList<Type>>>(
Expression.TypeAs(
Expression.Field(
Expression.TypeAs(param, binderType), "typeArguments"),
Expression.Property(
Expression.TypeAs(param, binderType), prop.Name),
typeof(IList<Type>)), param).Compile();
}
}
@@ -127,6 +144,14 @@ namespace DynamORM.Helpers
// If this was a success get and return it's value
if (field != null)
return field.GetValue(binder) as IList<Type>;
else
{
PropertyInfo prop = binder.GetType().GetProperty("TypeArguments");
// If we have a property, return it's value
if (prop != null)
return prop.GetValue(binder, null) as IList<Type>;
}
}
else
{

12
DynamORM/Mapper/DynamicPropertyInvoker.cs
View File

@@ -234,10 +234,16 @@ namespace DynamORM.Mapper
}
else if (Type == typeof(string) && val.GetType() == typeof(Guid))
return val.ToString();
else if (Type == typeof(Guid) && val.GetType() == typeof(string))
else if (Type == typeof(Guid))
{
Guid g;
return Guid.TryParse((string)val, out g) ? g : Guid.Empty;
if (val.GetType() == typeof(byte[]))
return new Guid((byte[])val);
else if (val.GetType() == typeof(string))
{
Guid g;
return Guid.TryParse((string)val, out g) ? g : Guid.Empty;
}
else return (nullable) ? null : (object)Guid.Empty;
}
else if (!typeof(IConvertible).IsAssignableFrom(type) && (IsDataContract || (!type.IsValueType && val is IDictionary<string, object>)))
return val.Map(type);

35
DynamORM/Objects/DynamicEntityBase.cs
View File

@@ -126,13 +126,12 @@ namespace DynamORM.Objects
var mapper = DynamicMapperCache.GetMapper(t);
using (var query = db.Update(t))
{
MakeQueryWhere(mapper, query);
bool any = false;
if (_changedFields.Any())
{
bool any = false;
foreach (var cf in _changedFields)
{
var cn = mapper.PropertyMap[cf.Key];
@@ -152,12 +151,32 @@ namespace DynamORM.Objects
query.Values(cn, cf.Value);
any = true;
}
if (!any)
query.Set(x => this);
}
else
query.Set(x => this);
if (!any)
foreach (var pmk in mapper.ColumnsMap)
{
var pm = pmk.Value;
var val = pm.Get(this);
var cn = pm.Name;
if (pm.Ignore)
continue;
if (pm.Column != null)
{
if (!string.IsNullOrEmpty(pm.Column.Name))
cn = pm.Column.Name;
if (pm.Column.IsKey)
continue;
if (!pm.Column.AllowNull && val == null)
continue;
}
query.Values(cn, val);
}
if (query.Execute() == 0)
return false;