2002-06-02 Rodrigo Moya <rodrigo@ximian.com>

	* OleDbTransaction.cs (Dispose): added missing method.

	* OleDbCommand.cs (Clone): added missing methods.
	(Parameters, Transaction, Connection): made these overload
	IDbCommand's ones.

	* OleDbParameterCollection.cs (IndexOf, Remove, RemoveAt):
	call m_list methods, not own ones.

	* OleDbParameter.cs: more implementation.

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

diff --git a/mcs/class/System.Data/System.Data.OleDb/ChangeLog b/mcs/class/System.Data/System.Data.OleDb/ChangeLog
index 0c1ae7550e1b36be427bbe7398717070a3c8f99f..41e117a3e28db85e230bee069747c86ccb724ed8 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb/ChangeLog
+++ b/mcs/class/System.Data/System.Data.OleDb/ChangeLog
@@ -1,3 +1,16 @@
+2002-06-02  Rodrigo Moya <rodrigo@ximian.com>
+
+       * OleDbTransaction.cs (Dispose): added missing method.
+
+       * OleDbCommand.cs (Clone): added missing methods.
+       (Parameters, Transaction, Connection): made these overload
+       IDbCommand's ones.
+
+       * OleDbParameterCollection.cs (IndexOf, Remove, RemoveAt):
+       call m_list methods, not own ones.
+
+       * OleDbParameter.cs: more implementation.
+       
 2002-06-02  Rodrigo Moya <rodrigo@ximian.com>
 
        * OleDbTransaction.cs (Connection, IsolationLevel, Begin,

diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
index bff6cd5e35c95114f583040e8e4925471dcdfc9a..15cc1a2bda4c077bf44e90a0e48705aebd9c0b17 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
@@ -25,6 +25,10 @@ namespace System.Data.OleDb
                private CommandType m_type = CommandType.Text;
                private OleDbParameterCollection m_parameters;
 
+               /*
+                * Constructors
+                */
+               
                public OleDbCommand ()
                {
                        m_parameters = new OleDbParameterCollection ();
@@ -50,6 +54,10 @@ namespace System.Data.OleDb
                        m_transaction = xtrans;
                }
 
+               /*
+                * Properties
+                */
+               
                string IDbCommand.CommandText
                {
                        get {
@@ -80,13 +88,13 @@ namespace System.Data.OleDb
                        }
                }
 
-               public OleDbConnection Connection
+               IDbConnection IDbCommand.Connection
                {
                        get {
                                return m_connection;
                        }
                        set {
-                               m_connection = value;
+                               m_connection = (OleDbConnection) value;
                        }
                }
 
@@ -102,20 +110,20 @@ namespace System.Data.OleDb
                        }
                }
 
-               public OleDbParameterCollection Parameters
+               IDataParameterCollection IDbCommand.Parameters
                {
                        get {
                                return m_parameters;
                        }
                }
 
-               public OleDbTransaction Transaction
+               IDbTransaction IDbCommand.Transaction
                {
                        get {
                                return m_transaction;
                        }
                        set {
-                               m_transaction = value;
+                               m_transaction = (OleDbTransaction) value;
                        }
                }
 
@@ -131,12 +139,22 @@ namespace System.Data.OleDb
                        }
                }
 
+               /*
+                * Methods
+                */
+               
                [MonoTODO]
                void IDbCommand.Cancel ()
                {
                        throw new NotImplementedException ();
                }
 
