Copy from 72246 to trunk

[mono.git] / mcs / class / System.Data / System.Data.SqlClient.jvm / SqlCommand.cs

diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs
index 19a7ba7b9ca6e0920f86bdd119d9d8cba7fdb432..572097940a92caac9486ed95fcd6af2962a7f3ff 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs
@@ -84,6 +84,26 @@ namespace System.Data.SqlClient
 
                #region Properties
 
+               public override string CommandText {
+                       get {
+                               string commandText = base.CommandText;
+                               if (CommandType != CommandType.StoredProcedure ||
+                                       string.IsNullOrEmpty (commandText) ||
+                                       commandText [0] == '[' ||
+                                       commandText.IndexOf ('.') >= 0)
+                                       return commandText;
+
+                               string trimmedCommandText = commandText.TrimEnd ();
+                               if (trimmedCommandText.Length > 0 && trimmedCommandText [trimmedCommandText.Length - 1] != ')')
+                                       commandText = String.Concat ("[", commandText, "]");
+
+                               return commandText;
+                       }
+                       set {
+                               base.CommandText = value;
+                       }
+               }
+
                public new SqlConnection Connection\r
                {\r
                        get { return (SqlConnection)base.Connection; }\r