Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make SqlExpressionFactory.ApplyTypeMapping virtual #16550

Merged
merged 1 commit into from
Jul 10, 2019
Merged

Make SqlExpressionFactory.ApplyTypeMapping virtual #16550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 51 additions & 143 deletions src/EFCore.Relational/Query/Pipeline/SqlExpressionFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,53 +25,30 @@ public SqlExpressionFactory(IRelationalTypeMappingSource typeMappingSource)
}

public SqlExpression ApplyDefaultTypeMapping(SqlExpression sqlExpression)
{
if (sqlExpression == null
|| sqlExpression.TypeMapping != null)
{
return sqlExpression;
}
=> sqlExpression == null || sqlExpression.TypeMapping != null
? sqlExpression
: ApplyTypeMapping(sqlExpression, _typeMappingSource.FindMapping(sqlExpression.Type));

return ApplyTypeMapping(sqlExpression, _typeMappingSource.FindMapping(sqlExpression.Type));
}

public SqlExpression ApplyTypeMapping(SqlExpression sqlExpression, RelationalTypeMapping typeMapping)
public virtual SqlExpression ApplyTypeMapping(SqlExpression sqlExpression, RelationalTypeMapping typeMapping)
{
if (sqlExpression == null
|| sqlExpression.TypeMapping != null)
{
return sqlExpression;
}

switch (sqlExpression)
return sqlExpression switch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a side note:
We have no consensus on if we want to use switch expression everywhere. In certain cases, it seems useful but in other cases it also hinders readability. It will show up in design meeting at some point.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, no problem. I also don't think using them everywhere is a good idea - it's a case-by-case thing. Feel free to reject changes if you feel they're detrimental.

/cc @ajcvickers

{
case CaseExpression caseExpression:
return ApplyTypeMappingOnCase(caseExpression, typeMapping);

case LikeExpression likeExpression:
return ApplyTypeMappingOnLike(likeExpression);

case SqlBinaryExpression sqlBinaryExpression:
return ApplyTypeMappingOnSqlBinary(sqlBinaryExpression, typeMapping);

case SqlUnaryExpression sqlUnaryExpression:
return ApplyTypeMappingOnSqlUnary(sqlUnaryExpression, typeMapping);

case SqlConstantExpression sqlConstantExpression:
return sqlConstantExpression.ApplyTypeMapping(typeMapping);

case SqlFragmentExpression sqlFragmentExpression:
return sqlFragmentExpression;

case SqlFunctionExpression sqlFunctionExpression:
return sqlFunctionExpression.ApplyTypeMapping(typeMapping);

case SqlParameterExpression sqlParameterExpression:
return sqlParameterExpression.ApplyTypeMapping(typeMapping);

default:
return sqlExpression;
}
CaseExpression e => ApplyTypeMappingOnCase(e, typeMapping),
LikeExpression e => ApplyTypeMappingOnLike(e),
SqlBinaryExpression e => ApplyTypeMappingOnSqlBinary(e, typeMapping),
SqlUnaryExpression e => ApplyTypeMappingOnSqlUnary(e, typeMapping),
SqlConstantExpression e => e.ApplyTypeMapping(typeMapping),
SqlFragmentExpression e => e,
SqlFunctionExpression e => e.ApplyTypeMapping(typeMapping),
SqlParameterExpression e => e.ApplyTypeMapping(typeMapping),
_ => sqlExpression
};
}

private SqlExpression ApplyTypeMappingOnLike(LikeExpression likeExpression)
Expand Down Expand Up @@ -201,14 +178,10 @@ private SqlExpression ApplyTypeMappingOnSqlBinary(
}

public virtual RelationalTypeMapping GetTypeMappingForValue(object value)
{
return _typeMappingSource.GetMappingForValue(value);
}
=> _typeMappingSource.GetMappingForValue(value);

public virtual RelationalTypeMapping FindMapping(Type type)
{
return _typeMappingSource.FindMapping(type);
}
=> _typeMappingSource.FindMapping(type);

public SqlBinaryExpression MakeBinary(
ExpressionType operatorType, SqlExpression left, SqlExpression right, RelationalTypeMapping typeMapping)
Expand All @@ -233,115 +206,70 @@ public SqlBinaryExpression MakeBinary(
}

public SqlBinaryExpression Equal(SqlExpression left, SqlExpression right)
{
return MakeBinary(ExpressionType.Equal, left, right, null);
}
=> MakeBinary(ExpressionType.Equal, left, right, null);

