Remove typed modify extension methods in favor of typed builders
This commit is contained in:
root
@@ -7526,135 +7526,6 @@ namespace DynamORM
|
||||
return builder.Join(on, alias, DynamicJoinType.Full);
|
||||
}
|
||||
}
|
||||
/// <summary>Typed helper extensions for update/insert/delete fluent APIs.</summary>
|
||||
public static class TypedModifyExtensions
|
||||
{
|
||||
/// <summary>Add typed where predicate (AND-composed comparisons) for update builder.</summary>
|
||||
public static IDynamicUpdateQueryBuilder WhereTyped<T>(this IDynamicUpdateQueryBuilder builder, Expression<Func<T, bool>> predicate)
|
||||
{
|
||||
AddTypedWhere(builder, predicate == null ? null : predicate.Body);
|
||||
return builder;
|
||||
}
|
||||
/// <summary>Add typed where predicate (AND-composed comparisons) for delete builder.</summary>
|
||||
public static IDynamicDeleteQueryBuilder WhereTyped<T>(this IDynamicDeleteQueryBuilder builder, Expression<Func<T, bool>> predicate)
|
||||
{
|
||||
AddTypedWhere(builder, predicate == null ? null : predicate.Body);
|
||||
return builder;
|
||||
}
|
||||
/// <summary>Add typed value assignment for update builder.</summary>
|
||||
public static IDynamicUpdateQueryBuilder SetTyped<T, TValue>(this IDynamicUpdateQueryBuilder builder, Expression<Func<T, TValue>> selector, object value)
|
||||
{
|
||||
string col = GetColumnName(typeof(T), selector == null ? null : selector.Body);
|
||||
return builder.Values(col, value);
|
||||
}
|
||||
/// <summary>Add typed value assignment for insert builder.</summary>
|
||||
public static IDynamicInsertQueryBuilder InsertTyped<T, TValue>(this IDynamicInsertQueryBuilder builder, Expression<Func<T, TValue>> selector, object value)
|
||||
{
|
||||
string col = GetColumnName(typeof(T), selector == null ? null : selector.Body);
|
||||
return builder.Insert(col, value);
|
||||
}
|
||||
/// <summary>Insert mapped object with compile-time type information.</summary>
|
||||
public static IDynamicInsertQueryBuilder InsertTyped<T>(this IDynamicInsertQueryBuilder builder, T value) where T : class
|
||||
{
|
||||
return builder.Insert(value);
|
||||
}
|
||||
/// <summary>Update mapped object with compile-time type information.</summary>
|
||||
public static IDynamicUpdateQueryBuilder UpdateTyped<T>(this IDynamicUpdateQueryBuilder builder, T value) where T : class
|
||||
{
|
||||
return builder.Update(value);
|
||||
}
|
||||
private static void AddTypedWhere(dynamic builder, Expression expression)
|
||||
{
|
||||
if (expression == null)
|
||||
throw new ArgumentNullException("predicate");
|
||||
|
||||
expression = UnwrapConvert(expression);
|
||||
BinaryExpression be = expression as BinaryExpression;
|
||||
|
||||
if (be != null && (be.NodeType == ExpressionType.AndAlso || be.NodeType == ExpressionType.And))
|
||||
{
|
||||
AddTypedWhere(builder, be.Left);
|
||||
AddTypedWhere(builder, be.Right);
|
||||
return;
|
||||
}
|
||||
if (be != null)
|
||||
{
|
||||
string col = GetColumnName(GetRootParameterType(be.Left), be.Left);
|
||||
object val = EvaluateExpression(be.Right);
|
||||
|
||||
switch (be.NodeType)
|
||||
{
|
||||
case ExpressionType.Equal:
|
||||
builder.Where(col, DynamicColumn.CompareOperator.Eq, val);
|
||||
return;
|
||||
case ExpressionType.NotEqual:
|
||||
builder.Where(col, DynamicColumn.CompareOperator.Not, val);
|
||||
return;
|
||||
case ExpressionType.GreaterThan:
|
||||
builder.Where(col, DynamicColumn.CompareOperator.Gt, val);
|
||||
return;
|
||||
case ExpressionType.GreaterThanOrEqual:
|
||||
builder.Where(col, DynamicColumn.CompareOperator.Gte, val);
|
||||
return;
|
||||
case ExpressionType.LessThan:
|
||||
builder.Where(col, DynamicColumn.CompareOperator.Lt, val);
|
||||
return;
|
||||
case ExpressionType.LessThanOrEqual:
|
||||
builder.Where(col, DynamicColumn.CompareOperator.Lte, val);
|
||||
return;
|
||||
}
|
||||
}
|
||||
throw new NotSupportedException(string.Format("Typed where expression is currently limited to AND-composed binary comparisons: {0}", expression));
|
||||
}
|
||||
private static Type GetRootParameterType(Expression expression)
|
||||
{
|
||||
expression = UnwrapConvert(expression);
|
||||
MemberExpression m = expression as MemberExpression;
|
||||
if (m != null && m.Expression is ParameterExpression)
|
||||
return ((ParameterExpression)m.Expression).Type;
|
||||
|
||||
throw new NotSupportedException(string.Format("Unsupported typed selector: {0}", expression));
|
||||
}
|
||||
private static string GetColumnName(Type modelType, Expression expression)
|
||||
{
|
||||
if (modelType == null)
|
||||
modelType = GetRootParameterType(expression);
|
||||
|
||||
expression = UnwrapConvert(expression);
|
||||
MemberExpression member = expression as MemberExpression;
|
||||
if (member == null)
|
||||
throw new NotSupportedException(string.Format("Selector must target a mapped property: {0}", expression));
|
||||
|
||||
DynamicTypeMap mapper = DynamicMapperCache.GetMapper(modelType);
|
||||
if (mapper == null)
|
||||
throw new InvalidOperationException(string.Format("Cant assign unmapable type as a table ({0}).", modelType.FullName));
|
||||
|
||||
string col = mapper.PropertyMap.TryGetValue(member.Member.Name)
|
||||
?? mapper.PropertyMap
|
||||
.Where(x => string.Equals(x.Key, member.Member.Name, StringComparison.OrdinalIgnoreCase))
|
||||
.Select(x => x.Value)
|
||||
.FirstOrDefault()
|
||||
?? member.Member.Name;
|
||||
|
||||
return col;
|
||||
}
|
||||
private static Expression UnwrapConvert(Expression expression)
|
||||
{
|
||||
while (expression is UnaryExpression &&
|
||||
(((UnaryExpression)expression).NodeType == ExpressionType.Convert ||
|
||||
((UnaryExpression)expression).NodeType == ExpressionType.ConvertChecked))
|
||||
expression = ((UnaryExpression)expression).Operand;
|
||||
|
||||
return expression;
|
||||
}
|
||||
private static object EvaluateExpression(Expression expression)
|
||||
{
|
||||
expression = UnwrapConvert(expression);
|
||||
var objectMember = Expression.Convert(expression, typeof(object));
|
||||
var getter = Expression.Lambda<Func<object>>(objectMember).Compile();
|
||||
return getter();
|
||||
}
|
||||
}
|
||||
namespace Extensions
|
||||
{
|
||||
internal static class DynamicHavingQueryExtensions
|
||||
@@ -10679,7 +10550,7 @@ namespace DynamORM
|
||||
}
|
||||
public IDynamicTypedDeleteQueryBuilder<T> Where(Expression<Func<T, bool>> predicate)
|
||||
{
|
||||
this.WhereTyped(predicate);
|
||||
TypedModifyHelper.ApplyWhere<T>((c, o, v) => base.Where(c, o, v), predicate);
|
||||
return this;
|
||||
}
|
||||
public new IDynamicTypedDeleteQueryBuilder<T> Where(Func<dynamic, object> func)
|
||||
@@ -10718,7 +10589,7 @@ namespace DynamORM
|
||||
}
|
||||
public IDynamicTypedInsertQueryBuilder<T> Insert<TValue>(Expression<Func<T, TValue>> selector, object value)
|
||||
{
|
||||
this.InsertTyped(selector, value);
|
||||
base.Insert(TypedModifyHelper.GetMappedColumn(selector), value);
|
||||
return this;
|
||||
}
|
||||
public IDynamicTypedInsertQueryBuilder<T> Insert(T value)
|
||||
@@ -11290,12 +11161,12 @@ namespace DynamORM
|
||||
}
|
||||
public IDynamicTypedUpdateQueryBuilder<T> Where(Expression<Func<T, bool>> predicate)
|
||||
{
|
||||
this.WhereTyped(predicate);
|
||||
TypedModifyHelper.ApplyWhere<T>((c, o, v) => base.Where(c, o, v), predicate);
|
||||
return this;
|
||||
}
|
||||
public IDynamicTypedUpdateQueryBuilder<T> Set<TValue>(Expression<Func<T, TValue>> selector, object value)
|
||||
{
|
||||
this.SetTyped(selector, value);
|
||||
base.Values(TypedModifyHelper.GetMappedColumn(selector), value);
|
||||
return this;
|
||||
}
|
||||
public IDynamicTypedUpdateQueryBuilder<T> Values(T value)
|
||||
@@ -11634,6 +11505,99 @@ namespace DynamORM
|
||||
}
|
||||
#endregion IExtendedDisposable
|
||||
}
|
||||
/// <summary>Helper methods for typed modify builders.</summary>
|
||||
internal static class TypedModifyHelper
|
||||
{
|
||||
public static string GetMappedColumn<T, TValue>(Expression<Func<T, TValue>> selector)
|
||||
{
|
||||
if (selector == null)
|
||||
throw new ArgumentNullException("selector");
|
||||
|
||||
return GetMappedColumn(typeof(T), selector.Body);
|
||||
}
|
||||
public static void ApplyWhere<T>(Action<string, DynamicColumn.CompareOperator, object> addCondition, Expression<Func<T, bool>> predicate)
|
||||
{
|
||||
if (addCondition == null)
|
||||
throw new ArgumentNullException("addCondition");
|
||||
if (predicate == null)
|
||||
throw new ArgumentNullException("predicate");
|
||||
|
||||
ApplyWhereInternal(typeof(T), addCondition, predicate.Body);
|
||||
}
|
||||
private static void ApplyWhereInternal(Type modelType, Action<string, DynamicColumn.CompareOperator, object> addCondition, Expression expression)
|
||||
{
|
||||
expression = UnwrapConvert(expression);
|
||||
BinaryExpression be = expression as BinaryExpression;
|
||||
if (be == null)
|
||||
throw new NotSupportedException(string.Format("Typed where expression is currently limited to AND-composed binary comparisons: {0}", expression));
|
||||
|
||||
if (be.NodeType == ExpressionType.AndAlso || be.NodeType == ExpressionType.And)
|
||||
{
|
||||
ApplyWhereInternal(modelType, addCondition, be.Left);
|
||||
ApplyWhereInternal(modelType, addCondition, be.Right);
|
||||
return;
|
||||
}
|
||||
string col = GetMappedColumn(modelType, be.Left);
|
||||
object val = EvaluateExpression(be.Right);
|
||||
|
||||
switch (be.NodeType)
|
||||
{
|
||||
case ExpressionType.Equal:
|
||||
addCondition(col, DynamicColumn.CompareOperator.Eq, val);
|
||||
return;
|
||||
case ExpressionType.NotEqual:
|
||||
addCondition(col, DynamicColumn.CompareOperator.Not, val);
|
||||
return;
|
||||
case ExpressionType.GreaterThan:
|
||||
addCondition(col, DynamicColumn.CompareOperator.Gt, val);
|
||||
return;
|
||||
case ExpressionType.GreaterThanOrEqual:
|
||||
addCondition(col, DynamicColumn.CompareOperator.Gte, val);
|
||||
return;
|
||||
case ExpressionType.LessThan:
|
||||
addCondition(col, DynamicColumn.CompareOperator.Lt, val);
|
||||
return;
|
||||
case ExpressionType.LessThanOrEqual:
|
||||
addCondition(col, DynamicColumn.CompareOperator.Lte, val);
|
||||
return;
|
||||
}
|
||||
throw new NotSupportedException(string.Format("Typed where expression is currently limited to AND-composed binary comparisons: {0}", expression));
|
||||
}
|
||||
private static string GetMappedColumn(Type modelType, Expression expression)
|
||||
{
|
||||
expression = UnwrapConvert(expression);
|
||||
MemberExpression member = expression as MemberExpression;
|
||||
if (member == null)
|
||||
throw new NotSupportedException(string.Format("Selector must target a mapped property: {0}", expression));
|
||||
|
||||
DynamicTypeMap mapper = DynamicMapperCache.GetMapper(modelType);
|
||||
if (mapper == null)
|
||||
throw new InvalidOperationException(string.Format("Cant assign unmapable type as a table ({0}).", modelType.FullName));
|
||||
|
||||
return mapper.PropertyMap.TryGetValue(member.Member.Name)
|
||||
?? mapper.PropertyMap
|
||||
.Where(x => string.Equals(x.Key, member.Member.Name, StringComparison.OrdinalIgnoreCase))
|
||||
.Select(x => x.Value)
|
||||
.FirstOrDefault()
|
||||
?? member.Member.Name;
|
||||
}
|
||||
private static Expression UnwrapConvert(Expression expression)
|
||||
{
|
||||
while (expression is UnaryExpression &&
|
||||
(((UnaryExpression)expression).NodeType == ExpressionType.Convert ||
|
||||
((UnaryExpression)expression).NodeType == ExpressionType.ConvertChecked))
|
||||
expression = ((UnaryExpression)expression).Operand;
|
||||
|
||||
return expression;
|
||||
}
|
||||
private static object EvaluateExpression(Expression expression)
|
||||
{
|
||||
expression = UnwrapConvert(expression);
|
||||
var objectMember = Expression.Convert(expression, typeof(object));
|
||||
var getter = Expression.Lambda<Func<object>>(objectMember).Compile();
|
||||
return getter();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
namespace Helpers
|
||||
|
||||
Reference in New Issue
Block a user