Author: marek
Date: 2007-11-01 05:51:50 -0500 (Thu, 01 Nov 2007)
New Revision: 88635
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/ChangeLog
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleTransaction.cs
Log:
2007-11-01 Marek Safar <[EMAIL PROTECTED]>
* OracleCommand.cs,
* OracleConnection.cs,
* OracleTransaction.cs: 2.0 profile updates.
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/ChangeLog
2007-11-01 10:44:33 UTC (rev 88634)
+++ trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/ChangeLog
2007-11-01 10:51:50 UTC (rev 88635)
@@ -1,3 +1,9 @@
+2007-11-01 Marek Safar <[EMAIL PROTECTED]>
+
+ * OracleCommand.cs,
+ * OracleConnection.cs,
+ * OracleTransaction.cs: 2.0 profile updates.
+
2007-05-25 Nidhi Rawal <[EMAIL PROTECTED]>
* OracleDateTime.cs: Wrote the methods CompareTo (object) and Equals
(object).
* OracleClientFactory.cs: Wrote methods CreatePermission
(PermissionState) and CreateDataSourceEnumerator ().
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs
===================================================================
---
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs
2007-11-01 10:44:33 UTC (rev 88634)
+++
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs
2007-11-01 10:51:50 UTC (rev 88635)
@@ -10,6 +10,7 @@
// Authors:
// Daniel Morgan <[EMAIL PROTECTED]>
// Tim Coleman <[EMAIL PROTECTED]>
+// Marek Safar <[EMAIL PROTECTED]>
//
// Copyright (C) Daniel Morgan, 2002, 2004-2005
// Copyright (C) Tim Coleman , 2003
@@ -24,10 +25,19 @@
using System.Drawing.Design;
using System.Text;
-namespace System.Data.OracleClient {
+namespace System.Data.OracleClient
+{
+#if NET_2_0
+ [DefaultEvent ("RecordsAffected")]
+#endif
[Designer ("Microsoft.VSDesigner.Data.VS.OracleCommandDesigner, " +
Consts.AssemblyMicrosoft_VSDesigner)]
[ToolboxItem (true)]
- public sealed class OracleCommand : Component, ICloneable, IDbCommand
+ public sealed class OracleCommand :
+#if NET_2_0
+ Common.DbCommand, ICloneable, IDbCommand
+#else
+ Component, ICloneable, IDbCommand
+#endif
{
#region Fields
@@ -39,6 +49,10 @@
OracleParameterCollection parameters;
OracleTransaction transaction;
UpdateRowSource updatedRowSource;
+
+#if NET_2_0
+ int connection_timeout;
+#endif
private OciStatementHandle preparedStatement;
//OciStatementType statementType;
@@ -82,14 +96,22 @@
[DefaultValue ("")]
[RefreshProperties (RefreshProperties.All)]
[Editor
("Microsoft.VSDesigner.Data.Oracle.Design.OracleCommandTextEditor, " +
Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))]
- public string CommandText {
+ public
+#if NET_2_0
+ override
+#endif
+ string CommandText {
get { return commandText; }
set { commandText = value; }
}
[RefreshProperties (RefreshProperties.All)]
[DefaultValue (CommandType.Text)]
- public CommandType CommandType {
+ public
+#if NET_2_0
+ override
+#endif
+ CommandType CommandType {
get { return commandType; }
set {
if (value == CommandType.TableDirect)
@@ -104,11 +126,45 @@
get { return connection; }
set { connection = value; }
}
+
+#if NET_2_0
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
+ public override int CommandTimeout {
+ get { return connection_timeout; }
+ set { connection_timeout = value; }
+ }
+ [MonoTODO]
+ protected override Common.DbConnection DbConnection {
+ get { return null; }
+ set {}
+ }
+
+ [MonoTODO]
+ protected override Common.DbParameterCollection
DbParameterCollection {
+ get { return null; }
+ }
+
+ [MonoTODO]
+ protected override Common.DbTransaction DbTransaction {
+ get { return null; }
+ set {}
+ }
+#endif
+
[DefaultValue (true)]
[Browsable (false)]
[DesignOnly (true)]
- public bool DesignTimeVisible {
+#if NET_2_0
+ [EditorBrowsable (EditorBrowsableState.Never)]
+#endif
+ public
+#if NET_2_0
+ override
+#endif
+ bool DesignTimeVisible {
get { return designTimeVisible; }
set { designTimeVisible = value; }
}
@@ -161,7 +217,11 @@
}
[DefaultValue (UpdateRowSource.Both)]
- public UpdateRowSource UpdatedRowSource {
+ public
+#if NET_2_0
+ override
+#endif
+ UpdateRowSource UpdatedRowSource {
get { return updatedRowSource; }
set { updatedRowSource = value; }
}
@@ -201,10 +261,14 @@
}
[MonoTODO]
- public void Cancel ()
+ public
+#if NET_2_0
+ override
+#endif
+ void Cancel ()
{
throw new NotImplementedException ();
- }
+ }
[MonoTODO]
public object Clone ()
@@ -248,7 +312,22 @@
return cmd;
}
+
+
+#if NET_2_0
+ [MonoTODO]
+ protected override Common.DbParameter CreateDbParameter ()
+ {
+ return null;
+ }
+ [MonoTODO]
+ protected override Common.DbDataReader ExecuteDbDataReader
(CommandBehavior behaviour)
+ {
+ return null;
+ }
+#endif
+
internal void UpdateParameterValues ()
{
if (Parameters.Count > 0) {
@@ -301,7 +380,11 @@
return rowsAffected;
}
- public int ExecuteNonQuery ()
+ public
+#if NET_2_0
+ override
+#endif
+ int ExecuteNonQuery ()
{
AssertConnectionIsOpen ();
AssertTransactionMatch ();
@@ -459,7 +542,11 @@
return rd;
}
- public object ExecuteScalar ()
+ public
+#if NET_2_0
+ override
+#endif
+ object ExecuteScalar ()
{
object output = null;//if we find nothing we return this
@@ -566,7 +653,11 @@
statement.Prepare (commandText);
}
- public void Prepare ()
+ public
+#if NET_2_0
+ override
+#endif
+ void Prepare ()
{
AssertConnectionIsOpen ();
OciStatementHandle statement = GetStatementHandle ();
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs
===================================================================
---
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs
2007-11-01 10:44:33 UTC (rev 88634)
+++
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs
2007-11-01 10:51:50 UTC (rev 88635)
@@ -11,6 +11,7 @@
// Daniel Morgan <[EMAIL PROTECTED]>
// Tim Coleman <[EMAIL PROTECTED]>
// Hubert FONGARNAND <[EMAIL PROTECTED]>
+// Marek Safar <[EMAIL PROTECTED]>
//
// Copyright (C) Daniel Morgan, 2002, 2005, 2006
// Copyright (C) Tim Coleman, 2003
@@ -47,7 +48,12 @@
}
[DefaultEvent ("InfoMessage")]
- public sealed class OracleConnection : Component, ICloneable,
IDbConnection
+ public sealed class OracleConnection :
+#if NET_2_0
+ Common.DbConnection, ICloneable, IDbConnection
+#else
+ Component, ICloneable, IDbConnection
+#endif
{
#region Fields
@@ -91,7 +97,13 @@
get { return -1; }
}
+#if NET_2_0
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ public override string Database {
+#else
string IDbConnection.Database {
+#endif
[MonoTODO]
get { return String.Empty; }
}
@@ -117,9 +129,16 @@
get { return oci.SessionHandle; }
}
+#if NET_2_0
+ [Browsable (false)]
+#endif
[MonoTODO]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
- public string DataSource {
+ public
+#if NET_2_0
+ override
+#endif
+ string DataSource {
get {
return conInfo.Database;
}
@@ -127,7 +146,11 @@
[Browsable (false)]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
- public ConnectionState State {
+ public
+#if NET_2_0
+ override
+#endif
+ ConnectionState State {
get { return state; }
}
@@ -135,7 +158,11 @@
[RecommendedAsConfigurable (true)]
[RefreshProperties (RefreshProperties.All)]
[Editor
("Microsoft.VSDesigner.Data.Oracle.Design.OracleConnectionStringEditor, " +
Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))]
- public string ConnectionString {
+ public
+#if NET_2_0
+ override
+#endif
+ string ConnectionString {
get {
return parsedConnectionString;
}
@@ -147,7 +174,11 @@
[MonoTODO]
[Browsable (false)]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
- public string ServerVersion {
+ public
+#if NET_2_0
+ override
+#endif
+ string ServerVersion {
get {
if (this.State != ConnectionState.Open)
throw new
System.InvalidOperationException ("Invalid operation. The connection is
closed.");
@@ -185,7 +216,7 @@
get { return transaction; }
set { transaction = value; }
}
-
+
#endregion // Properties
#region Methods
@@ -214,7 +245,11 @@
}
[MonoTODO]
+#if NET_2_0
+ public override void ChangeDatabase (string databaseName)
+#else
void IDbConnection.ChangeDatabase (string databaseName)
+#endif
{
throw new NotImplementedException ();
}
@@ -226,7 +261,7 @@
return command;
}
- [MonoTODO]
+ [MonoTODO]
object ICloneable.Clone ()
{
OracleConnection con = new OracleConnection ();
@@ -336,7 +371,11 @@
}
}
- public void Open ()
+ public
+#if NET_2_0
+ override
+#endif
+ void Open ()
{
if (State == ConnectionState.Open)
return;
@@ -380,7 +419,11 @@
StateChange (this, e);
}
- public void Close ()
+ public
+#if NET_2_0
+ override
+#endif
+ void Close ()
{
if (transaction != null)
transaction.Rollback ();
@@ -394,6 +437,20 @@
CreateStateChange (ConnectionState.Open,
ConnectionState.Closed);
}
+#if NET_2_0
+ [MonoTODO]
+ protected override Common.DbTransaction BeginDbTransaction
(IsolationLevel level)
+ {
+ return null;
+ }
+
+ [MonoTODO]
+ protected override Common.DbCommand CreateDbCommand ()
+ {
+ return null;
+ }
+#endif
+
private void PersistSecurityInfo ()
{
// persistSecurityInfo:
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleTransaction.cs
===================================================================
---
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleTransaction.cs
2007-11-01 10:44:33 UTC (rev 88634)
+++
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleTransaction.cs
2007-11-01 10:51:50 UTC (rev 88635)
@@ -20,7 +20,12 @@
using System.Data.OracleClient.Oci;
namespace System.Data.OracleClient {
- public sealed class OracleTransaction : MarshalByRefObject,
IDbTransaction, IDisposable
+ public sealed class OracleTransaction :
+#if NET_2_0
+ Common.DbTransaction, IDbTransaction, IDisposable
+#else
+ MarshalByRefObject, IDbTransaction, IDisposable
+#endif
{
#region Fields
@@ -53,8 +58,19 @@
public OracleConnection Connection {
get { return connection; }
}
+
+#if NET_2_0
+ [MonoTODO]
+ protected override Common.DbConnection DbConnection {
+ get { return null; }
+ }
+#endif
- public IsolationLevel IsolationLevel {
+ public
+#if NET_2_0
+ override
+#endif
+ IsolationLevel IsolationLevel {
get { return isolationLevel; }
}
@@ -71,7 +87,11 @@
transaction.AttachToServiceContext ();
}
- public void Commit ()
+ public
+#if NET_2_0
+ override
+#endif
+ void Commit ()
{
transaction.Commit ();
Connection.Transaction = null;
@@ -97,7 +117,11 @@
GC.SuppressFinalize (this);
}
- public void Rollback ()
+ public
+#if NET_2_0
+ override
+#endif
+ void Rollback ()
{
transaction.Rollback ();
Connection.Transaction = null;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches