Duplex client has its own listener loop, so special care on reply is needed.

[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 4c45ac6c1d318379f8dada17349c75c0141ba963..b0962359876ee29436e75ccbf9974bb4459915db 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
@@ -434,10 +434,14 @@ namespace System.Data.SqlClient {
 
                        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);
@@ -453,6 +457,7 @@ 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 ();
@@ -513,6 +518,7 @@ namespace System.Data.SqlClient {
                                                // 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 ();
@@ -529,6 +535,7 @@ 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 ();
@@ -541,7 +548,8 @@ namespace System.Data.SqlClient {
                                try {
                                        Connection.Tds.ExecPrepared (preparedStatement, parms, CommandTimeout, wantResults);
                                } catch (TdsTimeoutException ex) {
-                                               throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
+                                       Connection.Tds.Reset ();
+                                       throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                } catch (TdsInternalException ex) {
                                        Connection.Close ();
                                        throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
@@ -563,6 +571,7 @@ namespace System.Data.SqlClient {
                                Execute (false);
                                result = Connection.Tds.RecordsAffected;
                        } catch (TdsTimeoutException e) {
+                               Connection.Tds.Reset ();
                                throw SqlException.FromTdsInternalException ((TdsInternalException) e);
                        }
 
@@ -583,10 +592,15 @@ namespace System.Data.SqlClient {
                        this.behavior = behavior;
                        if ((behavior & CommandBehavior.SequentialAccess) != 0)
                                Tds.SequentialAccess = true;
-                       Execute (true);
-                       Connection.DataReader = new SqlDataReader (this);
-                       
-                       return Connection.DataReader;
+                       try {
+                               Execute (true);
+                               Connection.DataReader = new SqlDataReader (this);
+                               return Connection.DataReader;
+                       } catch {
+                               if ((behavior & CommandBehavior.CloseConnection) != 0)
+                                       Connection.Close ();
+                               throw;
+                       }
                }
 
                public
@@ -614,6 +628,7 @@ namespace System.Data.SqlClient {
                                                GetOutputParameters ();
                                        }
                                } catch (TdsTimeoutException ex) {
+                                       Connection.Tds.Reset ();
                                        throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                } catch (TdsInternalException ex) {
                                        Connection.Close ();
@@ -633,6 +648,7 @@ namespace System.Data.SqlClient {
                        try {
                                Execute (true);
                        } catch (TdsTimeoutException e) {
+                               Connection.Tds.Reset ();
                                throw SqlException.FromTdsInternalException ((TdsInternalException) e);
                        }
 
@@ -690,6 +706,8 @@ namespace System.Data.SqlClient {
                        if (disposed) return;
                        if (disposing) {
                                parameters.Clear();
+                               if (Connection != null)
+                                       Connection.DataReader = null;
                        }
                        base.Dispose (disposing);
                        disposed = true;
@@ -750,7 +768,7 @@ namespace System.Data.SqlClient {
                        if (Connection.State != ConnectionState.Open)
                                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)
@@ -836,6 +854,7 @@ namespace System.Data.SqlClient {
                                                                                      callback,
                                                                                      state);
                                        } catch (TdsTimeoutException ex) {
+                                               Connection.Tds.Reset ();
                                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                        } catch (TdsInternalException ex) {
                                                Connection.Close ();
@@ -850,6 +869,7 @@ namespace System.Data.SqlClient {
                                                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 ();
@@ -862,6 +882,7 @@ namespace System.Data.SqlClient {
                                try {
                                        Connection.Tds.ExecPrepared (preparedStatement, parms, CommandTimeout, wantResults);
                                } catch (TdsTimeoutException ex) {
+                                       Connection.Tds.Reset ();
                                        throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                } catch (TdsInternalException ex) {
                                        Connection.Close ();