In System.Data.ProviderBase:

2005-03-08  Sureshkumar T  <tsureshkumar@novell.com>

	* DbParameterBase.cs: Implemented most of get set methods.
	* DbConnectionBase.cs: Commented ConnectionOptions creation,
	because it is not yet implemented.
	* DbCommandBase.cs: Implemented ExecuteScalar method.
	* DbParameterCollectionBase.cs: Implemented Add method.
	* DbDataReaderBase.cs: removed internal constructor DbDataReader
	(DbCommand).

In System.Data.SqlClient:
2005-03-08  Sureshkumar T  <tsureshkumar@novell.com>

	* SqlDataReader.cs: Call base constructor with CommandBehavior
	parameter instead of passing DbCommand object. The internal base
	class with DbCommand Parameter is removed.

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

diff --git a/mcs/class/System.Data/System.Data.ProviderBase/ChangeLog b/mcs/class/System.Data/System.Data.ProviderBase/ChangeLog
index 9d1a83022be475a9a032396e8ccdc2fa53593ef7..a56e80c9dce20cdf54cf36a308e4bbd7601a9bc1 100755 (executable)
--- a/mcs/class/System.Data/System.Data.ProviderBase/ChangeLog
+++ b/mcs/class/System.Data/System.Data.ProviderBase/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-08  Sureshkumar T  <tsureshkumar@novell.com>
+
+       * DbParameterBase.cs: Implemented most of get set methods.
+       * DbConnectionBase.cs: Commented ConnectionOptions creation,
+       because it is not yet implemented.
+       * DbCommandBase.cs: Implemented ExecuteScalar method.
+       * DbParameterCollectionBase.cs: Implemented Add method.
+       * DbDataReaderBase.cs: removed internal constructor DbDataReader
+       (DbCommand).
+
 2005-03-02  Sureshkumar T  <tsureshkumar@novell.com>
 
        * DbConnectionBase.cs: CreateDbCommand: assign connection to the

diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs
index c599e1b5d28fa5f3c4673ca3b2b5c4d5e569273a..3bbfdb168b1b35d0c51c2352105112805a83f6c4 100644 (file)
--- a/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs
@@ -109,10 +109,17 @@ namespace System.Data.ProviderBase {
                        return reader.RecordsAffected;
                }
 
-               [MonoTODO]
                public override object ExecuteScalar ()
                {
-                       throw new NotImplementedException ();
+                        object val = null;
+                        DbDataReader reader=ExecuteReader();
+                       try {
+                               if (reader.Read ())
+                                       val=reader[0];
+                       } finally {
+                               reader.Close();
+                       }
+                        return val;
                }
 
                [MonoTODO]

diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs
index b88ffc583be0fc49da360e56625e2f67aa2ecf04..f82c1640c5133a346b54b77940cc72dfdba2e440 100644 (file)
--- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs
@@ -81,11 +81,10 @@ namespace System.Data.ProviderBase {
                        get { return connectionOptions; }
                }
 
-               [MonoTODO]
                public override string ConnectionString {
                        get { return connectionString; }
                        set { 
-                               connectionOptions = ConnectionFactory.CreateConnectionOptionsInternal (value);
+                               //connectionOptions = ConnectionFactory.CreateConnectionOptionsInternal (value);
                                connectionString = value;
                        }
                }

diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs
index 67384d05b8cf0dccda5e4e59f227babf4cb2fa9e..e5e5f05fe2256bc26384f2df6da15cc021af5fd5 100644 (file)
--- a/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs
@@ -52,11 +52,6 @@ namespace System.Data.ProviderBase {
                        this.behavior = behavior;
                }
 
-                internal DbDataReaderBase (DbCommand command)
-                {
-                        
-                }
-
                #endregion // Constructors
 
                #region Properties

diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs
index 19e37f950f3f564e13c112846d0a6dfa1b18881e..650e8b36954c43c65b3e554d486f86e98d38d5f7 100644 (file)
--- a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs
@@ -2,11 +2,11 @@
 // System.Data.ProviderBase.DbParameterBase
 //
 // Author:
