A couple of fixes for TimeZoneInfo.ConvertTime.

[mono.git] / mcs / class / System.Core / System.Linq / QueryableEnumerable.cs

diff --git a/mcs/class/System.Core/System.Linq/QueryableEnumerable.cs b/mcs/class/System.Core/System.Linq/QueryableEnumerable.cs
index f8ad6d115f46bc4ddc55883b2d8e38b3e17cae6d..8dfe62a3eac023c366ef090089d9cb802e51e70c 100644 (file)
--- a/mcs/class/System.Core/System.Linq/QueryableEnumerable.cs
+++ b/mcs/class/System.Core/System.Linq/QueryableEnumerable.cs
@@ -100,11 +100,7 @@ namespace System.Linq {
 
                static Expression TransformQueryable (Expression expression)
                {
-#if NET_4_0 || BOOTSTRAP_NET_4_0
-                       throw new NotImplementedException ();
-#else                                          
                        return new QueryableTransformer ().Transform (expression);
-#endif
                }
 
                public IQueryable<TElem> CreateQuery<TElem> (Expression expression)
@@ -117,5 +113,20 @@ 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 ();
+
+                       if (expression == null)
+                               return base.ToString ();
+
+                       var constant = expression as ConstantExpression;
+                       if (constant != null && constant.Value == this)
+                               return base.ToString ();
+
+                       return expression.ToString ();
+               }
        }
 }