public SqlBinaryExpression NotEqual(SqlExpression left, SqlExpression right)
{
return MakeBinary(ExpressionType.NotEqual, left, right, null);
}
=> MakeBinary(ExpressionType.NotEqual, left, right, null);

public SqlBinaryExpression GreaterThan(SqlExpression left, SqlExpression right)
{
return MakeBinary(ExpressionType.GreaterThan, left, right, null);
}
=> MakeBinary(ExpressionType.GreaterThan, left, right, null);

public SqlBinaryExpression GreaterThanOrEqual(SqlExpression left, SqlExpression right)
{
return MakeBinary(ExpressionType.GreaterThanOrEqual, left, right, null);
}
=> MakeBinary(ExpressionType.GreaterThanOrEqual, left, right, null);

public SqlBinaryExpression LessThan(SqlExpression left, SqlExpression right)
{
return MakeBinary(ExpressionType.LessThan, left, right, null);
}
=> MakeBinary(ExpressionType.LessThan, left, right, null);

public SqlBinaryExpression LessThanOrEqual(SqlExpression left, SqlExpression right)
{
return MakeBinary(ExpressionType.LessThanOrEqual, left, right, null);
}
=> MakeBinary(ExpressionType.LessThanOrEqual, left, right, null);

public SqlBinaryExpression AndAlso(SqlExpression left, SqlExpression right)
{
return MakeBinary(ExpressionType.AndAlso, left, right, null);
}
=> MakeBinary(ExpressionType.AndAlso, left, right, null);

public SqlBinaryExpression OrElse(SqlExpression left, SqlExpression right)
{
return MakeBinary(ExpressionType.OrElse, left, right, null);
}
=> MakeBinary(ExpressionType.OrElse, left, right, null);

public SqlBinaryExpression Add(SqlExpression left, SqlExpression right, RelationalTypeMapping typeMapping = null)
{
return MakeBinary(ExpressionType.Add, left, right, typeMapping);
}
=> MakeBinary(ExpressionType.Add, left, right, typeMapping);

public SqlBinaryExpression Subtract(SqlExpression left, SqlExpression right, RelationalTypeMapping typeMapping = null)
{
return MakeBinary(ExpressionType.Subtract, left, right, typeMapping);
}
=> MakeBinary(ExpressionType.Subtract, left, right, typeMapping);

public SqlBinaryExpression Multiply(SqlExpression left, SqlExpression right, RelationalTypeMapping typeMapping = null)
{
return MakeBinary(ExpressionType.Multiply, left, right, typeMapping);
}
=> MakeBinary(ExpressionType.Multiply, left, right, typeMapping);

public SqlBinaryExpression Divide(SqlExpression left, SqlExpression right, RelationalTypeMapping typeMapping = null)
{
return MakeBinary(ExpressionType.Divide, left, right, typeMapping);
}
=> MakeBinary(ExpressionType.Divide, left, right, typeMapping);

public SqlBinaryExpression Modulo(SqlExpression left, SqlExpression right, RelationalTypeMapping typeMapping = null)
{
return MakeBinary(ExpressionType.Modulo, left, right, typeMapping);
}
=> MakeBinary(ExpressionType.Modulo, left, right, typeMapping);

public SqlBinaryExpression And(SqlExpression left, SqlExpression right, RelationalTypeMapping typeMapping = null)
{
return MakeBinary(ExpressionType.And, left, right, typeMapping);
}
=> MakeBinary(ExpressionType.And, left, right, typeMapping);

public SqlBinaryExpression Or(SqlExpression left, SqlExpression right, RelationalTypeMapping typeMapping = null)
{
return MakeBinary(ExpressionType.Or, left, right, typeMapping);
}
=> MakeBinary(ExpressionType.Or, left, right, typeMapping);

public SqlBinaryExpression Coalesce(SqlExpression left, SqlExpression right, RelationalTypeMapping typeMapping = null)
{
return MakeBinary(ExpressionType.Coalesce, left, right, typeMapping);
}

=> MakeBinary(ExpressionType.Coalesce, left, right, typeMapping);

private SqlUnaryExpression MakeUnary(
ExpressionType operatorType, SqlExpression operand, Type type, RelationalTypeMapping typeMapping = null)
{
return (SqlUnaryExpression)ApplyTypeMapping(new SqlUnaryExpression(operatorType, operand, type, null), typeMapping);
}
private SqlUnaryExpression MakeUnary(ExpressionType operatorType, SqlExpression operand, Type type, RelationalTypeMapping typeMapping = null)
=> (SqlUnaryExpression)ApplyTypeMapping(new SqlUnaryExpression(operatorType, operand, type, null), typeMapping);