+//   Sureshkumar T (tsureshkumar@novell.com)
 //   Tim Coleman (tim@timcoleman.com)
 //
 // Copyright (C) Tim Coleman, 2003
 //
-
 //
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
@@ -37,6 +37,21 @@ using System.Data.Common;
 namespace System.Data.ProviderBase {
        public abstract class DbParameterBase : DbParameter
        {
+
+                #region Fields
+                string _name;
+                ParameterDirection _direction = ParameterDirection.Input;
+                bool _isNullable = false;
+               int _size;
+               byte _precision;
+               byte _scale;
+                object _paramValue;
+                int _offset;
+               DataRowVersion _sourceVersion;
+               string _sourceColumn;
+
+                #endregion // Fields
+
                #region Constructors
        
                [MonoTODO]
@@ -58,64 +73,60 @@ namespace System.Data.ProviderBase {
                        get { throw new NotImplementedException (); }
                }
 
-               [MonoTODO]
-               public override ParameterDirection Direction {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
+                public override ParameterDirection Direction {
+                       get { return _direction; }
+                       set { _direction = value; }
                }
 
-               [MonoTODO]
                public override bool IsNullable {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
+                       get { return _isNullable; }
+                       set { _isNullable = value; }
                }
 
-               [MonoTODO]
+               
                public override int Offset {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
+                       get { return _offset; }
+                       set { _offset = value; }                        
                }
 
-               [MonoTODO]
                public override string ParameterName {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
+                       get { return _name; }
+                       set { _name = value; }
                }
 
-               [MonoTODO]
                public override byte Precision {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
+                       get { return _precision; }
+                       set { _precision = value; }
+
                }
 
-               [MonoTODO]
                public override byte Scale {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
+                       get { return _scale; }
+                       set { _scale = value; }
+
                }
 
-               [MonoTODO]
                public override int Size {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
+                       get { return _size; }
+                       set { _size = value; }
                }
 
-               [MonoTODO]
+               
                public override string SourceColumn {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
+                       get { return _sourceColumn; }
+                       set { _sourceColumn = value; }
                }
 
-               [MonoTODO]
+               
                public override DataRowVersion SourceVersion {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
+                       get { return _sourceVersion; }
+                       set { _sourceVersion = value; }
                }
 
-               [MonoTODO]
+               
                public override object Value {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
+                       get { return _paramValue; }
+                       set { _paramValue = value; }
                }
 
                #endregion // Properties

diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs
index 5ec78e949f8fccd214f278ad766f4aa7221d8bfb..6af0bb2ad37d957051320c001a9f6ae3656a3d00 100644 (file)
--- a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs
@@ -87,11 +87,10 @@ namespace System.Data.ProviderBase {
 
                #region Methods
 
-               [MonoTODO]
                public override int Add (object value)
                {
                        ValidateType (value);
-                       throw new NotImplementedException ();
+                        return list.Add (value);
                }
 
                public override void AddRange (Array values)

diff --git a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
index 8c2b9b17e6e7f1f9a173540360fc44c7aff2a3ee..c0f8a64eae4420e90807809bc147da1c67772a1e 100755 (executable)
--- a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-08  Sureshkumar T  <tsureshkumar@novell.com>
+
+       * SqlDataReader.cs: Call base constructor with CommandBehavior
+       parameter instead of passing DbCommand object. The internal base
+       class with DbCommand Parameter is removed.
+
 2005-03-07  Sureshkumar T  <tsureshkumar@novell.com>
 
        * SqlCommand.cs : Set CommandBehavior on

diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
index e3cb5779f325ee4fe49d35b9526b05a7467962d3..41e31be2feae86c5c6339d295900d00d13dd28f3 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
@@ -75,7 +75,7 @@ namespace System.Data.SqlClient {
 
                internal SqlDataReader (SqlCommand command) 
 #if NET_2_0
-                        : base ((DbCommand) command)
+                        : base (command.CommandBehavior)
 #endif // NET_2_0
                {
                        readResult = false;