Author: gert
Date: 2007-07-01 09:39:50 -0400 (Sun, 01 Jul 2007)
New Revision: 81145
Modified:
trunk/mcs/class/System.Data/System.Data.OleDb/ChangeLog
trunk/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
Log:
* OleDbCommand.cs: 2.0 API fixes. Build fix.
Modified: trunk/mcs/class/System.Data/System.Data.OleDb/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb/ChangeLog 2007-07-01
12:51:16 UTC (rev 81144)
+++ trunk/mcs/class/System.Data/System.Data.OleDb/ChangeLog 2007-07-01
13:39:50 UTC (rev 81145)
@@ -1,5 +1,9 @@
2007-07-01 Gert Driesen <[EMAIL PROTECTED]>
+ * OleDbCommand.cs: 2.0 API fixes. Build fix.
+
+2007-07-01 Gert Driesen <[EMAIL PROTECTED]>
+
* OleDbCommand.cs: Code formatting.
* OleDbDataReader.cs: Code formatting.
* OleDbError.cs: Code formatting.
Modified: trunk/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
2007-07-01 12:51:16 UTC (rev 81144)
+++ trunk/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
2007-07-01 13:39:50 UTC (rev 81145)
@@ -45,6 +45,9 @@
/// </summary>
[DesignerAttribute ("Microsoft.VSDesigner.Data.VS.OleDbCommandDesigner,
"+ Consts.AssemblyMicrosoft_VSDesigner,
"System.ComponentModel.Design.IDesigner")]
[ToolboxItemAttribute ("System.Drawing.Design.ToolboxItem, "+
Consts.AssemblySystem_Drawing)]
+#if NET_2_0
+ [DefaultEvent( "RecordsAffected")]
+#endif
public sealed class OleDbCommand :
#if NET_2_0
DbCommand
@@ -75,11 +78,7 @@
commandText = String.Empty;
timeout = 30; // default timeout per .NET
commandType = CommandType.Text;
- connection ;
parameters = new OleDbParameterCollection ();
- transaction;
- designTimeVisible;
- dataReader;
behavior = CommandBehavior.Default;
gdaCommand = IntPtr.Zero;
}
@@ -95,9 +94,8 @@
Connection = connection;
}
- public OleDbCommand (string cmdText,
- OleDbConnection connection,
- OleDbTransaction transaction) : this
(cmdText, connection)
+ public OleDbCommand (string cmdText, OleDbConnection connection,
+ OleDbTransaction transaction) : this (cmdText,
connection)
{
this.transaction = transaction;
}
@@ -122,15 +120,15 @@
get {
return commandText;
}
- set {
+ set {
commandText = value;
}
}
#if !NET_2_0
[DataSysDescriptionAttribute ("Time to wait for command to
execute.")]
+ [DefaultValue (30)]
#endif
- [DefaultValue (30)]
public
#if NET_2_0
override
@@ -145,7 +143,7 @@
}
[DataCategory ("Data")]
- [DefaultValue ("Text")]
+ [DefaultValue ("Text")]
#if !NET_2_0
[DataSysDescriptionAttribute ("How to interpret the
CommandText.")]
#endif
@@ -181,6 +179,9 @@
[BrowsableAttribute (false)]
[DesignOnlyAttribute (true)]
[DefaultValue (true)]
+#if NET_2_0
+ [EditorBrowsable(EditorBrowsableState.Never)]
+#endif
public
#if NET_2_0
override
@@ -248,13 +249,13 @@
}
}
- IDataParameterCollection IDbCommand.Parameters {
+ IDataParameterCollection IDbCommand.Parameters {
get {
return Parameters;
}
}
- IDbTransaction IDbCommand.Transaction {
+ IDbTransaction IDbCommand.Transaction {
get {
return Transaction;
}
@@ -282,10 +283,12 @@
return new OleDbParameter ();
}
+#if !NET_2_0
IDbDataParameter IDbCommand.CreateParameter ()
{
return CreateParameter ();
}
+#endif
[MonoTODO]
protected override void Dispose (bool disposing)
@@ -380,7 +383,7 @@
break;
glist_node = (GdaList)
Marshal.PtrToStructure (glist_node.next,
-
typeof (GdaList));
+ typeof (GdaList));
}
dataReader = new OleDbDataReader (this,
results);
dataReader.NextResult ();
@@ -414,7 +417,15 @@
return o;
}
+#if NET_2_0
[MonoTODO]
+ public OleDbCommand Clone ()
+ {
+ throw new NotImplementedException ();
+ }
+#endif
+
+ [MonoTODO]
object ICloneable.Clone ()
{
throw new NotImplementedException ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
