2008-06-09 Ankit Jain <jankit@novell.com>
authorMarek Habersack <grendel@twistedcode.net>
Tue, 10 Jun 2008 10:22:11 +0000 (10:22 -0000)
committerMarek Habersack <grendel@twistedcode.net>
Tue, 10 Jun 2008 10:22:11 +0000 (10:22 -0000)
        * Mono.Data.SybaseClient/SybaseCommand.cs: Use Tds instead of ITds now.
        * Mono.Data.SybaseClient/SybaseConnection.cs: Likewise.

2008-06-09  Ankit Jain  <jankit@novell.com>

        * ITds.cs: Removed.
        * Mono.Data.Tds.dll.sources: Update.

2008-06-09  Ankit Jain  <jankit@novell.com>

        * TdsCommand.cs, TdsConnection.cs: Use Tds instead of ITds now.

2008-06-09  Ankit Jain  <jankit@novell.com>

        * SqlCommand.cs: Use Tds instead of ITds now.
        * SqlConnection.cs:  Likewise.

svn path=/trunk/mcs/; revision=105402

19 files changed:
mcs/class/Mono.Data.SybaseClient/ChangeLog
mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseCommand.cs
mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseConnection.cs
mcs/class/Mono.Data.Tds/ChangeLog
mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog
mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ITds.cs [deleted file]
mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs
mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds42.cs
mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds50.cs
mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds70.cs
mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds80.cs
mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsConnectionPool.cs
mcs/class/Mono.Data.Tds/Mono.Data.Tds.dll.sources
mcs/class/Mono.Data.TdsClient/Mono.Data.TdsClient/ChangeLog
mcs/class/Mono.Data.TdsClient/Mono.Data.TdsClient/TdsCommand.cs
mcs/class/Mono.Data.TdsClient/Mono.Data.TdsClient/TdsConnection.cs
mcs/class/System.Data/System.Data.SqlClient/ChangeLog
mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs

index 1a982c9e784607369923bd0ebfb174ff9ad766e1..2caacf74ce794eac472614585adb3bee3ecfd649 100644 (file)
@@ -1,3 +1,8 @@
+2008-06-09  Ankit Jain  <jankit@novell.com>
+
+       * Mono.Data.SybaseClient/SybaseCommand.cs: Use Tds instead of ITds now.
+       * Mono.Data.SybaseClient/SybaseConnection.cs: Likewise.
+
 2006-12-20  Nagappan A  <anagappan@novell.com>
 
        * Mono.Data.SybaseClient/SybaseRowUpdatedEventArgs.cs
index ad31b479b1541418a74818d1e20f21ac6f469ded..0a38f5f721198fe507e5cc6e1c56bd3befb34342 100644 (file)
@@ -34,6 +34,8 @@
 
 using Mono.Data.Tds;
 using Mono.Data.Tds.Protocol;
+using MDTP = Mono.Data.Tds.Protocol;
+
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -148,7 +150,7 @@ namespace Mono.Data.SybaseClient {
                        get { return parameters; }
                }
 
