From: Sureshkumar T Date: Tue, 8 Mar 2005 08:38:20 +0000 (-0000) Subject: In System.Data.ProviderBase: X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=c04cfcb57cd6f51397149cd880b0868d5969731c;p=mono.git In System.Data.ProviderBase: 2005-03-08 Sureshkumar T * 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 * 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 9d1a83022be..a56e80c9dce 100755 --- 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 + + * 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 * 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 c599e1b5d28..3bbfdb168b1 100644 --- 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 b88ffc583be..f82c1640c51 100644 --- 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 67384d05b8c..e5e5f05fe22 100644 --- 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 19e37f950f3..650e8b36954 100644 --- 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 5ec78e949f8..6af0bb2ad37 100644 --- 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 8c2b9b17e6e..c0f8a64eae4 100755 --- 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 + + * 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 * 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 e3cb5779f32..41e31be2fea 100644 --- 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;