public SqlUnaryExpression IsNull(SqlExpression operand)
{
return MakeUnary(ExpressionType.Equal, operand, typeof(bool));
}
=> MakeUnary(ExpressionType.Equal, operand, typeof(bool));

public SqlUnaryExpression IsNotNull(SqlExpression operand)
{
return MakeUnary(ExpressionType.NotEqual, operand, typeof(bool));
}
=> MakeUnary(ExpressionType.NotEqual, operand, typeof(bool));

public SqlUnaryExpression Convert(SqlExpression operand, Type type, RelationalTypeMapping typeMapping = null)
{
return MakeUnary(ExpressionType.Convert, operand, type, typeMapping);
}
=> MakeUnary(ExpressionType.Convert, operand, type, typeMapping);

public SqlUnaryExpression Not(SqlExpression operand)
{
return MakeUnary(ExpressionType.Not, operand, typeof(bool));
}
=> MakeUnary(ExpressionType.Not, operand, typeof(bool));

public SqlUnaryExpression Negate(SqlExpression operand)
{
return MakeUnary(ExpressionType.Negate, operand, operand.Type, operand.TypeMapping);
}
=> MakeUnary(ExpressionType.Negate, operand, operand.Type, operand.TypeMapping);

public CaseExpression Case(SqlExpression operand, params CaseWhenClause[] whenClauses)
{
Expand All @@ -361,9 +289,7 @@ public CaseExpression Case(SqlExpression operand, params CaseWhenClause[] whenCl
ApplyTypeMapping(caseWhenClause.Result, resultTypeMapping)));
}


return new CaseExpression(operand, typeMappedWhenClauses);

}

public CaseExpression Case(IReadOnlyList<CaseWhenClause> whenClauses, SqlExpression elseResult)
Expand Down Expand Up @@ -437,29 +363,17 @@ public SqlFunctionExpression Function(
typeMapping);
}

public SqlFunctionExpression Function(
string functionName, Type returnType, RelationalTypeMapping typeMapping = null)
{
return new SqlFunctionExpression(functionName, returnType, typeMapping);
}
public SqlFunctionExpression Function(string functionName, Type returnType, RelationalTypeMapping typeMapping = null)
=> new SqlFunctionExpression(functionName, returnType, typeMapping);

public SqlFunctionExpression Function(
string schema, string functionName, Type returnType, RelationalTypeMapping typeMapping = null)
{
return new SqlFunctionExpression(schema, functionName, returnType, typeMapping);
}
public SqlFunctionExpression Function(string schema, string functionName, Type returnType, RelationalTypeMapping typeMapping = null)
=> new SqlFunctionExpression(schema, functionName, returnType, typeMapping);

public SqlFunctionExpression Function(
SqlExpression instance, string functionName, Type returnType, RelationalTypeMapping typeMapping = null)
{
instance = ApplyDefaultTypeMapping(instance);
return new SqlFunctionExpression(instance, functionName, returnType, typeMapping);
}
public SqlFunctionExpression Function(SqlExpression instance, string functionName, Type returnType, RelationalTypeMapping typeMapping = null)
=> new SqlFunctionExpression(ApplyDefaultTypeMapping(instance), functionName, returnType, typeMapping);

public ExistsExpression Exists(SelectExpression subquery, bool negated)
{
return new ExistsExpression(subquery, negated, _boolTypeMapping);
}
=> new ExistsExpression(subquery, negated, _boolTypeMapping);

public InExpression In(SqlExpression item, SqlExpression values, bool negated)
{
Expand All @@ -485,19 +399,13 @@ public InExpression In(SqlExpression item, SelectExpression subquery, bool negat
}

public LikeExpression Like(SqlExpression match, SqlExpression pattern, SqlExpression escapeChar = null)
{
return (LikeExpression)ApplyDefaultTypeMapping(new LikeExpression(match, pattern, escapeChar, null));
}
=> (LikeExpression)ApplyDefaultTypeMapping(new LikeExpression(match, pattern, escapeChar, null));

public SqlFragmentExpression Fragment(string sql)
{
return new SqlFragmentExpression(sql);
}
=> new SqlFragmentExpression(sql);

public SqlConstantExpression Constant(object value, RelationalTypeMapping typeMapping = null)
{
return new SqlConstantExpression(Expression.Constant(value), typeMapping);
}
=> new SqlConstantExpression(Expression.Constant(value), typeMapping);

public SelectExpression Select(SqlExpression projection)
{
Expand Down