Improve custom query generation. Added a lot of ways to create dynami…

…c queries safely.
linq2db · MaceWindu · Apr 13, 2019 · Feb 17, 2019 · Feb 20, 2019 · Feb 20, 2019
commit d4bf48d1b8ffd9f8a08662ae832611b436c6f810
@@ -55,7 +55,7 @@ protected override IBuildContext BuildMethodCall(ExpressionBuilder builder, Meth
 
 			if (attr != null)
 			{
-				sqlExpression = attr.GetExpression(builder.MappingSchema, sequence.SelectQuery, methodCall, e =>
+				sqlExpression = attr.GetExpression(builder.DataContext, sequence.SelectQuery, methodCall, e =>
 				{
 					var ex = e.Unwrap();
 

@@ -846,7 +846,7 @@ public ISqlExpression ConvertToSql(IBuildContext context, Expression expression,
 
 						if (attr != null)
 						{
-							var converted = attr.GetExpression(MappingSchema, context.SelectQuery, ma,
+							var converted = attr.GetExpression(DataContext, context.SelectQuery, ma,
 								e => ConvertToSql(context, e));
 
 							if (converted == null)
@@ -944,7 +944,7 @@ public ISqlExpression ConvertToSql(IBuildContext context, Expression expression,
 							if (attr.InlineParameters)
 								DataContext.InlineParameters = true;
 
-							var sqlExpression = attr.GetExpression(MappingSchema, context.SelectQuery, e, _ => ConvertToSql(context, _));
+							var sqlExpression = attr.GetExpression(DataContext, context.SelectQuery, e, _ => ConvertToSql(context, _));
 							if (sqlExpression != null)
 								return Convert(context, sqlExpression);
 
@@ -1032,6 +1032,13 @@ public ISqlExpression ConvertToSql(IBuildContext context, Expression expression,
 							return ConvertToSql(context, expression.Reduce());
 						break;
 					}
+				case ExpressionType.Constant:
+					{
+						var cnt = (ConstantExpression)expression;
+						if (cnt.Value is ISqlExpression sql)
+							return sql;
+						break;
+					}
 			}
 
 			if (expression.Type == typeof(bool) && _convertedPredicates.Add(expression))
@@ -1243,7 +1250,7 @@ bool CanBeCompiled(Expression expr)
 
 			var allowedParams = new HashSet<Expression> { ParametersParam };
 
-			var result = expr.NodeType == ExpressionType.Quote || null == expr.Find(ex =>
+			var result = null == expr.Find(ex =>
 			{
 				if (IsServerSideOnly(ex))
 					return true;
@@ -1267,6 +1274,13 @@ bool CanBeCompiled(Expression expr)
 							}
 							break;
 						}
+					case ExpressionType.Constant :
+						{
+							var cnt = (ConstantExpression)ex;
+							if (cnt.Value is ISqlExpression)
+								return true;
+							break;
+						}
 				}
 
 				return false;
@@ -1516,7 +1530,7 @@ ISqlPredicate ConvertPredicate(IBuildContext context, Expression expression)
 
 						var attr = GetExpressionAttribute(e.Method);
 
-						if (attr != null && attr.IsPredicate)
+						if (attr != null && attr.GetIsPredicate(expression))
 							break;
 
 						return ConvertPredicate(context, AddEqualTrue(expression));
@@ -1543,7 +1557,7 @@ ISqlPredicate ConvertPredicate(IBuildContext context, Expression expression)
 
 						var attr = GetExpressionAttribute(e.Member);
 
-						if (attr != null && attr.IsPredicate)
+						if (attr != null && attr.GetIsPredicate(expression))
 							break;
 
 						return ConvertPredicate(context, AddEqualTrue(expression));

@@ -477,7 +477,7 @@ ISqlExpression ConvertEnumerable(MethodCallExpression call)
 
 				if (attribute != null)
 				{
-					var expr = attribute.GetExpression(Builder.MappingSchema, SelectQuery, call, e =>
+					var expr = attribute.GetExpression(Builder.DataContext, SelectQuery, call, e =>
 					{
 						var ex = e.Unwrap();
 

@@ -12,10 +12,8 @@ namespace LinqToDB.Linq.Builder
 
 	partial class TableBuilder
 	{
-#if !NET45
-		private static MethodInfo _getArgumentMethodInfo =
-			MemberHelper.MethodOf(() => ((FormattableString)null).GetArgument(0));
-#endif
+		private static MethodInfo _asSqlMethodInfo =
+			MemberHelper.MethodOf(() => Sql.AsSql(""));
 
 		static IBuildContext BuildRawSqlTable(ExpressionBuilder builder, BuildInfo buildInfo)
 		{
@@ -24,36 +22,41 @@ static IBuildContext BuildRawSqlTable(ExpressionBuilder builder, BuildInfo build
 			if (builder.MappingSchema.IsScalarType(methodCall.Method.GetGenericArguments()[0]))
 				throw new LinqToDBException("Selection of scalar types not supported by FromSql method. Use mapping class with one column for scalar values");
 
-			string                  format;
-			IEnumerable<Expression> arguments;
+			PrepareRawSqlArguments(methodCall.Arguments[1],
+				methodCall.Arguments.Count > 2 ? methodCall.Arguments[2] : null,
+				out var format, out var arguments);
+
+			var sqlArguments = arguments.Select(a => builder.ConvertToSql(buildInfo.Parent, a)).ToArray();
 
-			var sqlExpr = methodCall.Arguments[1];
+			return new RawSqlContext(builder, buildInfo, methodCall.Method.GetGenericArguments()[0], format, sqlArguments);
+		}
 
+		public static void PrepareRawSqlArguments(Expression fromatArg, Expression parametersArg, out string format, out IEnumerable<Expression> arguments)
+		{
 			// Consider that FormattableString is used
-			if (sqlExpr.NodeType == ExpressionType.Call)
+			if (fromatArg.NodeType == ExpressionType.Call)
 			{
-				var mc = (MethodCallExpression)sqlExpr;
+				var mc = (MethodCallExpression)fromatArg;
 
-				format    = (string)mc.Arguments[0].EvaluateExpression();
+				format = (string)mc.Arguments[0].EvaluateExpression();
 				arguments = ((NewArrayExpression)mc.Arguments[1]).Expressions;
-
 			}
 			else
 			{
-				var evaluatedSql = sqlExpr.EvaluateExpression();
+				var evaluatedSql = fromatArg.EvaluateExpression();
 #if !NET45
 				if (evaluatedSql is FormattableString formattable)
 				{
-					format    = formattable.Format;
+					format = formattable.Format;
 					arguments = formattable.GetArguments().Select(Expression.Constant);
 				}
 				else
 #endif
 				{
 					var rawSqlString = (RawSqlString)evaluatedSql;
 
-					format        = rawSqlString.Format;
-					var arrayExpr = methodCall.Arguments[2];
+					format = rawSqlString.Format;
+					var arrayExpr = parametersArg;
 
 					if (arrayExpr.NodeType == ExpressionType.NewArrayInit)
 						arguments = ((NewArrayExpression)arrayExpr).Expressions;
@@ -64,10 +67,6 @@ static IBuildContext BuildRawSqlTable(ExpressionBuilder builder, BuildInfo build
 					}
 				}
 			}
-
-			var sqlArguments = arguments.Select(a => builder.ConvertToSql(buildInfo.Parent, a)).ToArray();
-
-			return new RawSqlContext(builder, buildInfo, methodCall.Method.GetGenericArguments()[0], format, sqlArguments);
 		}
 
 		class RawSqlContext : TableContext

@@ -127,10 +127,13 @@ public virtual ISqlExpression GetExpression(MemberInfo member, params ISqlExpres
 				};
 			}
 
-			public virtual ISqlExpression GetExpression(MappingSchema mapping, SelectQuery query, Expression expression, Func<Expression, ISqlExpression> converter)
+			public virtual ISqlExpression GetExpression(IDataContext dataContext, SelectQuery query,
+				Expression expression, Func<Expression, ISqlExpression> converter)
 			{
 				return null;
 			}
+
+			public virtual bool GetIsPredicate(Expression expression) => IsPredicate;
 		}
 	}
 }