-               internal ITds Tds {
+               internal MDTP.Tds Tds {
                        get { return Connection.Tds; }
                }
 
index 23a8c9cb2172bd4f935b504fb2c8eaba6ad0d870..8384ebb0bb4e3e86d7428a44ba525a6286e25b91 100644 (file)
@@ -31,6 +31,7 @@
 //
 
 using Mono.Data.Tds.Protocol;
+using MDTP = Mono.Data.Tds.Protocol;
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -77,7 +78,7 @@ namespace Mono.Data.SybaseClient {
                SybaseDataReader dataReader = null;
 
                // The TDS object
-               ITds tds;
+               MDTP.Tds tds;
 
                #endregion // Fields
 
@@ -131,7 +132,7 @@ namespace Mono.Data.SybaseClient {
                        get { return state; }
                }
 
-               internal ITds Tds {
+               internal MDTP.Tds Tds {
                        get { return tds; }
                }
 
index 1b100f0c7f387dfc2db50c51a17fd821d3af8ef6..4cf5f9e9a7d464f37b28757b12a0d5a7624e503b 100644 (file)
@@ -1,3 +1,8 @@
+2008-06-09  Ankit Jain  <jankit@novell.com>
+
+       * ITds.cs: Removed.
+       * Mono.Data.Tds.dll.sources: Update.
+
 2007-07-22  Nagappan A  <anagappan@novell.com>
 
        * Mono.Data.Tds.dll.sources: Added
index 29fd323e74736e7f4d83dfce7cd498bd5ac58fae..746d26e31a02aaf87b06b84fa70dae4ae3cec5df 100644 (file)
@@ -1,3 +1,11 @@
+2008-06-09  Ankit Jain  <jankit@novell.com>
+
+       Tds class doesn't need to inherit Component or implement ITds, fix.
+       * Tds.cs: Update
+       * Tds42.cs, Tds50.cs, Tds70.cs, Tds80.cs:
+       Make Tds-derived classes sealed.
+       * TdsConnectionPool.cs: Update.
+
 2008-05-17  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * Tds.cs: Do not return 0 for decimal/numeric columns with value NULL.
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ITds.cs b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ITds.cs
deleted file mode 100644 (file)
index 900b581..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// Mono.Data.Tds.Protocol.ITds.cs
-//
-// Author:
-//   Tim Coleman (tim@timcoleman.com)
-//
-// Copyright (C) 2002 Tim Coleman
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Mono.Data.Tds;
-using System;
-using System.Collections;
-
-namespace Mono.Data.Tds.Protocol {
-        public interface ITds 
-       {
-               #region Properties
-
-               string Database {
-                       get;
-               }
-
-               bool DoneProc {
-                       get;
-               }
-
-               bool IsConnected {
-                       get;
-               }
-               
-               bool Pooling {
-                       get;
-                       set;
-               }
-               
-               string ServerVersion {
-                       get;
-               }
-
-               TdsDataColumnCollection Columns {
-                       get;
-               }
-
-               TdsDataRow ColumnValues {
-                       get;
-               }
-
-               ArrayList OutputParameters {
-                       get;    
-                       set;
-               }
-
-               int RecordsAffected {
-                       get;
-                       set;
-               }
-
-               bool SequentialAccess {
-                       get;
-                       set;
-               }
-
-               #endregion // Properties
-
-               #region Methods
-
-               void Cancel ();
-               bool Connect (TdsConnectionParameters connectionParameters);
-               void Disconnect ();
-               bool Reset ();
-
-               void Execute (string commandText);
-               void ExecProc (string procedure);
-
-               void Execute (string commandText, TdsMetaParameterCollection parameters, int timeout, bool wantResults);
-               void ExecPrepared (string statementId, TdsMetaParameterCollection parameters, int timeout, bool wantResults);
-               void ExecProc (string procedure, TdsMetaParameterCollection parameters, int timeout, bool wantResults);
-
-               bool NextResult ();
-               bool NextRow ();
-
-               string Prepare (string commandText, TdsMetaParameterCollection parameters);
-
-               void SkipToEnd ();
-
-               void Unprepare (string statementId);
-
-               #endregion
-
-               #region Events
-
-               event TdsInternalErrorMessageEventHandler TdsErrorMessage;
-               event TdsInternalInfoMessageEventHandler TdsInfoMessage;
-
-               #endregion // Events
-
-#if NET_2_0
-                #region Asynchronous Methods
-                IAsyncResult BeginExecuteNonQuery (string sql,
-                                                   TdsMetaParameterCollection parameters,
-                                                   AsyncCallback callback,
-                                                   object state);
-                void EndExecuteNonQuery (IAsyncResult ar);
-                IAsyncResult BeginExecuteQuery (string sql,
-                                                   TdsMetaParameterCollection parameters,
-                                                   AsyncCallback callback,
-                                                   object state);
-                void EndExecuteQuery (IAsyncResult ar);
-
-                IAsyncResult BeginExecuteProcedure (string prolog,
-                                                                    string epilog,
-                                                                    string cmdText,
-                                                                    bool IsNonQuery,
-                                                                    TdsMetaParameterCollection parameters,
-                                                                    AsyncCallback callback,
-                                                                    object state);
-                void EndExecuteProcedure (IAsyncResult ar);
-
-                void WaitFor (IAsyncResult ar);
-                void CheckAndThrowException (IAsyncResult ar);
-
-                #endregion //Asynchronous Methods
-#endif // NET_2_0
-
-       }
-}
index 02d3e4befe48abeeb6c2fd62a7e35850bbf28ccc..64da8d06ae52592f401bdcf2662ce0812acafe69 100644 (file)
@@ -44,7 +44,7 @@ using System.Text;
 
 namespace Mono.Data.Tds.Protocol
 {
-       public abstract class Tds : Component, ITds
+       public abstract class Tds
        {
                #region Fields
 
@@ -754,11 +754,11 @@ namespace Mono.Data.Tds.Protocol
                                }
 
                                element = GetDecimalValue (precision, scale);
-
+                               
                                // workaround for fact that TDS 7.0 returns
                                // bigint as decimal (19,0), and client code
                                // expects it to be returned as a long
-                               if (tdsVersion == TdsVersion.tds70 && scale == 0 && precision == 19) {
+                               if (scale == 0 && precision <= 19) {
                                        if (!(element is System.DBNull))
                                                element = Convert.ToInt64 (element);
                                }
index 4c1f5a94c45ee790d26e7598d934f31f33f861a2..ecf0168d99b4b98576f37fa0bc921d04a20685f7 100644 (file)
@@ -31,7 +31,7 @@
 using System;
 
 namespace Mono.Data.Tds.Protocol {
-        public class Tds42 : Tds
+        public sealed class Tds42 : Tds
        {
                #region Fields
 
index 7eb9a61e74c00da445d77bccea602c7f6d866c6c..ccaf0395d0364bc06074e1c408b114bb626b6b33 100644 (file)
@@ -34,7 +34,7 @@ using System.Text;
 
 namespace Mono.Data.Tds.Protocol {
        [MonoTODO ("FIXME: Can packetsize be anything other than 512?")]
-        public class Tds50 : Tds
+        public sealed class Tds50 : Tds
        {
                #region Fields
 
index 8966b648b5ac45194b3e46be36dcd37368a02f86..63698c611e9ece1e6001707189a7a9b653ae32c8 100644 (file)
@@ -38,7 +38,7 @@ using System;
 using System.Text;
 
 namespace Mono.Data.Tds.Protocol {
-        public class Tds70 : Tds
+        public sealed class Tds70 : Tds
        {
                #region Fields
 
index 4349571eba41585f2c3e8f52ff7841886326d54a..0e13b39001b48eaac90a1835706f0f4ef7ac6f8a 100644 (file)
@@ -32,7 +32,7 @@ using Mono.Data.Tds;
 using System;
 
 namespace Mono.Data.Tds.Protocol {
-        public class Tds80 : Tds
+        public sealed class Tds80 : Tds
        {
                #region Fields
 
index ea1a94798f60c51058712e8ef5e09a67f4f341ce..0752c5d1cfad2cf2e0d26f52b94d1ea9a79348a8 100644 (file)
@@ -66,7 +66,7 @@ namespace Mono.Data.Tds.Protocol
                        }
                }
                
-               public virtual ITds CreateConnection (TdsConnectionInfo info)
+               public virtual Tds CreateConnection (TdsConnectionInfo info)
                {
                        switch (version)
                        {
@@ -125,9 +125,9 @@ namespace Mono.Data.Tds.Protocol
 
                #region Methods
 
-               public ITds GetConnection ()
+               public Tds GetConnection ()
                {
-                       ITds connection = null;
+                       Tds connection = null;
                        lock (list)
                        {
                                if (!initialized) 
@@ -140,7 +140,7 @@ namespace Mono.Data.Tds.Protocol
                                        if (list.Count > 0)
                                        {
                                                // There are available connections
-                                               connection = (ITds) list [list.Count - 1];
+                                               connection = (Tds) list [list.Count - 1];
                                                list.RemoveAt (list.Count - 1);
                                                if (!connection.Reset ()) {
                                                        try {
@@ -171,7 +171,7 @@ namespace Mono.Data.Tds.Protocol
                        return connection;
                }
 
-               public void ReleaseConnection (ITds tds)
+               public void ReleaseConnection (Tds tds)
                {
                        lock (list)
                        {
@@ -181,7 +181,7 @@ namespace Mono.Data.Tds.Protocol
                }
 
 #if NET_2_0
-               public void ReleaseConnection (ref ITds tds)
+               public void ReleaseConnection (ref Tds tds)
                {
                        lock (list)
                        {
@@ -201,10 +201,10 @@ namespace Mono.Data.Tds.Protocol
                {
                        lock (list)
                        {
-                               ITds connection = null;
+                               Tds connection = null;
                                while (list.Count > 0) {
                                        // There are available connections
-                                       connection = (ITds) list [list.Count - 1];
+                                       connection = (Tds) list [list.Count - 1];
                                        list.RemoveAt (list.Count - 1);
                                        if (!connection.Reset ()) {
                                                try {
@@ -216,7 +216,7 @@ namespace Mono.Data.Tds.Protocol
                        }
                }
 
-               public void ResetConnectionPool (ITds connection)
+               public void ResetConnectionPool (Tds connection)
                {
                        lock (list)
                        {
@@ -237,7 +237,7 @@ namespace Mono.Data.Tds.Protocol
                }
 #endif
                
-               ITds CreateConnection ()
+               Tds CreateConnection ()
                {
                        activeConnections++;
                        return manager.CreateConnection (info);
index 94a877f56c9fa8c02adaadb51a9a1992d57d8236..a86c0af32ed90b959ded2b5f807562467e827151 100644 (file)
@@ -4,7 +4,6 @@ Assembly/AssemblyInfo.cs
 Mono.Data.Tds/TdsMetaParameter.cs
 Mono.Data.Tds/TdsMetaParameterCollection.cs
 Mono.Data.Tds/TdsParameterDirection.cs
-Mono.Data.Tds.Protocol/ITds.cs
 Mono.Data.Tds.Protocol/Tds.cs
 Mono.Data.Tds.Protocol/Tds42.cs
 Mono.Data.Tds.Protocol/Tds50.cs
index e5d19cab8df04aa65817db656ebfd59ae19c13f7..7605da7296c4d8ff6ff7d5d1f4cbe905f438a9b7 100644 (file)
@@ -1,3 +1,7 @@
+2008-06-09  Ankit Jain  <jankit@novell.com>
+
+       * TdsCommand.cs, TdsConnection.cs: Use Tds instead of ITds now.
+
 2004-04-05  Lluis Sanchez Gual  <lluis@ximian.com>
 
        * TdsConnection.cs: Use the connection pool implemented in Mono.Data.Tds.
index 4a25e4c58bdb1c84c471c9c295d28c04b43c060f..a41e130600ae8bc64fa4cb369422963807e39a2e 100644 (file)
@@ -34,6 +34,7 @@
 
 using Mono.Data.Tds;
 using Mono.Data.Tds.Protocol;
+using MDTP = Mono.Data.Tds.Protocol;
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -143,7 +144,7 @@ namespace Mono.Data.TdsClient {
                        get { return parameters; }
                }
 
-               internal ITds Tds {
+               internal MDTP.Tds Tds {
                        get { return Connection.Tds; }
                }
 
index d316de4328c7b986a2d67efc215c0ac109f34f47..6639b49009e437ef2d1a75c52eeb95249e3e789d 100644 (file)
@@ -31,6 +31,7 @@
 //
 
 using Mono.Data.Tds.Protocol;
+using MDTP = Mono.Data.Tds.Protocol;
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -77,7 +78,7 @@ namespace Mono.Data.TdsClient {
                TdsDataReader dataReader = null;
 
                // The TDS object
-               ITds tds;
+               MDTP.Tds tds;
 
                #endregion // Fields
 
@@ -131,7 +132,7 @@ namespace Mono.Data.TdsClient {
                        get { return state; }
                }
 
-               internal ITds Tds {
+               internal MDTP.Tds Tds {
                        get { return tds; }
                }
 
index d5e5851f9e39833f7a23b217757812f23b960344..cedf20b15d2abd89f30ff06fadeeb381c4e90cf1 100644 (file)
@@ -1,3 +1,8 @@
+2008-06-09  Ankit Jain  <jankit@novell.com>
+
+       * SqlCommand.cs: Use Tds instead of ITds now.
+       * SqlConnection.cs:  Likewise.
+
 2008-05-27  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * SqlConnection.cs: Added support for '.' as alias for localhost.
index 05ea6e952d652a6965b5bad375e4c4e972f44603..a88ff4eff46d52116db1ba13d74bf79a4b6aa292 100644 (file)
@@ -249,7 +249,7 @@ namespace System.Data.SqlClient {
                        get { return parameters; }
                }
 
-               internal ITds Tds {
+               internal Tds Tds {
                        get { return Connection.Tds; }
                }
 
index 7917a9d713ce5967baec4ec5203b29bd337a97f7..9255b87f208fbe7ccfde1fc659e9ea8156547dae 100644 (file)
@@ -109,7 +109,7 @@ namespace System.Data.SqlClient
                XmlReader xmlReader;
 
                // The TDS object
-               ITds tds;
+               Tds tds;
 
                #endregion // Fields
 
@@ -252,7 +252,7 @@ namespace System.Data.SqlClient
                        get { return state; }
                }
 
-               internal ITds Tds {
+               internal Tds Tds {
                        get { return tds; }
                }
 
@@ -1703,7 +1703,7 @@ namespace System.Data.SqlClient
                        foreach (TdsConnectionPool pool in pools.Values) {
                                if (pool != null) {
                                        pool.ResetConnectionPool ();
-                                       ITds tds = pool.GetConnection ();
+                                       Tds tds = pool.GetConnection ();
                                        tds.Pooling = false;
                                }
                        }