* SqlCommand.cs: Fixed param name in ArgumentException for negative

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

diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
index 7d931bdf9a8e55df8eeeb8e8b305508b21ebc909..c6b295fe04c2e4e9d4b3b3af0fc8e1372807d471 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
@@ -173,7 +173,12 @@ namespace System.Data.SqlClient {
                        get { return commandTimeout; }
                        set { 
                                if (value < 0)
+#if NET_2_0
+                                       throw new ArgumentException ("CommandTimeout",
+                                               "The property value assigned is less than 0.");
+#else
                                        throw new ArgumentException ("The property value assigned is less than 0.");
+#endif
                                commandTimeout = value; 
                        }
                }
@@ -644,11 +649,16 @@ namespace System.Data.SqlClient {
 #endif // NET_2_0
                void Prepare ()
                {
-                       ValidateCommand ("Prepare", false);
+#if NET_2_0
+                       if (Connection == null)
+                               throw new NullReferenceException ();
+#endif
 
-                       if (CommandType == CommandType.StoredProcedure)
+                       if (CommandType == CommandType.StoredProcedure || CommandType == CommandType.Text && Parameters.Count == 0)
                                return;
 
+                       ValidateCommand ("Prepare", false);
+
                        try {
                                foreach (SqlParameter param in Parameters)
                                        param.CheckIfInitialized ();
@@ -674,10 +684,18 @@ namespace System.Data.SqlClient {
                {
                        if (Connection == null)
                                throw new InvalidOperationException (String.Format ("{0}: A Connection object is required to continue.", method));
-                       if (Connection.Transaction != null && transaction != Connection.Transaction)
-                               throw new InvalidOperationException ("The Connection object does not have the same transaction as the command object.");
+                       if (Transaction == null && Connection.Transaction != null)
+                               throw new InvalidOperationException (String.Format (
+                                       "{0} requires a transaction if the command's connection is in a pending transaction.",
+#if NET_2_0
+                                       method));
+#else
+                                       "Execute"));
+#endif
+                       if (Transaction != null && Transaction.Connection != Connection)
+                               throw new InvalidOperationException ("The connection does not have the same transaction as the command.");
                        if (Connection.State != ConnectionState.Open)
-                               throw new InvalidOperationException (String.Format ("{0} requires an open Connection object to continue. This connection is closed.", method));
+                               throw new InvalidOperationException (String.Format ("{0} requires an open connection to continue. This connection is closed.", method));
                        if (CommandText.Length == 0)
                                throw new InvalidOperationException ("The command text for this Command has not been set.");
                        if (Connection.DataReader != null)