2010-06-22 Jb Evain <jbevain@novell.com>

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

svn path=/trunk/mcs/; revision=159329

diff --git a/mcs/class/System.Core/System.Linq/ChangeLog b/mcs/class/System.Core/System.Linq/ChangeLog
index 5a9e38dea6a983c926f15463aa09b6e1f2a8b134..1257760cf091f2691585ee0e1a362df9b5d36ec4 100644 (file)
--- a/mcs/class/System.Core/System.Linq/ChangeLog
+++ b/mcs/class/System.Core/System.Linq/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-22  Jb Evain  <jbevain@novell.com>
+
+       * EnumerableQuery_T.cs
+       * QueryableEnumerable.cs:
+               override ToString.
+
 2010-06-18  Rolf Bjarne Kvinge  <RKvinge@novell.com>
 
        * EnumerableQuery.cs:

diff --git a/mcs/class/System.Core/System.Linq/EnumerableQuery_T.cs b/mcs/class/System.Core/System.Linq/EnumerableQuery_T.cs
index 32fe3d48e313ee864023fd657eb3407b7c817041..1a97dada760e5a09777b4937be76685f20546af4 100644 (file)
--- a/mcs/class/System.Core/System.Linq/EnumerableQuery_T.cs
+++ b/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 ();
+               }
        }
 }
 

diff --git a/mcs/class/System.Core/System.Linq/QueryableEnumerable.cs b/mcs/class/System.Core/System.Linq/QueryableEnumerable.cs
index 34046f0a5248fb53c853bd04a74d007be95bf6de..2eb11c4a3164c1b0eee855457dfa57a9fe827ce4 100644 (file)
--- a/mcs/class/System.Core/System.Linq/QueryableEnumerable.cs
+++ b/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 ();
+               }
        }
 }