Merge pull request #3591 from directhex/mono_libdir_fallback
[mono.git] / mcs / class / System.Data / System.Data.SqlClient / SqlCommand.cs
index fdca5789fd2775ecd61031da2387e6ff10698c2b..1fd5443df85192ea7e3fcffd5461c19356952b59 100644 (file)
@@ -44,28 +44,23 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Data;
 using System.Data.Common;
-#if NET_2_0
 using System.Data.Sql;
-#endif
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Xml;
 
 namespace System.Data.SqlClient {
        [DesignerAttribute ("Microsoft.VSDesigner.Data.VS.SqlCommandDesigner, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.ComponentModel.Design.IDesigner")]
-        [ToolboxItemAttribute ("System.Drawing.Design.ToolboxItem, "+ Consts.AssemblySystem_Drawing)]
-#if NET_2_0
+       [ToolboxItemAttribute ("System.Drawing.Design.ToolboxItem, "+ Consts.AssemblySystem_Drawing)]
        [DefaultEventAttribute ("RecordsAffected")]
        public sealed class SqlCommand : DbCommand, IDbCommand, ICloneable
-#else
-       public sealed class SqlCommand : Component, IDbCommand, ICloneable
-#endif // NET_2_0
        {
                #region Fields
 
                const int DEFAULT_COMMAND_TIMEOUT = 30;
 
-               bool disposed;
                int commandTimeout;
                bool designTimeVisible;
                string commandText;
@@ -76,10 +71,9 @@ namespace System.Data.SqlClient {
                CommandBehavior behavior = CommandBehavior.Default;
                SqlParameterCollection parameters;
                string preparedStatement;
-#if NET_2_0
+               bool disposed;
                SqlNotificationRequest notification;
                bool notificationAutoEnlist;
-#endif
 
                #endregion // Fields
 
@@ -90,28 +84,26 @@ namespace System.Data.SqlClient {
                {
                }
 
-               public SqlCommand (string commandText) 
-                       : this (commandText, null, null)
+               public SqlCommand (string cmdText)
+                       : this (cmdText, null, null)
                {
                }
 
-               public SqlCommand (string commandText, SqlConnection connection) 
-                       : this (commandText, connection, null)
+               public SqlCommand (string cmdText, SqlConnection connection)
+                       : this (cmdText, connection, null)
                {
                }
 
-               public SqlCommand (string commandText, SqlConnection connection, SqlTransaction transaction) 
+               public SqlCommand (string cmdText, SqlConnection connection, SqlTransaction transaction) 
                {
-                       this.commandText = commandText;
+                       this.commandText = cmdText;
                        this.connection = connection;
                        this.transaction = transaction;
                        this.commandType = CommandType.Text;
                        this.updatedRowSource = UpdateRowSource.Both;
 
                        this.commandTimeout = DEFAULT_COMMAND_TIMEOUT;
-#if NET_2_0
                        notificationAutoEnlist = true;
-#endif
                        designTimeVisible = true;
                        parameters = new SqlParameterCollection (this);
                }
@@ -129,6 +121,7 @@ namespace System.Data.SqlClient {
                        for (int i = 0;i < parameters.Count;i++)
                                this.parameters.Add(((ICloneable)parameters[i]).Clone());
                }
+
                #endregion // Constructors
 
                #region Properties
@@ -137,16 +130,11 @@ namespace System.Data.SqlClient {
                        get { return behavior; }
                }
 
-#if !NET_2_0
-               [DataSysDescription ("Command text to execute.")]
-#endif
                [DefaultValue ("")]
                [EditorAttribute ("Microsoft.VSDesigner.Data.SQL.Design.SqlCommandTextEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
                [RefreshProperties (RefreshProperties.All)]
-               public 
-#if NET_2_0
-               override 
-#endif //NET_2_0
+               public
+               override
                string CommandText {
                        get {
                                if (commandText == null)
@@ -156,46 +144,32 @@ namespace System.Data.SqlClient {
                        set {
                                if (value != commandText && preparedStatement != null)
                                        Unprepare ();
-                               commandText = value; 
+                               commandText = value;
                        }
                }
 
-#if !NET_2_0
-               [DataSysDescription ("Time to wait for command to execute.")]
-               [DefaultValue (DEFAULT_COMMAND_TIMEOUT)]
-#endif
-               public 
-#if NET_2_0
+               public
                override
-#endif //NET_2_0
                int CommandTimeout {
                        get { return commandTimeout; }
                        set { 
                                if (value < 0)
-                                       throw new ArgumentException ("The property value assigned is less than 0.");
+                                       throw new ArgumentException ("The property value assigned is less than 0.",
+                                               "CommandTimeout");
                                commandTimeout = value; 
                        }
                }
 
-#if !NET_2_0
-               [DataSysDescription ("How to interpret the CommandText.")]
-#endif
                [DefaultValue (CommandType.Text)]
                [RefreshProperties (RefreshProperties.All)]
-               public 
-#if NET_2_0
-               override 
-#endif //NET_2_0
+               public
+               override
                CommandType CommandType {
                        get { return commandType; }
                        set { 
                                if (value == CommandType.TableDirect)
-#if NET_2_0
                                        throw new ArgumentOutOfRangeException ("CommandType.TableDirect is not supported " +
                                                "by the Mono SqlClient Data Provider.");
-#else
-                                       throw new ArgumentException ("CommandType.TableDirect is not supported by the Mono SqlClient Data Provider.");
-#endif
 
                                ExceptionHelper.CheckEnumValue (typeof (CommandType), value);
                                commandType = value; 
@@ -203,95 +177,57 @@ namespace System.Data.SqlClient {
                }
 
                [DefaultValue (null)]
-#if !NET_2_0
-               [DataSysDescription ("Connection used by the command.")]
-#endif
                [EditorAttribute ("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]                
-               public 
-#if NET_2_0
+               public
                new
-#endif //NET_2_0
                SqlConnection Connection {
                        get { return connection; }
-                       set {
-                               if (transaction != null && connection.Transaction != null && connection.Transaction.IsOpen)
-                                       throw new InvalidOperationException ("The Connection property was changed while a transaction was in progress.");
-                               transaction = null;
-                               connection = value; 
+                       set
+                       {
+                               connection = value;
                        }
                }
 
                [Browsable (false)]
                [DefaultValue (true)]
                [DesignOnly (true)]
-#if NET_2_0
                [EditorBrowsable (EditorBrowsableState.Never)]
-#endif
-               public 
-#if NET_2_0
+               public
                override
-#endif //NET_2_0
                bool DesignTimeVisible {
                        get { return designTimeVisible; } 
                        set { designTimeVisible = value; }
                }
 
-#if !NET_2_0
-               [DataSysDescription ("The parameters collection.")]
-#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-               public 
-#if NET_2_0
-               new 
-#endif //NET_2_0
+               public
+               new
                SqlParameterCollection Parameters {
                        get { return parameters; }
                }
 
-               internal ITds Tds {
+               internal Tds Tds {
                        get { return Connection.Tds; }
                }
 
-               IDbConnection IDbCommand.Connection {
-                       get { return Connection; }
-                       set { 
-                               if (!(value == null || value is SqlConnection))
-                                       throw new InvalidCastException ("The value was not a valid SqlConnection.");
-                               Connection = (SqlConnection) value;
-                       }
-               }
-
-               IDataParameterCollection IDbCommand.Parameters {
-                       get { return Parameters; }
-               }
-
-               IDbTransaction IDbCommand.Transaction {
-                       get { return Transaction; }
-                       set { 
-                               if (!(value == null || value is SqlTransaction))
-                                       throw new ArgumentException ();
-                               Transaction = (SqlTransaction) value; 
-                       }
-               }
 
                [Browsable (false)]
-#if !NET_2_0
-               [DataSysDescription ("The transaction used by the command.")]
-#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                public new SqlTransaction Transaction {
-                       get { return transaction; }
-                       set { transaction = value; }
+                       get {
+                               if (transaction != null && !transaction.IsOpen)
+                                       transaction = null;
+                               return transaction;
+                       }
+                       set
+                       {
+                               transaction = value;
+                       }
                }
 
-#if !NET_2_0
-               [DataSysDescription ("When used by a DataAdapter.Update, how command results are applied to the current DataRow.")]
-#endif
                [DefaultValue (UpdateRowSource.Both)]
-               public 
-#if NET_2_0
+               public
                override
-#endif // NET_2_0
                UpdateRowSource UpdatedRowSource {
                        get { return updatedRowSource; }
                        set {
@@ -300,7 +236,6 @@ namespace System.Data.SqlClient {
                        }
                }
 
-#if NET_2_0
                [Browsable (false)]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                public SqlNotificationRequest Notification {
@@ -313,61 +248,114 @@ namespace System.Data.SqlClient {
                        get { return notificationAutoEnlist; }
                        set { notificationAutoEnlist = value; }
                }
-#endif
                #endregion // Fields
 
                #region Methods
 
-               public 
-#if NET_2_0
+               public
                override
-#endif // NET_2_0
-               void Cancel () 
+               void Cancel ()
                {
                        if (Connection == null || Connection.Tds == null)
                                return;
                        Connection.Tds.Cancel ();
                }
 
-#if NET_2_0
                public SqlCommand Clone ()
                {
                        return new SqlCommand (commandText, connection, transaction, commandType, updatedRowSource, designTimeVisible, commandTimeout, parameters);
                }
-#endif // NET_2_0
 
-               internal void CloseDataReader (bool moreResults)
+               internal void CloseDataReader ()
                {
-                       Connection.DataReader = null;
+                       if (Connection != null) {
+                               Connection.DataReader = null;
 
-                       if ((behavior & CommandBehavior.CloseConnection) != 0)
-                               Connection.Close ();
+                               if ((behavior & CommandBehavior.CloseConnection) != 0)
+                                       Connection.Close ();
+
+                               if (Tds != null)
+                                       Tds.SequentialAccess = false;
+                       }
 
                        // Reset the behavior
                        behavior = CommandBehavior.Default;
-                       if (Tds != null)
-                               Tds.SequentialAccess = false;
                }
 
-               public new SqlParameter CreateParameter () 
+               public new SqlParameter CreateParameter ()
                {
                        return new SqlParameter ();
                }
 
+               private string EscapeProcName (string name, bool schema)
+               {
+                       string procName;
+                       string tmpProcName = name.Trim ();
+                       int procNameLen = tmpProcName.Length;
+                       char[] brkts = new char [] {'[', ']'};
+                       bool foundMatching = false;
+                       int start = 0, count = procNameLen;
+                       int sindex = -1, eindex = -1;
+                       
+                       // We try to match most of the "brackets" combination here, however
+                       // there could be other combinations that may generate a different type
+                       // of exception in MS.NET
+                       
+                       if (procNameLen > 1) {
+                               if ((sindex = tmpProcName.IndexOf ('[')) <= 0)
+                                       foundMatching = true;
+                               else
+                                       foundMatching = false;
+                       
+                               if (foundMatching == true && sindex > -1) {
+                                       eindex = tmpProcName.IndexOf (']');
+                                       if (sindex > eindex && eindex != -1) {
+                                               foundMatching = false;
+                                       } else if (eindex == procNameLen-1) {
+                                               if (tmpProcName.IndexOfAny (brkts, 1, procNameLen-2) != -1) {
+                                                       foundMatching = false;
+                                               } else {
+                                                       start = 1;
+                                                       count = procNameLen - 2;
+                                               }
+                                       } else if (eindex == -1 && schema) {
+                                               foundMatching = true;
+                                       } else {
+                                               foundMatching = false;
+                                       }
+                               }
+                       
+                               if (foundMatching)
+                                       procName = tmpProcName.Substring (start, count);
+                               else
+                                       throw new ArgumentException (String.Format ("SqlCommand.CommandText property value is an invalid multipart name {0}, incorrect usage of quotes", CommandText));
+                       } else {
+                               procName = tmpProcName;
+                       }
+                       
+                       return procName;
+               }
                internal void DeriveParameters ()
                {
                        if (commandType != CommandType.StoredProcedure)
                                throw new InvalidOperationException (String.Format ("SqlCommand DeriveParameters only supports CommandType.StoredProcedure, not CommandType.{0}", commandType));
-                       ValidateCommand ("DeriveParameters");
+                       ValidateCommand ("DeriveParameters", false);
 
                        string procName = CommandText;
                        string schemaName = String.Empty;
-                       int dotPosition = procName.IndexOf ('.');
+                       int dotPosition = procName.LastIndexOf ('.');
+
+                       // Procedure name can be: [database].[user].[procname]
                        if (dotPosition >= 0) {
                                schemaName = procName.Substring (0, dotPosition);
                                procName = procName.Substring (dotPosition + 1);
+                               if ((dotPosition = schemaName.LastIndexOf ('.')) >= 0)
+                                       schemaName = schemaName.Substring (dotPosition + 1);
                        }
                        
+                       procName = EscapeProcName (procName, false);
+                       schemaName = EscapeProcName (schemaName, true);
+                       
                        SqlParameterCollection localParameters = new SqlParameterCollection (this);
                        localParameters.Add ("@procedure_name", SqlDbType.NVarChar, procName.Length).Value = procName;
                        if (schemaName.Length > 0)
@@ -377,6 +365,9 @@ namespace System.Data.SqlClient {
 
                        try {
                                Connection.Tds.ExecProc (sql, localParameters.MetaParameters, 0, true);
+                       } catch (TdsTimeoutException ex) {
+                               Connection.Tds.Reset ();
+                               throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                        } catch (TdsInternalException ex) {
                                Connection.Close ();
                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
@@ -392,9 +383,11 @@ namespace System.Data.SqlClient {
                        }
                        reader.Close ();
 
+                       if (parameters.Count == 0)
+                               throw new InvalidOperationException ("Stored procedure '" + procName + "' does not exist.");
                }
 
-               private void Execute (CommandBehavior behavior, bool wantResults)
+               private void Execute (bool wantResults)
                {
                        int index = 0;
                        Connection.Tds.RecordsAffected = -1;
@@ -420,6 +413,7 @@ namespace System.Data.SqlClient {
                                        sql1.Append ("SET FMTONLY ON;");
                                        sql2.Append ("SET FMTONLY OFF;");
                                }
+                               
                                switch (CommandType) {
                                case CommandType.StoredProcedure:
                                        try {
@@ -428,6 +422,13 @@ namespace System.Data.SqlClient {
                                                Connection.Tds.ExecProc (CommandText, parms, CommandTimeout, wantResults);
                                                if (keyInfo || schemaOnly)
                                                        Connection.Tds.Execute (sql2.ToString ());
+                                       } catch (TdsTimeoutException ex) {
+                                               // If it is a timeout exception there can be many reasons:
+                                               // 1) Network is down/server is down/not reachable
+                                               // 2) Somebody has an exclusive lock on Table/DB
+                                               // In any of these cases, don't close the connection. Let the user do it
+                                               Connection.Tds.Reset ();
+                                               throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                        } catch (TdsInternalException ex) {
                                                Connection.Close ();
                                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
@@ -442,6 +443,9 @@ namespace System.Data.SqlClient {
                                        }
                                        try {
                                                Connection.Tds.Execute (sql, parms, CommandTimeout, wantResults);
+                                       } catch (TdsTimeoutException ex) {
+                                               Connection.Tds.Reset ();
+                                               throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                        } catch (TdsInternalException ex) {
                                                Connection.Close ();
                                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
@@ -452,6 +456,9 @@ namespace System.Data.SqlClient {
                        else {
                                try {
                                        Connection.Tds.ExecPrepared (preparedStatement, parms, CommandTimeout, wantResults);
+                               } catch (TdsTimeoutException ex) {
+                                       Connection.Tds.Reset ();
+                                       throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                } catch (TdsInternalException ex) {
                                        Connection.Close ();
                                        throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
@@ -459,21 +466,19 @@ namespace System.Data.SqlClient {
                        }
                }
 
-               public 
-#if NET_2_0
+               public
                override
-#endif // NET_2_0
                int ExecuteNonQuery ()
                {
-                       ValidateCommand ("ExecuteNonQuery");
+                       ValidateCommand ("ExecuteNonQuery", false);
                        int result = 0;
                        behavior = CommandBehavior.Default;
 
                        try {
-                               Execute (CommandBehavior.Default, false);
+                               Execute (false);
                                result = Connection.Tds.RecordsAffected;
-                       }
-                       catch (TdsTimeoutException e) {
+                       } catch (TdsTimeoutException e) {
+                               Connection.Tds.Reset ();
                                throw SqlException.FromTdsInternalException ((TdsInternalException) e);
                        }
 
@@ -488,47 +493,132 @@ namespace System.Data.SqlClient {
 
                public new SqlDataReader ExecuteReader (CommandBehavior behavior)
                {
-                       ValidateCommand ("ExecuteReader");
+                       ValidateCommand ("ExecuteReader", false);
+                       if ((behavior & CommandBehavior.SingleRow) != 0)
+                               behavior |= CommandBehavior.SingleResult;
+                       this.behavior = behavior;
+                       if ((behavior & CommandBehavior.SequentialAccess) != 0)
+                               Tds.SequentialAccess = true;
                        try {
-                               this.behavior = behavior;
-                               if ((behavior & CommandBehavior.SequentialAccess) != 0)
-                                       Tds.SequentialAccess = true;
-                               Execute (behavior, true);
+                               Execute (true);
                                Connection.DataReader = new SqlDataReader (this);
-                       } catch (TdsTimeoutException e) {
-                               // if behavior is closeconnection, even if it throws exception
-                               // the connection has to be closed.
-                               if ((behavior & CommandBehavior.CloseConnection) != 0)
-                                       Connection.Close ();
-                               throw SqlException.FromTdsInternalException ((TdsInternalException) e);
-                       } catch (SqlException) {
-                               // if behavior is closeconnection, even if it throws exception
-                               // the connection has to be closed.
+                               return Connection.DataReader;
+                       } catch {
                                if ((behavior & CommandBehavior.CloseConnection) != 0)
                                        Connection.Close ();
-
                                throw;
                        }
+               }
 
-                       return Connection.DataReader;
+               public new Task<SqlDataReader> ExecuteReaderAsync ()
+               {
+                       return ExecuteReaderAsync (CommandBehavior.Default, CancellationToken.None);
                }
 
-               public 
-#if NET_2_0
+               public new Task<SqlDataReader> ExecuteReaderAsync (CancellationToken cancellationToken)
+               {
+                       return ExecuteReaderAsync (behavior, CancellationToken.None);
+               }
+
+               public new Task<SqlDataReader> ExecuteReaderAsync (CommandBehavior behavior)
+               {
+                       return ExecuteReaderAsync (CommandBehavior.Default, CancellationToken.None);
+               }
+
+               public new Task<SqlDataReader> ExecuteReaderAsync (CommandBehavior behavior, CancellationToken cancellationToken)
+               {
+                       TaskCompletionSource<SqlDataReader> source = new TaskCompletionSource<SqlDataReader>();
+
+                       CancellationTokenRegistration registration = new CancellationTokenRegistration();
+                       if (cancellationToken.CanBeCanceled) {
+                               if (cancellationToken.IsCancellationRequested) {
+                                       source.SetCanceled();
+                                       return source.Task;
+                               }
+                               registration = cancellationToken.Register(CancelIgnoreFailure);
+                       }
+
+                       Task<SqlDataReader> returnedTask = source.Task;
+                       try {
+                               // TODO: RegisterForConnectionCloseNotification(ref returnedTask);
+
+                               Task<SqlDataReader>.Factory.FromAsync(BeginExecuteReaderAsync, EndExecuteReader, behavior, null).ContinueWith((t) => {
+                                       registration.Dispose();
+                                       if (t.IsFaulted) {
+                                               Exception e = t.Exception.InnerException;
+                                               source.SetException(e);
+                                       }
+                                       else {
+                                               if (t.IsCanceled) {
+                                                       source.SetCanceled();
+                                               }
+                                               else {
+                                                       source.SetResult(t.Result);
+                                               }
+                                       }
+                               }, TaskScheduler.Default);
+                       }
+                       catch (Exception e) {
+                               source.SetException(e);
+                       }
+
+                       return returnedTask;
+               }
+
+               public Task<XmlReader> ExecuteXmlReaderAsync ()
+               {
+                       return ExecuteXmlReaderAsync (CancellationToken.None);
+               }
+               public Task<XmlReader> ExecuteXmlReaderAsync (CancellationToken cancellationToken)
+               {
+                       TaskCompletionSource<XmlReader> source = new TaskCompletionSource<XmlReader>();
+
+                       CancellationTokenRegistration registration = new CancellationTokenRegistration();
+                       if (cancellationToken.CanBeCanceled) {
+                               if (cancellationToken.IsCancellationRequested) {
+                                       source.SetCanceled();
+                                       return source.Task;
+                               }
+                               registration = cancellationToken.Register(CancelIgnoreFailure);
+                       }
+
+                       Task<XmlReader> returnedTask = source.Task;
+                       try {
+                               // TODO: RegisterForConnectionCloseNotification(ref returnedTask);
+
+                               Task<XmlReader>.Factory.FromAsync(BeginExecuteXmlReader, EndExecuteXmlReader, null).ContinueWith((t) => {
+                                       registration.Dispose();
+                                       if (t.IsFaulted) {
+                                               Exception e = t.Exception.InnerException;
+                                               source.SetException(e);
+                                       }
+                                       else {
+                                               if (t.IsCanceled) {
+                                                       source.SetCanceled();
+                                               }
+                                               else {
+                                                       source.SetResult(t.Result);
+                                               }
+                                       }
+                               }, TaskScheduler.Default);
+                       }
+                       catch (Exception e) {
+                               source.SetException(e);
+                       }
+
+                       return returnedTask;
+               }
+
+               public
                override
-#endif // NET_2_0
                object ExecuteScalar ()
                {
                        try {
                                object result = null;
-                               ValidateCommand ("ExecuteScalar");
+                               ValidateCommand ("ExecuteScalar", false);
                                behavior = CommandBehavior.Default;
-                               try {
-                                       Execute (CommandBehavior.Default, true);
-                               }
-                               catch (TdsTimeoutException e) {
-                                       throw SqlException.FromTdsInternalException ((TdsInternalException) e);
-                               }
+                               Execute (true);
 
                                try {
                                        if (Connection.Tds.NextResult () && Connection.Tds.NextRow ())
@@ -538,25 +628,28 @@ namespace System.Data.SqlClient {
                                                Connection.Tds.SkipToEnd ();
                                                GetOutputParameters ();
                                        }
+                               } catch (TdsTimeoutException ex) {
+                                       Connection.Tds.Reset ();
+                                       throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                } catch (TdsInternalException ex) {
                                        Connection.Close ();
                                        throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                }
 
                                return result;
-                       }
-                       finally {
-                               CloseDataReader (true);
+                       } finally {
+                               CloseDataReader ();
                        }
                }
 
                public XmlReader ExecuteXmlReader ()
                {
-                       ValidateCommand ("ExecuteXmlReader");
+                       ValidateCommand ("ExecuteXmlReader", false);
                        behavior = CommandBehavior.Default;
                        try {
-                               Execute (CommandBehavior.Default, true);
+                               Execute (true);
                        } catch (TdsTimeoutException e) {
+                               Connection.Tds.Reset ();
                                throw SqlException.FromTdsInternalException ((TdsInternalException) e);
                        }
 
@@ -574,7 +667,8 @@ namespace System.Data.SqlClient {
 
                                int index = 0;
                                foreach (SqlParameter parameter in parameters) {
-                                       if (parameter.Direction != ParameterDirection.Input) {
+                                       if (parameter.Direction != ParameterDirection.Input &&
+                                           parameter.Direction != ParameterDirection.ReturnValue) {
                                                parameter.Value = list [index];
                                                index += 1;
                                        }
@@ -590,46 +684,31 @@ namespace System.Data.SqlClient {
 
                }
 
-#if !NET_2_0
-               IDbDataParameter IDbCommand.CreateParameter ()
-               {
-                       return CreateParameter ();
-               }
-
-               IDataReader IDbCommand.ExecuteReader ()
-               {
-                       return ExecuteReader ();
-               }
-
-               IDataReader IDbCommand.ExecuteReader (CommandBehavior behavior)
-               {
-                       return ExecuteReader (behavior);
-               }
-#endif
 
-#if NET_2_0
                protected override void Dispose (bool disposing)
                {
                        if (disposed) return;
                        if (disposing) {
                                parameters.Clear();
+                               if (Connection != null)
+                                       Connection.DataReader = null;
                        }
                        base.Dispose (disposing);
                        disposed = true;
                }
-#endif
 
-               public 
-#if NET_2_0
+               public
                override
-#endif // NET_2_0
                void Prepare ()
                {
-                       ValidateCommand ("Prepare");
+                       if (Connection == null)
+                               throw new NullReferenceException ();
 
-                       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 ();
@@ -651,37 +730,30 @@ namespace System.Data.SqlClient {
                        preparedStatement = null;
                }
 
-               private void ValidateCommand (string method)
+               private void ValidateCommand (string method, bool async)
                {
                        if (Connection == null)
-#if NET_2_0
-                               throw new NullReferenceException (String.Format ("{0} requires a Connection object to continue.", method));
-#else
-                               throw new InvalidOperationException (String.Format ("{0} requires a Connection object to continue.", method));
-#endif
-                       if (Connection.Transaction != null && transaction != Connection.Transaction)
-                               throw new InvalidOperationException ("The Connection object does not have the same transaction as the command object.");
+                               throw new InvalidOperationException (String.Format ("{0}: A Connection object is required to continue.", method));
+                       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.",
+                                       method));
+                       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)
-#if NET_2_0
-                               throw new NullReferenceException (String.Format ("ExecuteNonQuery requires an open Connection object to continue. This connection is closed.", method));
-#else
-                               throw new InvalidOperationException (String.Format ("ExecuteNonQuery requires an open Connection object to continue. This connection is closed.", method));
-#endif
+                               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.");
+                               throw new InvalidOperationException (String.Format ("{0}: CommandText has not been set for this Command.", method));
                        if (Connection.DataReader != null)
                                throw new InvalidOperationException ("There is already an open DataReader associated with this Connection which must be closed first.");
                        if (Connection.XmlReader != null)
                                throw new InvalidOperationException ("There is already an open XmlReader associated with this Connection which must be closed first.");
-#if NET_2_0
-                       if (method.StartsWith ("Begin") && !Connection.AsyncProcessing)
+                       if (async && !Connection.AsyncProcessing)
                                throw new InvalidOperationException ("This Connection object is not " + 
                                        "in Asynchronous mode. Use 'Asynchronous" +
                                        " Processing = true' to set it.");
-#endif // NET_2_0
                }
 
-#if NET_2_0
                protected override DbParameter CreateDbParameter ()
                {
                        return CreateParameter ();
@@ -705,11 +777,9 @@ namespace System.Data.SqlClient {
                        get { return Transaction; }
                        set { Transaction = (SqlTransaction) value; }
                }
-#endif // NET_2_0
 
                #endregion // Methods
 
-#if NET_2_0
                #region Asynchronous Methods
 
                internal IAsyncResult BeginExecuteInternal (CommandBehavior behavior, 
@@ -737,7 +807,6 @@ namespace System.Data.SqlClient {
                                        sql1.Append ("SET FMTONLY ON;");
                                        sql2.Append ("SET FMTONLY OFF;");
                                }
-
                                switch (CommandType) {
                                case CommandType.StoredProcedure:
                                        string prolog = "";
@@ -747,13 +816,16 @@ namespace System.Data.SqlClient {
                                        if (keyInfo || schemaOnly)
                                                epilog = sql2.ToString ();
                                        try {
-                                               Connection.Tds.BeginExecuteProcedure (prolog,
+                                               ar = Connection.Tds.BeginExecuteProcedure (prolog,
                                                                                      epilog,
                                                                                      CommandText,
                                                                                      !wantResults,
                                                                                      parms,
                                                                                      callback,
                                                                                      state);
+                                       } catch (TdsTimeoutException ex) {
+                                               Connection.Tds.Reset ();
+                                               throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                        } catch (TdsInternalException ex) {
                                                Connection.Close ();
                                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
@@ -766,6 +838,9 @@ namespace System.Data.SqlClient {
                                                        ar = Connection.Tds.BeginExecuteQuery (sql, parms, callback, state);
                                                else
                                                        ar = Connection.Tds.BeginExecuteNonQuery (sql, parms, callback, state);
+                                       } catch (TdsTimeoutException ex) {
+                                               Connection.Tds.Reset ();
+                                               throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                        } catch (TdsInternalException ex) {
                                                Connection.Close ();
                                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
@@ -776,6 +851,9 @@ namespace System.Data.SqlClient {
                        else {
                                try {
                                        Connection.Tds.ExecPrepared (preparedStatement, parms, CommandTimeout, wantResults);
+                               } catch (TdsTimeoutException ex) {
+                                       Connection.Tds.Reset ();
+                                       throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                } catch (TdsInternalException ex) {
                                        Connection.Close ();
                                        throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
@@ -796,24 +874,24 @@ namespace System.Data.SqlClient {
                        return BeginExecuteNonQuery (null, null);
                }
 
-               public IAsyncResult BeginExecuteNonQuery (AsyncCallback callback, object state)
+               public IAsyncResult BeginExecuteNonQuery (AsyncCallback callback, object stateObject)
                {
-                       ValidateCommand ("BeginExecuteNonQuery");
-                       SqlAsyncResult ar = new SqlAsyncResult (callback, state);
+                       ValidateCommand ("BeginExecuteNonQuery", true);
+                       SqlAsyncResult ar = new SqlAsyncResult (callback, stateObject);
                        ar.EndMethod = "EndExecuteNonQuery";
                        ar.InternalResult = BeginExecuteInternal (CommandBehavior.Default, false, ar.BubbleCallback, ar);
                        return ar;
                }
 
-               public int EndExecuteNonQuery (IAsyncResult ar)
+               public int EndExecuteNonQuery (IAsyncResult asyncResult)
                {
-                       ValidateAsyncResult (ar, "EndExecuteNonQuery");
-                       EndExecuteInternal (ar);
+                       ValidateAsyncResult (asyncResult, "EndExecuteNonQuery");
+                       EndExecuteInternal (asyncResult);
 
                        int ret = Connection.Tds.RecordsAffected;
 
                        GetOutputParameters ();
-                       ((SqlAsyncResult) ar).Ended = true;
+                       ((SqlAsyncResult) asyncResult).Ended = true;
                        return ret;
                }
 
@@ -827,55 +905,56 @@ namespace System.Data.SqlClient {
                        return BeginExecuteReader (null, null, behavior);
                }
 
-               public IAsyncResult BeginExecuteReader (AsyncCallback callback, object state)
+               public IAsyncResult BeginExecuteReader (AsyncCallback callback, object stateObject)
                {
-                       return BeginExecuteReader (callback, state, CommandBehavior.Default);
+                       return BeginExecuteReader (callback, stateObject, CommandBehavior.Default);
                }
 
-               public IAsyncResult BeginExecuteReader (AsyncCallback callback, object state, CommandBehavior behavior)
+               IAsyncResult BeginExecuteReaderAsync(CommandBehavior behavior, AsyncCallback callback, object stateObject)
                {
-                       ValidateCommand ("BeginExecuteReader");
+                       return BeginExecuteReader (callback, stateObject, behavior);
+               }
+
+               public IAsyncResult BeginExecuteReader (AsyncCallback callback, object stateObject, CommandBehavior behavior)
+               {
+                       ValidateCommand ("BeginExecuteReader", true);
                        this.behavior = behavior;
-                       SqlAsyncResult ar = new SqlAsyncResult (callback, state);
+                       SqlAsyncResult ar = new SqlAsyncResult (callback, stateObject);
                        ar.EndMethod = "EndExecuteReader";
                        IAsyncResult tdsResult = BeginExecuteInternal (behavior, true, 
-                               ar.BubbleCallback, state);
+                               ar.BubbleCallback, stateObject);
                        ar.InternalResult = tdsResult;
                        return ar;
                }
 
-               public SqlDataReader EndExecuteReader (IAsyncResult ar)
+               public SqlDataReader EndExecuteReader (IAsyncResult asyncResult)
                {
-                       ValidateAsyncResult (ar, "EndExecuteReader");
-                       EndExecuteInternal (ar);
+                       ValidateAsyncResult (asyncResult, "EndExecuteReader");
+                       EndExecuteInternal (asyncResult);
                        SqlDataReader reader = null;
                        try {
                                reader = new SqlDataReader (this);
                        } catch (TdsTimeoutException e) {
-                               // if behavior is closeconnection, even if it throws exception
-                               // the connection has to be closed.
-                               if ((behavior & CommandBehavior.CloseConnection) != 0)
-                                       Connection.Close ();
                                throw SqlException.FromTdsInternalException ((TdsInternalException) e);
-                       } catch (SqlException) {
+                       } catch (TdsInternalException e) {
                                // if behavior is closeconnection, even if it throws exception
                                // the connection has to be closed.
                                if ((behavior & CommandBehavior.CloseConnection) != 0)
                                        Connection.Close ();
-                               throw;
+                               throw SqlException.FromTdsInternalException ((TdsInternalException) e);
                        }
 
-                       ((SqlAsyncResult) ar).Ended = true;
+                       ((SqlAsyncResult) asyncResult).Ended = true;
                        return reader;
                }
 
-               public IAsyncResult BeginExecuteXmlReader (AsyncCallback callback, object state)
+               public IAsyncResult BeginExecuteXmlReader (AsyncCallback callback, object stateObject)
                {
-                       ValidateCommand ("BeginExecuteXmlReader");
-                       SqlAsyncResult ar = new SqlAsyncResult (callback, state);
+                       ValidateCommand ("BeginExecuteXmlReader", true);
+                       SqlAsyncResult ar = new SqlAsyncResult (callback, stateObject);
                        ar.EndMethod = "EndExecuteXmlReader";
                        ar.InternalResult = BeginExecuteInternal (behavior, true, 
-                               ar.BubbleCallback, state);
+                               ar.BubbleCallback, stateObject);
                        return ar;
                }
 
@@ -885,14 +964,14 @@ namespace System.Data.SqlClient {
                }
                
 
-               public XmlReader EndExecuteXmlReader (IAsyncResult ar)
+               public XmlReader EndExecuteXmlReader (IAsyncResult asyncResult)
                {
-                       ValidateAsyncResult (ar, "EndExecuteXmlReader");
-                       EndExecuteInternal (ar);
+                       ValidateAsyncResult (asyncResult, "EndExecuteXmlReader");
+                       EndExecuteInternal (asyncResult);
                        SqlDataReader reader = new SqlDataReader (this);
                        SqlXmlTextReader textReader = new SqlXmlTextReader (reader);
                        XmlReader xmlReader = new XmlTextReader (textReader);
-                       ((SqlAsyncResult) ar).Ended = true;
+                       ((SqlAsyncResult) asyncResult).Ended = true;
                        return xmlReader;
                }
 
@@ -915,7 +994,9 @@ namespace System.Data.SqlClient {
 
                #endregion // Asynchronous Methods
 
+#pragma warning disable 0067
+               // TODO: Not implemented
                public event StatementCompletedEventHandler StatementCompleted;
-#endif // NET_2_0
+#pragma warning restore
        }
 }