Author: kostat
Date: 2005-05-08 10:52:25 -0400 (Sun, 08 May 2005)
New Revision: 44217
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommand.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbConnection.cs
Log:
adding TARGET_JVM define
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommand.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommand.cs
2005-05-08 14:12:31 UTC (rev 44216)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommand.cs
2005-05-08 14:52:25 UTC (rev 44217)
@@ -36,7 +36,7 @@
using System.Data;
namespace System.Data.Common {
- public abstract class DbCommand : Component, IDbCommand
+ public abstract class DbCommand : Component, IDbCommand, IDisposable
{
protected DbCommand ()
{
@@ -47,12 +47,7 @@
public abstract string CommandText { get; set; }
public abstract int CommandTimeout { get; set; }
public abstract CommandType CommandType { get; set; }
- public abstract IDbConnection Connection { get; set; }
- public abstract IDataParameterCollection Parameters { get; }
- public abstract IDbTransaction Transaction { get; set; }
- public abstract UpdateRowSource UpdatedRowSource { get; set; }
-#if NET_2_0
public DbConnection Connection {
get { return DbConnection; }
set { DbConnection = value; }
@@ -91,22 +86,13 @@
set { DbTransaction = value; }
}
-#endif
+ public abstract UpdateRowSource UpdatedRowSource { get; set; }
#endregion // Properties
#region Methods
- public abstract void Cancel();
- public abstract int ExecuteNonQuery();
- public abstract IDataReader ExecuteReader();
- public abstract IDataReader ExecuteReader (CommandBehavior
behavior);
- public abstract object ExecuteScalar();
- public abstract IDbDataParameter CreateParameter();
- public abstract void Prepare ();
-
-#if NET_2_0
-
+ public abstract void Cancel ();
protected abstract DbParameter CreateDbParameter ();
public DbParameter CreateParameter ()
@@ -122,6 +108,7 @@
throw new NotImplementedException ();
}
+ public abstract int ExecuteNonQuery ();
public DbDataReader ExecutePageReader (CommandBehavior
behavior, int startRecord, int maxRecords)
{
@@ -138,6 +125,8 @@
return ExecuteDbDataReader (behavior);
}
+ public abstract object ExecuteScalar ();
+
IDbDataParameter IDbCommand.CreateParameter ()
{
return CreateParameter ();
@@ -153,7 +142,7 @@
return ExecuteReader (behavior);
}
-#endif
+ public abstract void Prepare ();
#endregion // Methods
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbConnection.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbConnection.cs
2005-05-08 14:12:31 UTC (rev 44216)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbConnection.cs
2005-05-08 14:52:25 UTC (rev 44217)
@@ -34,7 +34,7 @@
using System.ComponentModel;
using System.Data;
-#if MONO_ONLY
+#if !TARGET_JVM
using System.EnterpriseServices;
#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