+               [MonoTODO]
+               object ICloneable.Clone ()
+               {
+                       throw new NotImplementedException ();
+               }
+               
                IDbDataParameter IDbCommand.CreateParameter ()
                {
                        return new OleDbParameter ();

diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbParameter.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbParameter.cs
index 2ba48b776f4040d86aae591a5e63849eb970a94d..02aaf32d60bc4bee11eed6fe5f18602bf31220e1 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbParameter.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbParameter.cs
@@ -15,13 +15,23 @@ namespace System.Data.OleDb
        public sealed class OleDbParameter : MarshalByRefObject,
                IDbDataParameter, IDataParameter, ICloneable
        {
-               private string m_name;
-               private object m_value;
+               private string m_name = null;
+               private object m_value = null;
+               private int m_size = 0;
+               private bool m_isNullable = true;
+               private byte m_precision = 0;
+               private byte m_scale = 0;
+               private DataRowVersion m_sourceVersion;
+               private string m_sourceColumn = null;
+               private ParameterDirection m_direction;
+               private DbType m_type;
+
+               /*
+                * Constructors
+                */
                
                public OleDbParameter ()
                {
-                       m_name = null;
-                       m_value = null;
                }
 
                public OleDbParameter (string name, object value) : this ()
@@ -30,32 +40,78 @@ namespace System.Data.OleDb
                        m_value = value;
                }
 
-               public OleDbParameter (string name, OleDbType type)
+               public OleDbParameter (string name, OleDbType type) : this ()
                {
+                       m_name = name;
+                       m_type = (DbType) type;
                }
 
                public OleDbParameter (string name, OleDbType type, int width)
+                       : this (name, type)
                {
+                       m_size = width;
                }
 
                public OleDbParameter (string name, OleDbType type,
                                       int width, string src_col)
+                       : this (name, type, width)
                {
+                       m_name = name;
+                       m_type = (DbType) type;
+                       m_size = width;
+                       m_sourceColumn = src_col;
                }
 
                public OleDbParameter(string name, OleDbType type,
-                                     int with, ParameterDirection direction,
+                                     int width, ParameterDirection direction,
                                      bool is_nullable, byte precision,
                                      byte scale, string src_col,
                                      DataRowVersion src_version, object value)
+                       : this (name, type, width, src_col)
                {
+                       m_direction = direction;
+                       m_isNullable = is_nullable;
+                       m_precision = precision;
+                       m_scale = scale;
+                       m_sourceVersion = src_version;
+                       m_value = value;
                }
 
                /*
                 * Properties
                 */
 
-               public string ParameterName
+               DbType IDataParameter.DbType
+               {
+                       get {
+                               return m_type;
+                       }
+                       set {
+                               m_type = value;
+                       }
+               }
+               
+               ParameterDirection IDataParameter.Direction
+               {
+                       get {
+                               return m_direction;
+                       }
+                       set {
+                               m_direction = value;
+                       }
+               }
+               
+               bool IDataParameter.IsNullable
+               {
+                       get {
+                               return m_isNullable;
+                       }
+                       set {
+                               m_isNullable = value;
+                       }
+               }
+               
+               string IDataParameter.ParameterName
                {
                        get {
                                return m_name;
@@ -64,5 +120,75 @@ namespace System.Data.OleDb
                                m_name = value;
                        }
                }
+
+               byte IDbDataParameter.Precision
+               {
+                       get {
+                               return m_precision;
+                       }
+                       set {
+                               m_precision = value;
+                       }
+               }
+               
+               byte IDbDataParameter.Scale
+               {
+                       get {
+                               return m_scale;
+                       }
+                       set {
+                               m_scale = value;
+                       }
+               }
+               
+               int IDbDataParameter.Size
+               {
+                       get {
+                               return m_size;
+                       }
+                       set {
+                               m_size = value;
+                       }
+               }
+
+               string IDataParameter.SourceColumn
+               {
+                       get {
+                               return m_sourceColumn;
+                       }
+                       set {
+                               m_sourceColumn = value;
+                       }
+               }
+               
+               DataRowVersion IDataParameter.SourceVersion
+               {
+                       get {
+                               return m_sourceVersion;
+                       }
+                       set {
+                               m_sourceVersion = value;
+                       }
+               }
+               
+               object IDataParameter.Value
+               {
+                       get {
+                               return m_value;
+                       }
+                       set {
+                               m_value = value;
+                       }
+               }
+
+               /*
+                * Methods
+                */
+
+               [MonoTODO]
+               object ICloneable.Clone ()
+               {
+                       throw new NotImplementedException ();
+               }
        }
 }

diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs
index 257403b65436b6d3ed8b2d423743cdb16e84fe51..c31b7ed400402e3a6f83dd3c6ed03de53abe1e3b 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs
@@ -28,17 +28,17 @@ namespace System.Data.OleDb
                        }
                }
 
-               public OleDbParameter this[int index]
+               public IDataParameter this[int index]
                {
                        get {
-                               return m_list[index];
+                               return (OleDbParameter) m_list[index];
                        }
                        set {
                                m_list[index] = value;
                        }
                }
 
-               public OleDbParameter this[string name]
+               public object this[string name]
                {
                        [MonoTODO]
                        get {
@@ -105,7 +105,7 @@ namespace System.Data.OleDb
 
                bool IList.Contains (object value)
                {
-                       return list.Contains (value);
+                       return m_list.Contains (value);
                }
 
                bool IDataParameterCollection.Contains (string value)
@@ -133,7 +133,7 @@ namespace System.Data.OleDb
 
                int IDataParameterCollection.IndexOf (string name)
                {
-                       return IndexOf ((object) this[name]);
+                       return m_list.IndexOf ((object) this[name]);
                }
 
                void IList.Insert (int index, object value)
@@ -148,12 +148,12 @@ namespace System.Data.OleDb
 
                void IList.RemoveAt (int index)
                {
-                       Remove (m_list[index]);
+                       m_list.Remove ((object) m_list[index]);
                }
 
                void IDataParameterCollection.RemoveAt (string name)
                {
-                       Remove (this[name]);
+                       m_list.Remove ((object) this[name]);
                }
        }
 }

diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbTransaction.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbTransaction.cs
index 06f9fa7398261a7ce0cb7839e603af7e6bfc9623..b3eb2c672f5959580b0ababf1b4097190bf8a411 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbTransaction.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbTransaction.cs
@@ -83,5 +83,11 @@ namespace System.Data.OleDb
                                    null))
                                throw new InvalidOperationException ();
                }
+
+               [MonoTODO]
+               void IDisposable.Dispose ()
+               {
+                       throw new NotImplementedException ();
+               }
        }
 }