Browse Source

2010-06-22 Jb Evain <[email protected]>

	* EnumerableQuery_T.cs
	* QueryableEnumerable.cs:
		override ToString.


svn path=/trunk/mcs/; revision=159329
Jb Evain 15 years ago
parent
commit
7d3defbb7b

+ 6 - 0
mcs/class/System.Core/System.Linq/ChangeLog

@@ -1,3 +1,9 @@
+2010-06-22  Jb Evain  <[email protected]>
+
+	* EnumerableQuery_T.cs
+	* QueryableEnumerable.cs:
+		override ToString.
+
 2010-06-18  Rolf Bjarne Kvinge  <[email protected]>
 
 	* EnumerableQuery.cs:

+ 5 - 0
mcs/class/System.Core/System.Linq/EnumerableQuery_T.cs

@@ -95,6 +95,11 @@ namespace System.Linq
 		{
 			return queryable.Execute<TResult> (expression);
 		}
+
+		public override string ToString ()
+		{
+			return queryable.ToString ();
+		}
 	}
 }
 

+ 12 - 0
mcs/class/System.Core/System.Linq/QueryableEnumerable.cs

@@ -113,5 +113,17 @@ namespace System.Linq {
 			var lambda = Expression.Lambda<Func<TResult>> (TransformQueryable (expression));
 			return lambda.Compile ().Invoke ();
 		}
+
+		public override string ToString ()
+		{
+			if (enumerable != null)
+				return enumerable.ToString ();
+
+			var constant = expression as ConstantExpression;
+			if (constant != null)
+				return constant.ToString ();
+
+			return base.ToString ();
+		}
 	}
 }