diff options
author | Zoltan Varga <vargaz@gmail.com> | 2015-01-13 23:29:38 +0300 |
---|---|---|
committer | Zoltan Varga <vargaz@gmail.com> | 2015-01-13 23:29:38 +0300 |
commit | 0985d4aa4be4a9286db4e36cf75e3b18a31e5ff9 (patch) | |
tree | 46b65e83cd552237e592e85486afcca719d8a9c3 /mcs/class/System.Data.OracleClient | |
parent | f54652de26710952d4f80e25d87a87b346a86992 (diff) |
[bcl] Remove NET_2_0 defines from the class libs. This has been done using: unifdef -t -DNET_2_0 -o <filename> <filename>.
Diffstat (limited to 'mcs/class/System.Data.OracleClient')
19 files changed, 0 insertions, 674 deletions
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameterCollection.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameterCollection.cs index 3cbb6685b85..262ea6e53b6 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameterCollection.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameterCollection.cs @@ -92,7 +92,6 @@ namespace System.Data.OracleClient { return Add(param);
}
-#if NET_2_0
public OracleParameter AddWithValue (string parameterName, object value) {
return Add (parameterName, value);
}
@@ -112,7 +111,6 @@ namespace System.Data.OracleClient { public void Remove (OracleParameter value) {
base.Remove (value);
}
-#endif
#endregion // Methods
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleBFile.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleBFile.cs index 1ddd051558c..afe35ffc796 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleBFile.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleBFile.cs @@ -169,18 +169,10 @@ namespace System.Data.OracleClient throw new NotImplementedException (); } -#if NET_2_0 protected override void Dispose (bool disposing) { throw new NotImplementedException (); } -#else - [MonoTODO] - public void Dispose () - { - throw new NotImplementedException (); - } -#endif [MonoTODO] public override void Flush () diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleClientFactory.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleClientFactory.cs index 8d0aa1cd4ce..06ddd358362 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleClientFactory.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleClientFactory.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 namespace System.Data.OracleClient { using System.Data; @@ -92,4 +91,3 @@ namespace System.Data.OracleClient #endregion // public overrides } } -#endif // NET_2_0 diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs index eee81ab0c01..adc73252c5c 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs @@ -21,9 +21,7 @@ using System; using System.ComponentModel; using System.Data; -#if NET_2_0 using System.Data.Common; -#endif using System.Data.OracleClient.Oci; using System.Drawing.Design; using System.Text; @@ -31,17 +29,11 @@ using System.Threading; 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 : -#if NET_2_0 DbCommand, ICloneable -#else - Component, ICloneable, IDbCommand -#endif { #region Fields @@ -97,9 +89,7 @@ namespace System.Data.OracleClient [RefreshProperties (RefreshProperties.All)] [Editor ("Microsoft.VSDesigner.Data.Oracle.Design.OracleCommandTextEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))] public -#if NET_2_0 override -#endif string CommandText { get { if (commandText == null) @@ -113,9 +103,7 @@ namespace System.Data.OracleClient [RefreshProperties (RefreshProperties.All)] [DefaultValue (CommandType.Text)] public -#if NET_2_0 override -#endif CommandType CommandType { get { return commandType; } set { @@ -128,15 +116,12 @@ namespace System.Data.OracleClient [DefaultValue (null)] [Editor ("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))] public -#if NET_2_0 new -#endif OracleConnection Connection { get { return connection; } set { connection = value; } } -#if NET_2_0 [Browsable (false)] [EditorBrowsable (EditorBrowsableState.Never)] [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] @@ -161,18 +146,13 @@ namespace System.Data.OracleClient get { return Transaction; } set { Transaction = (OracleTransaction) value; } } -#endif [DefaultValue (true)] [Browsable (false)] [DesignOnly (true)] -#if NET_2_0 [EditorBrowsable (EditorBrowsableState.Never)] -#endif public -#if NET_2_0 override -#endif bool DesignTimeVisible { get { return designTimeVisible; } set { designTimeVisible = value; } @@ -186,40 +166,10 @@ namespace System.Data.OracleClient get { return Connection.ErrorHandle; } } -#if !NET_2_0 - int IDbCommand.CommandTimeout { - get { return 0; } - set { } - } - - [Editor ("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))] - [DefaultValue (null)] - IDbConnection IDbCommand.Connection { - get { return Connection; } - set { - // InvalidCastException is expected when types do not match - Connection = (OracleConnection) value; - } - } - - IDataParameterCollection IDbCommand.Parameters { - get { return Parameters; } - } - - IDbTransaction IDbCommand.Transaction { - get { return Transaction; } - set { - // InvalidCastException is expected when types do not match - Transaction = (OracleTransaction) value; - } - } -#endif [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] public -#if NET_2_0 new -#endif OracleParameterCollection Parameters { get { return parameters; } } @@ -227,9 +177,7 @@ namespace System.Data.OracleClient [Browsable (false)] [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] public -#if NET_2_0 new -#endif OracleTransaction Transaction { get { return transaction; } set { transaction = value; } @@ -237,9 +185,7 @@ namespace System.Data.OracleClient [DefaultValue (UpdateRowSource.Both)] public -#if NET_2_0 override -#endif UpdateRowSource UpdatedRowSource { get { return updatedRowSource; } set { updatedRowSource = value; } @@ -275,9 +221,7 @@ namespace System.Data.OracleClient [MonoTODO] public -#if NET_2_0 override -#endif void Cancel () { throw new NotImplementedException (); @@ -326,7 +270,6 @@ namespace System.Data.OracleClient return cmd; } -#if NET_2_0 protected override DbParameter CreateDbParameter () { return CreateParameter (); @@ -336,7 +279,6 @@ namespace System.Data.OracleClient { return ExecuteReader (behavior); } -#endif internal void UpdateParameterValues () { @@ -373,9 +315,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 new -#endif OracleParameter CreateParameter () { return new OracleParameter (); @@ -414,9 +354,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif int ExecuteNonQuery () { moreResults = -1; @@ -526,18 +464,14 @@ namespace System.Data.OracleClient } public -#if NET_2_0 new -#endif OracleDataReader ExecuteReader () { return ExecuteReader (CommandBehavior.Default); } public -#if NET_2_0 new -#endif OracleDataReader ExecuteReader (CommandBehavior behavior) { AssertConnectionIsOpen (); @@ -601,9 +535,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif object ExecuteScalar () { moreResults = -1; @@ -710,22 +642,6 @@ namespace System.Data.OracleClient h.Dispose(); } -#if !NET_2_0 - IDbDataParameter IDbCommand.CreateParameter () - { - return CreateParameter (); - } - - IDataReader IDbCommand.ExecuteReader () - { - return ExecuteReader (); - } - - IDataReader IDbCommand.ExecuteReader (CommandBehavior behavior) - { - return ExecuteReader (behavior); - } -#endif void PrepareStatement (OciStatementHandle statement) { @@ -745,9 +661,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif void Prepare () { AssertConnectionIsOpen (); diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs index 19f92c1d940..26fce3ab35b 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs @@ -40,11 +40,7 @@ using System.Data.Common; using System.Text; namespace System.Data.OracleClient { -#if NET_2_0 public sealed class OracleCommandBuilder : DbCommandBuilder -#else - public sealed class OracleCommandBuilder : Component -#endif // NET_2_0 { #region Fields @@ -88,9 +84,7 @@ namespace System.Data.OracleClient { //[DataSysDescription ("The DataAdapter for which to automatically generate OracleCommands")] [DefaultValue (null)] public -#if NET_2_0 new -#endif OracleDataAdapter DataAdapter { get { return adapter; } set { @@ -112,9 +106,7 @@ namespace System.Data.OracleClient { //[DataSysDescription ("The character used in a text command as the opening quote for quoting identifiers that contain special characters.")] [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] public -#if NET_2_0 override -#endif // NET_2_0 string QuotePrefix { get { return quotePrefix; } set { @@ -128,9 +120,7 @@ namespace System.Data.OracleClient { //[DataSysDescription ("The character used in a text command as the closing quote for quoting identifiers that contain special characters.")] [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] public -#if NET_2_0 override -#endif // NET_2_0 string QuoteSuffix { get { return quoteSuffix; } set { @@ -437,9 +427,7 @@ namespace System.Data.OracleClient { } public -#if NET_2_0 new -#endif // NET_2_0 OracleCommand GetDeleteCommand () { BuildCache (true); @@ -447,9 +435,7 @@ namespace System.Data.OracleClient { } public -#if NET_2_0 new -#endif // NET_2_0 OracleCommand GetInsertCommand () { BuildCache (true); @@ -466,9 +452,7 @@ namespace System.Data.OracleClient { } public -#if NET_2_0 new -#endif // NET_2_0 OracleCommand GetUpdateCommand () { BuildCache (true); @@ -498,16 +482,13 @@ namespace System.Data.OracleClient { [MonoTODO ("Figure out what else needs to be cleaned up when we refresh.")] public -#if NET_2_0 override -#endif // NET_2_0 void RefreshSchema () { tableName = String.Empty; dbSchemaTable = null; } -#if NET_2_0 [MonoTODO] protected override void ApplyParameterInfo (DbParameter dbParameter, DataRow row, @@ -535,7 +516,6 @@ namespace System.Data.OracleClient { throw new NotImplementedException (); } -#endif // NET_2_0 #endregion // Methods #region Event Handlers @@ -562,13 +542,11 @@ namespace System.Data.OracleClient { } } -#if NET_2_0 [MonoTODO] protected override void SetRowUpdatingHandler (DbDataAdapter adapter) { throw new NotImplementedException (); } -#endif // NET_2_0 #endregion // Event Handlers } diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs index 77101715c28..e0af49f576e 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs @@ -59,11 +59,7 @@ namespace System.Data.OracleClient [DefaultEvent ("InfoMessage")] public sealed class OracleConnection : -#if NET_2_0 Common.DbConnection, ICloneable -#else - Component, ICloneable, IDbConnection -#endif { #region Fields @@ -102,25 +98,14 @@ namespace System.Data.OracleClient #region Properties -#if NET_2_0 [MonoTODO ("Currently not respected.")] public override int ConnectionTimeout { get { return 0; } } -#else - [MonoTODO ("Currently not respected.")] - int IDbConnection.ConnectionTimeout { - get { return 0; } - } -#endif -#if NET_2_0 [Browsable (false)] [EditorBrowsable (EditorBrowsableState.Never)] public override string Database { -#else - string IDbConnection.Database { -#endif [MonoTODO] get { return String.Empty; } } @@ -146,15 +131,11 @@ namespace System.Data.OracleClient get { return oci.SessionHandle; } } -#if NET_2_0 [Browsable (false)] -#endif [MonoTODO] [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] public -#if NET_2_0 override -#endif string DataSource { get { return conInfo.Database; @@ -164,25 +145,17 @@ namespace System.Data.OracleClient [Browsable (false)] [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] public -#if NET_2_0 override -#endif ConnectionState State { get { return state; } } [DefaultValue ("")] -#if NET_2_0 [SettingsBindableAttribute (true)] -#else - [RecommendedAsConfigurable (true)] -#endif [RefreshProperties (RefreshProperties.All)] [Editor ("Microsoft.VSDesigner.Data.Oracle.Design.OracleConnectionStringEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))] public -#if NET_2_0 override -#endif string ConnectionString { get { if (parsedConnectionString == null) @@ -198,9 +171,7 @@ namespace System.Data.OracleClient [Browsable (false)] [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] public -#if NET_2_0 override -#endif string ServerVersion { get { if (this.State != ConnectionState.Open) @@ -245,18 +216,14 @@ namespace System.Data.OracleClient #region Methods public -#if NET_2_0 new -#endif OracleTransaction BeginTransaction () { return BeginTransaction (IsolationLevel.ReadCommitted); } public -#if NET_2_0 new -#endif OracleTransaction BeginTransaction (IsolationLevel il) { if (state == ConnectionState.Closed) @@ -276,19 +243,13 @@ namespace System.Data.OracleClient } [MonoTODO] -#if NET_2_0 public override void ChangeDatabase (string value) -#else - void IDbConnection.ChangeDatabase (string value) -#endif { throw new NotImplementedException (); } public -#if NET_2_0 new -#endif OracleCommand CreateCommand () { OracleCommand command = new OracleCommand (); @@ -305,22 +266,6 @@ namespace System.Data.OracleClient return con; } -#if !NET_2_0 - IDbTransaction IDbConnection.BeginTransaction () - { - return BeginTransaction (); - } - - IDbTransaction IDbConnection.BeginTransaction (IsolationLevel il) - { - return BeginTransaction (il); - } - - IDbCommand IDbConnection.CreateCommand () - { - return CreateCommand (); - } -#endif [MonoTODO] protected override void Dispose (bool disposing) @@ -402,9 +347,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif void Open () { if (State == ConnectionState.Open) @@ -459,18 +402,9 @@ namespace System.Data.OracleClient OnStateChange (a); } -#if !NET_2_0 - private void OnStateChange (StateChangeEventArgs e) - { - if (StateChange != null) - StateChange (this, e); - } -#endif public -#if NET_2_0 override -#endif void Close () { if (transaction != null) @@ -485,7 +419,6 @@ namespace System.Data.OracleClient CreateStateChange (ConnectionState.Open, ConnectionState.Closed); } -#if NET_2_0 protected override Common.DbTransaction BeginDbTransaction (IsolationLevel isolationLevel) { return BeginTransaction (isolationLevel); @@ -495,7 +428,6 @@ namespace System.Data.OracleClient { return CreateCommand (); } -#endif private void PersistSecurityInfo () { @@ -745,11 +677,7 @@ namespace System.Data.OracleClient #endregion // Methods public event OracleInfoMessageEventHandler InfoMessage; -#if !NET_2_0 - public event StateChangeEventHandler StateChange; -#endif -#if NET_2_0 public override DataTable GetSchema () { if (State != ConnectionState.Open) @@ -1289,7 +1217,6 @@ namespace System.Data.OracleClient return dt; } -#endif } } diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnectionStringBuilder.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnectionStringBuilder.cs index 973cd3455d2..6426297da75 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnectionStringBuilder.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnectionStringBuilder.cs @@ -28,7 +28,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using System; using System.Text; using System.Collections; @@ -497,6 +496,5 @@ namespace System.Data.OracleClient } -#endif // NET_2_0 diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataAdapter.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataAdapter.cs index 4ca1f6e8e35..a575405a68a 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataAdapter.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataAdapter.cs @@ -40,9 +40,7 @@ namespace System.Data.OracleClient OracleCommand insertCommand; OracleCommand selectCommand; OracleCommand updateCommand; -#if NET_2_0 int updateBatchSize; -#endif #endregion @@ -55,9 +53,7 @@ namespace System.Data.OracleClient public OracleDataAdapter (OracleCommand selectCommand) { SelectCommand = selectCommand; -#if NET_2_0 UpdateBatchSize = 1; -#endif } public OracleDataAdapter (string selectCommandText, OracleConnection selectConnection) @@ -77,9 +73,7 @@ namespace System.Data.OracleClient [DefaultValue (null)] [Editor ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))] public -#if NET_2_0 new -#endif OracleCommand DeleteCommand { get { return deleteCommand; } set { deleteCommand = value; } @@ -88,9 +82,7 @@ namespace System.Data.OracleClient [DefaultValue (null)] [Editor ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))] public -#if NET_2_0 new -#endif OracleCommand InsertCommand { get { return insertCommand; } set { insertCommand = value; } @@ -99,9 +91,7 @@ namespace System.Data.OracleClient [DefaultValue (null)] [Editor ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))] public -#if NET_2_0 new -#endif OracleCommand SelectCommand { get { return selectCommand; } set { selectCommand = value; } @@ -110,15 +100,12 @@ namespace System.Data.OracleClient [DefaultValue (null)] [Editor ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))] public -#if NET_2_0 new -#endif OracleCommand UpdateCommand { get { return updateCommand; } set { updateCommand = value; } } -#if NET_2_0 public override int UpdateBatchSize { get { return updateBatchSize; } set { @@ -127,7 +114,6 @@ namespace System.Data.OracleClient updateBatchSize = value; } } -#endif IDbCommand IDbDataAdapter.DeleteCommand { get { return DeleteCommand; } diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataReader.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataReader.cs index 881ea3dd551..f83deb9c472 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataReader.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataReader.cs @@ -30,19 +30,12 @@ using System.Text; namespace System.Data.OracleClient { public sealed class OracleDataReader : -#if NET_2_0 DbDataReader -#else - MarshalByRefObject, IDataReader, IDisposable, IDataRecord, IEnumerable -#endif { #region Fields OracleCommand command; ArrayList dataTypeNames; -#if !NET_2_0 - bool disposed; -#endif bool isClosed; bool hasRows; DataTable schemaTable; @@ -76,57 +69,43 @@ namespace System.Data.OracleClient #region Properties public -#if NET_2_0 override -#endif int Depth { get { return 0; } } public -#if NET_2_0 override -#endif int FieldCount { get { return statement.ColumnCount; } } public -#if NET_2_0 override -#endif bool HasRows { get { return hasRows; } } public -#if NET_2_0 override -#endif bool IsClosed { get { return isClosed; } } public -#if NET_2_0 override -#endif object this [string name] { get { return GetValue (GetOrdinal (name)); } } public -#if NET_2_0 override -#endif object this [int i] { get { return GetValue (i); } } public -#if NET_2_0 override -#endif int RecordsAffected { get { return GetRecordsAffected (); @@ -138,9 +117,7 @@ namespace System.Data.OracleClient #region Methods public -#if NET_2_0 override -#endif void Close () { if (!isClosed) { @@ -152,12 +129,10 @@ namespace System.Data.OracleClient statement.Dispose(); statement = null; } -#if NET_2_0 if (schemaTable != null) { schemaTable.Dispose (); schemaTable = null; } -#endif isClosed = true; } @@ -190,45 +165,23 @@ namespace System.Data.OracleClient return schemaTable; } -#if !NET_2_0 - private void Dispose (bool disposing) - { - if (!disposed) { - if (disposing) - Close (); - disposed = true; - } - } - - public void Dispose () - { - Dispose (true); - GC.SuppressFinalize (this); - } -#endif public -#if NET_2_0 override -#endif bool GetBoolean (int i) { throw new NotSupportedException (); } public -#if NET_2_0 override -#endif byte GetByte (int i) { throw new NotSupportedException (); } public -#if NET_2_0 override -#endif long GetBytes (int i, long fieldOffset, byte[] buffer2, int bufferoffset, int length) { byte[] value = (byte[]) GetValue (i); @@ -246,18 +199,14 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif char GetChar (int i) { throw new NotSupportedException (); } public -#if NET_2_0 override -#endif long GetChars (int i, long fieldOffset, char[] buffer2, int bufferoffset, int length) { char [] value = (char[]) GetValue (i); @@ -266,27 +215,16 @@ namespace System.Data.OracleClient return (value.Length - fieldOffset); } -#if !NET_2_0 - [MonoTODO] - public IDataReader GetData (int i) - { - throw new NotImplementedException (); - } -#endif public -#if NET_2_0 override -#endif string GetDataTypeName (int i) { return dataTypeNames [i].ToString ().ToUpper (); } public -#if NET_2_0 override -#endif DateTime GetDateTime (int i) { IConvertible c = (IConvertible) GetValue (i); @@ -294,9 +232,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif decimal GetDecimal (int i) { IConvertible c = (IConvertible) GetValue (i); @@ -304,9 +240,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif double GetDouble (int i) { IConvertible c = (IConvertible) GetValue (i); @@ -314,9 +248,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif Type GetFieldType (int i) { OciDefineHandle defineHandle = (OciDefineHandle) statement.Values [i]; @@ -324,9 +256,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif float GetFloat (int i) { IConvertible c = (IConvertible) GetValue (i); @@ -334,27 +264,21 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif Guid GetGuid (int i) { throw new NotSupportedException (); } public -#if NET_2_0 override -#endif short GetInt16 (int i) { throw new NotSupportedException (); } public -#if NET_2_0 override -#endif int GetInt32 (int i) { IConvertible c = (IConvertible) GetValue (i); @@ -362,9 +286,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif long GetInt64 (int i) { IConvertible c = (IConvertible) GetValue (i); @@ -372,9 +294,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif string GetName (int i) { return statement.GetParameter (i).GetName (); @@ -498,9 +418,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif int GetOrdinal (string name) { int i = GetOrdinalInternal (name); @@ -697,9 +615,7 @@ namespace System.Data.OracleClient [MonoTODO("Implement this properly, with all needed information.")] public -#if NET_2_0 override -#endif DataTable GetSchemaTable () { StringCollection keyinfo = null; @@ -769,9 +685,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif string GetString (int i) { return (string) GetValue (i); @@ -783,9 +697,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif object GetValue (int i) { OciDefineHandle defineHandle = (OciDefineHandle) statement.Values [i]; @@ -806,9 +718,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif int GetValues (object [] values) { int len = values.Length; @@ -826,19 +736,13 @@ namespace System.Data.OracleClient return retval; } -#if NET_2_0 public override IEnumerator GetEnumerator () -#else - IEnumerator IEnumerable.GetEnumerator () -#endif { return new DbEnumerator (this); } public -#if NET_2_0 override -#endif bool IsDBNull (int i) { OciDefineHandle defineHandle = (OciDefineHandle) statement.Values [i]; @@ -852,9 +756,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif bool NextResult () { ValidateState (); @@ -874,9 +776,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif bool Read () { ValidateState (); @@ -889,7 +789,6 @@ namespace System.Data.OracleClient return false; } -#if NET_2_0 [MonoTODO] public override Type GetProviderSpecificFieldType (int i) { @@ -907,7 +806,6 @@ namespace System.Data.OracleClient { return GetOracleValues (values); } -#endif #endregion // Methods } diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleInfoMessageEventHandler.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleInfoMessageEventHandler.cs index a5be915520e..9e2603f6be4 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleInfoMessageEventHandler.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleInfoMessageEventHandler.cs @@ -19,8 +19,5 @@ using System.IO; using System.Data.SqlTypes; namespace System.Data.OracleClient { -#if !NET_2_0 - [Serializable] -#endif public delegate void OracleInfoMessageEventHandler (object sender, OracleInfoMessageEventArgs e); } diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleLob.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleLob.cs index 1454769807a..9a8a9ecdbe8 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleLob.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleLob.cs @@ -234,24 +234,8 @@ namespace System.Data.OracleClient throw new NotImplementedException (); } -#if !NET_2_0 - [MonoTODO] - public override void Close () - { - Dispose (true); - } - - [MonoTODO] - public void Dispose () - { - this.Dispose (true); - GC.SuppressFinalize (this); - } -#endif -#if NET_2_0 protected override -#endif void Dispose (bool disposing) { if (disposing) { diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleLobOpenMode.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleLobOpenMode.cs index 060618a981c..b4f543b951b 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleLobOpenMode.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleLobOpenMode.cs @@ -17,9 +17,6 @@ using System; namespace System.Data.OracleClient { -#if !NET_2_0 - [Serializable] -#endif public enum OracleLobOpenMode { ReadOnly = 0x01, diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameter.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameter.cs index ef5eb270207..b8f3aca8833 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameter.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameter.cs @@ -25,9 +25,7 @@ using System; using System.Collections; using System.ComponentModel; using System.Data; -#if NET_2_0 using System.Data.Common; -#endif using System.Data.SqlTypes; using System.Data.OracleClient.Oci; using System.Globalization; @@ -38,11 +36,7 @@ namespace System.Data.OracleClient { [TypeConverter (typeof(OracleParameter.OracleParameterConverter))] public sealed class OracleParameter : -#if NET_2_0 DbParameter, IDbDataParameter, ICloneable, -#else - MarshalByRefObject, IDbDataParameter, IDataParameter, ICloneable, -#endif IDisposable { #region Fields @@ -56,9 +50,7 @@ namespace System.Data.OracleClient byte precision; byte scale; string srcColumn; -#if NET_2_0 bool sourceColumnNullMapping; -#endif DataRowVersion srcVersion; DbType dbType = DbType.AnsiString; int offset; @@ -133,13 +125,11 @@ namespace System.Data.OracleClient SourceVersion = DataRowVersion.Current; InferOracleType (value); this.indicator = OciCalls.AllocateClear (sizeof(short)); -#if NET_2_0 // Find the OciType before inferring for the size if (value != null && value != DBNull.Value) { this.sizeSet = true; this.size = InferSize (); } -#endif } public OracleParameter (string name, OracleType oracleType) @@ -157,7 +147,6 @@ namespace System.Data.OracleClient { } -#if NET_2_0 public OracleParameter (string name, OracleType oracleType, int size, ParameterDirection direction, string sourceColumn, DataRowVersion sourceVersion, bool sourceColumnNullMapping, object value) { this.name = name; @@ -179,7 +168,6 @@ namespace System.Data.OracleClient SourceVersion = sourceVersion; this.indicator = OciCalls.AllocateClear (sizeof(short)); } -#endif public OracleParameter (string name, OracleType oracleType, int size, ParameterDirection direction, bool isNullable, byte precision, byte scale, string srcColumn, DataRowVersion srcVersion, object value) { @@ -226,28 +214,16 @@ namespace System.Data.OracleClient set { Marshal.WriteInt16(indicator, value); } } -#if !NET_2_0 - [Browsable (false)] - [RefreshProperties (RefreshProperties.All)] - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] -#endif public -#if NET_2_0 override -#endif DbType DbType { get { return dbType; } set { SetDbType (value); } } -#if !NET_2_0 - [DefaultValue (ParameterDirection.Input)] -#endif [RefreshProperties (RefreshProperties.All)] public -#if NET_2_0 override -#endif ParameterDirection Direction { get { return direction; } set { @@ -257,26 +233,14 @@ namespace System.Data.OracleClient } } -#if !NET_2_0 - [Browsable (false)] - [DesignOnly (true)] - [DefaultValue (false)] - [EditorBrowsable (EditorBrowsableState.Never)] -#endif public -#if NET_2_0 override -#endif bool IsNullable { get { return isNullable; } set { isNullable = value; } } -#if NET_2_0 [EditorBrowsable (EditorBrowsableState.Advanced)] -#else - [DefaultValue (0)] -#endif [Browsable (false)] public int Offset { get { return offset; } @@ -285,9 +249,7 @@ namespace System.Data.OracleClient [DefaultValue (OracleType.VarChar)] [RefreshProperties (RefreshProperties.All)] -#if NET_2_0 [DbProviderSpecificTypeProperty (true)] -#endif public OracleType OracleType { get { return oracleType; } set { @@ -296,13 +258,8 @@ namespace System.Data.OracleClient } } -#if !NET_2_0 - [DefaultValue ("")] -#endif public -#if NET_2_0 override -#endif string ParameterName { get { if (name == null) @@ -312,37 +269,24 @@ namespace System.Data.OracleClient set { name = value; } } -#if NET_2_0 [Browsable (false)] [EditorBrowsable (EditorBrowsableState.Never)] [Obsolete("Set the precision of a decimal use the Math classes.")] -#else - [DefaultValue (0)] -#endif public byte Precision { get { return precision; } set { /* NO EFFECT*/ } } -#if NET_2_0 [Browsable (false)] [EditorBrowsable (EditorBrowsableState.Never)] [Obsolete("Set the precision of a decimal use the Math classes.")] -#else - [DefaultValue (0)] -#endif public byte Scale { get { return scale; } set { /* NO EFFECT*/ } } -#if !NET_2_0 - [DefaultValue (0)] -#endif public -#if NET_2_0 override -#endif int Size { get { return size; } set { @@ -352,59 +296,40 @@ namespace System.Data.OracleClient } } -#if !NET_2_0 - [DefaultValue ("")] -#endif public -#if NET_2_0 override -#endif string SourceColumn { get { return srcColumn; } set { srcColumn = value; } } -#if NET_2_0 [MonoTODO] public override bool SourceColumnNullMapping { get { return sourceColumnNullMapping; } set { sourceColumnNullMapping = value; } } -#endif -#if !NET_2_0 - [DefaultValue ("Current")] -#endif public -#if NET_2_0 override -#endif DataRowVersion SourceVersion { get { return srcVersion; } set { srcVersion = value; } } -#if !NET_2_0 - [DefaultValue (null)] -#endif [RefreshProperties (RefreshProperties.All)] [TypeConverter (typeof(StringConverter))] public -#if NET_2_0 override -#endif object Value { get { return this.value; } set { this.value = value; if (!oracleTypeSet) InferOracleType (value); -#if NET_2_0 if (value != null && value != DBNull.Value) { this.size = InferSize (); this.sizeSet = true; } -#endif } } @@ -1242,7 +1167,6 @@ namespace System.Data.OracleClient oracleType = type; } -#if NET_2_0 public override void ResetDbType () { ResetOracleType (); @@ -1253,7 +1177,6 @@ namespace System.Data.OracleClient oracleTypeSet = false; InferOracleType (value); } -#endif // NET_2_0 public override string ToString () { diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameterCollection.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameterCollection.cs index 3794f8d5a9c..b9360a43347 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameterCollection.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameterCollection.cs @@ -19,9 +19,7 @@ using System; using System.Collections; using System.ComponentModel; using System.Data; -#if NET_2_0 using System.Data.Common; -#endif using System.Data.OracleClient.Oci; using System.Drawing.Design; using System.Globalization; @@ -32,11 +30,7 @@ namespace System.Data.OracleClient [ListBindable (false)] [Editor ("Microsoft.VSDesigner.Data.Design.DBParametersEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))] public sealed class OracleParameterCollection : -#if NET_2_0 DbParameterCollection -#else - MarshalByRefObject, IDataParameterCollection, IList, ICollection, IEnumerable -#endif { #region Fields @@ -56,41 +50,31 @@ namespace System.Data.OracleClient #region Properties public -#if NET_2_0 override -#endif int Count { get { return list.Count; } } public -#if NET_2_0 override -#endif bool IsFixedSize { get { return list.IsFixedSize; } } public -#if NET_2_0 override -#endif bool IsReadOnly { get { return list.IsReadOnly; } } public -#if NET_2_0 override -#endif bool IsSynchronized { get { return list.IsSynchronized; } } public -#if NET_2_0 new -#endif OracleParameter this [string parameterName] { get { return (OracleParameter) GetParameter (parameterName); @@ -101,17 +85,13 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif object SyncRoot { get { return this; } } public -#if NET_2_0 new -#endif OracleParameter this [int index] { get { @@ -122,33 +102,14 @@ namespace System.Data.OracleClient } } -#if !NET_2_0 - object IList.this [int index] { - get { return this [index]; } - set { this [index] = (OracleParameter) value; } - } - - object IDataParameterCollection.this [string index] { - get { return this [index]; } - set { - if (!(value is OracleParameter)) - throw new InvalidCastException ("The parameter was not an OracleParameter."); - this [index] = (OracleParameter) value; - } - } -#endif #endregion // Properties #region Methods -#if NET_2_0 [EditorBrowsable (EditorBrowsableState.Never)] -#endif public -#if NET_2_0 override -#endif int Add (object value) { AssertParameterValid (value); @@ -159,10 +120,8 @@ namespace System.Data.OracleClient public OracleParameter Add (OracleParameter value) { -#if NET_2_0 if (value == null) throw CreateParameterNullException (); -#endif if (value.Container != null) throw new ArgumentException ("The OracleParameter specified in the value parameter is already added to this or another OracleParameterCollection."); value.Container = this; @@ -190,7 +149,6 @@ namespace System.Data.OracleClient return Add (new OracleParameter (parameterName, dataType, size, srcColumn)); } -#if NET_2_0 public override void AddRange (Array values) { if (values == null) @@ -215,12 +173,9 @@ namespace System.Data.OracleClient foreach (OracleParameter param in values) Add (param); } -#endif public -#if NET_2_0 override -#endif void Clear () { foreach (OracleParameter param in list) @@ -229,63 +184,45 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif bool Contains (object value) { return (IndexOf (value) != -1); } -#if NET_2_0 public bool Contains (OracleParameter value) { return (IndexOf (value) != -1); } -#endif public -#if NET_2_0 override -#endif bool Contains (string parameterName) { return (IndexOf (parameterName) != -1); } public -#if NET_2_0 override -#endif void CopyTo (Array array, int index) { list.CopyTo (array, index); } public -#if NET_2_0 override -#endif IEnumerator GetEnumerator () { return list.GetEnumerator (); } -#if NET_2_0 protected override DbParameter GetParameter (int index) -#else - object GetParameter (int index) -#endif { AssertIndex (index); return (OracleParameter) list [index]; } -#if NET_2_0 protected override DbParameter GetParameter (string parameterName) -#else - object GetParameter (string parameterName) -#endif { int index = IndexOf (parameterName); if (index == -1) @@ -293,11 +230,7 @@ namespace System.Data.OracleClient return (OracleParameter) list [index]; } -#if NET_2_0 protected override void SetParameter (int index, DbParameter value) -#else - void SetParameter (int index, IDbDataParameter value) -#endif { AssertIndex (index); AssertParameterValid (value); @@ -305,9 +238,6 @@ namespace System.Data.OracleClient OracleParameter new_value = (OracleParameter) value; OracleParameter old_value = (OracleParameter) list [index]; -#if !NET_2_0 - old_value.Container = null; -#endif if (new_value.Container != null) { if (new_value.Container != this) @@ -318,16 +248,10 @@ namespace System.Data.OracleClient list [index] = new_value; new_value.Container = this; -#if NET_2_0 old_value.Container = null; -#endif } -#if NET_2_0 protected override void SetParameter (string parameterName, DbParameter value) -#else - void SetParameter (string parameterName, IDbDataParameter value) -#endif { int index = IndexOf (parameterName); if (index == -1) @@ -338,9 +262,6 @@ namespace System.Data.OracleClient OracleParameter new_value = (OracleParameter) value; OracleParameter old_value = (OracleParameter) list [index]; -#if !NET_2_0 - old_value.Container = null; -#endif if (new_value.Container != null) { if (new_value.Container != this) @@ -351,15 +272,11 @@ namespace System.Data.OracleClient list [index] = new_value; new_value.Container = this; -#if NET_2_0 old_value.Container = null; -#endif } public -#if NET_2_0 override -#endif int IndexOf (object value) { if (value != null) @@ -371,7 +288,6 @@ namespace System.Data.OracleClient return -1; } -#if NET_2_0 public int IndexOf (OracleParameter value) { for (int i = 0; i < Count; i += 1) @@ -379,22 +295,17 @@ namespace System.Data.OracleClient return i; return -1; } -#endif public -#if NET_2_0 override -#endif int IndexOf (string parameterName) { -#if NET_2_0 // case-sensitive lookup for (int i = 0; i < Count; i += 1) { OracleParameter param = (OracleParameter) list [i]; if (string.Compare (param.ParameterName, parameterName, false, CultureInfo.CurrentCulture) == 0) return i; } -#endif // case-insensitive lookup for (int i = 0; i < Count; i += 1) { @@ -407,9 +318,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif void Insert (int index, object value) { AssertParameterValid (value); @@ -427,17 +336,13 @@ namespace System.Data.OracleClient new_value.Container = this; } -#if NET_2_0 public void Insert (int index, OracleParameter value) { Insert (index, (object) value); } -#endif public -#if NET_2_0 override -#endif void Remove (object value) { AssertParameterValid (value); @@ -450,7 +355,6 @@ namespace System.Data.OracleClient list.RemoveAt (index); } -#if NET_2_0 public void Remove (OracleParameter value) { if (value == null) @@ -463,12 +367,9 @@ namespace System.Data.OracleClient value.Container = null; list.RemoveAt (index); } -#endif public -#if NET_2_0 override -#endif void RemoveAt (int index) { AssertIndex (index); @@ -479,9 +380,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif void RemoveAt (string parameterName) { int index = IndexOf (parameterName); @@ -502,30 +401,21 @@ namespace System.Data.OracleClient return; string msg = string.Format (CultureInfo.InvariantCulture, -#if NET_2_0 "Only non-null {0} instances are valid for " + "the {1}, not {2} instances.", typeof (OracleParameter).Name, typeof (OracleParameterCollection).Name, value.GetType ().Name); -#else - "Value is not {0}.", - typeof (OracleParameter).Name); -#endif throw new InvalidCastException (msg); } static Exception CreateParameterNullException () { -#if NET_2_0 string msg = string.Format (CultureInfo.InvariantCulture, "Only non-null {0} instances are valid for " + "{1}.", typeof (OracleParameter).Name, typeof (OracleParameterCollection).Name); return new ArgumentNullException ("value", msg); -#else - return new ArgumentNullException ("value"); -#endif } static Exception ParameterAlreadyOwnedException () @@ -540,12 +430,8 @@ namespace System.Data.OracleClient Exception ParameterNotFoundException (string name, int index) { string msg = string.Format (CultureInfo.InvariantCulture, -#if NET_2_0 "Index {0} is not valid for this {1}.", index, typeof (OracleParameterCollection).Name); -#else - "Parameter '{0}' not found.", name); -#endif throw new IndexOutOfRangeException (msg); } @@ -561,17 +447,11 @@ namespace System.Data.OracleClient Exception ParameterNotOwnedException (string name) { -#if NET_2_0 throw new IndexOutOfRangeException (string.Format ( CultureInfo.InvariantCulture, "{0} parameter '{1}' is not contained by " + "this {2}.", typeof (OracleParameter).Name, name, this.GetType ().Name)); -#else - throw new IndexOutOfRangeException (string.Format ( - CultureInfo.InvariantCulture, - "Parameter '{0}' does not exist.", name)); -#endif } void AssertIndex (int index) diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OraclePermission.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OraclePermission.cs index e8552f73647..b2262891dbd 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OraclePermission.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OraclePermission.cs @@ -24,7 +24,6 @@ using System.Security.Permissions; namespace System.Data.OracleClient { -#if NET_2_0 [Serializable] [MonoTODO ("Current MS implementation of Data Provider requires FullTrust")] public sealed class OraclePermission : DBDataPermission { @@ -51,95 +50,4 @@ namespace System.Data.OracleClient { return new OraclePermission (this); } } -#else - [Serializable] - [MonoTODO ("Current MS implementation of Data Provider requires FullTrust")] - public sealed class OraclePermission : CodeAccessPermission, IUnrestrictedPermission { - - #region Fields - - bool allowBlankPassword; - PermissionState state; - - #endregion // Fields - - #region Constructors - - public OraclePermission (PermissionState state) - { - this.state = state; - } - - // easier (and common) permission creation from attribute class - internal OraclePermission (OraclePermissionAttribute attribute) - { - if (attribute.Unrestricted) { - state = PermissionState.Unrestricted; - } - else { - state = PermissionState.None; - allowBlankPassword = attribute.AllowBlankPassword; - } - } - - #endregion // Constructors - - #region Properties - - public bool AllowBlankPassword { - get { return allowBlankPassword; } - set { allowBlankPassword = value; } - } - - #endregion // Properties - - #region Methods - - public override IPermission Copy () - { - OraclePermission copy = (OraclePermission) Activator.CreateInstance (this.GetType ()); - copy.AllowBlankPassword = allowBlankPassword; - copy.state = state; - return copy; - } - - // Note: No exception are thrown here to help the security runtime performance - - [MonoTODO] - public override void FromXml (SecurityElement securityElement) - { - } - - [MonoTODO] - public override IPermission Intersect (IPermission target) - { - return null; - } - - [MonoTODO] - public override bool IsSubsetOf (IPermission target) - { - return false; - } - - public bool IsUnrestricted () - { - return (state == PermissionState.Unrestricted); - } - - [MonoTODO] - public override SecurityElement ToXml () - { - return new SecurityElement ("IPermission"); - } - - [MonoTODO] - public override IPermission Union (IPermission target) - { - return null; - } - - #endregion // Methods - } -#endif } diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OraclePermissionAttribute.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OraclePermissionAttribute.cs index e36f6d650cd..55de0351fed 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OraclePermissionAttribute.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OraclePermissionAttribute.cs @@ -28,26 +28,7 @@ namespace System.Data.OracleClient { AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] -#if NET_2_0 public sealed class OraclePermissionAttribute : DBDataPermissionAttribute { -#else - public sealed class OraclePermissionAttribute : CodeAccessSecurityAttribute { - - #region Fields - - bool allowBlankPassword; - - #endregion // Fields - - #region Properties - - public bool AllowBlankPassword { - get { return allowBlankPassword; } - set { allowBlankPassword = value; } - } - - #endregion // Properties -#endif #region Constructors diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleRowUpdatingEventArgs.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleRowUpdatingEventArgs.cs index 1b32f855782..53522288ecf 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleRowUpdatingEventArgs.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleRowUpdatingEventArgs.cs @@ -39,7 +39,6 @@ namespace System.Data.OracleClient #region Properties -#if NET_2_0 protected override IDbCommand BaseCommand { get { return base.BaseCommand; @@ -48,7 +47,6 @@ namespace System.Data.OracleClient base.BaseCommand = value; } } -#endif public new OracleCommand Command { get { return (OracleCommand) base.Command; } diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleTransaction.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleTransaction.cs index 77a4af6f831..06b4580813c 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleTransaction.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleTransaction.cs @@ -22,11 +22,7 @@ using System.Data.OracleClient.Oci; namespace System.Data.OracleClient { public sealed class OracleTransaction : -#if NET_2_0 Common.DbTransaction -#else - MarshalByRefObject, IDbTransaction, IDisposable -#endif { #region Fields @@ -57,33 +53,22 @@ namespace System.Data.OracleClient } public -#if NET_2_0 new -#endif OracleConnection Connection { get { return connection; } } -#if NET_2_0 [MonoTODO] protected override Common.DbConnection DbConnection { get { return Connection; } } -#endif public -#if NET_2_0 override -#endif IsolationLevel IsolationLevel { get { return isolationLevel; } } -#if !NET_2_0 - IDbConnection IDbTransaction.Connection { - get { return Connection; } - } -#endif #endregion // Properties @@ -95,9 +80,7 @@ namespace System.Data.OracleClient } public -#if NET_2_0 override -#endif void Commit () { transaction.Commit (); @@ -105,9 +88,7 @@ namespace System.Data.OracleClient isOpen = false; } -#if NET_2_0 protected override -#endif void Dispose (bool disposing) { if (!disposed) { @@ -121,18 +102,9 @@ namespace System.Data.OracleClient } } -#if !NET_2_0 - public void Dispose () - { - Dispose (true); - GC.SuppressFinalize (this); - } -#endif public -#if NET_2_0 override -#endif void Rollback () { transaction.Rollback (); diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleType.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleType.cs index 662e2817e5b..c975b6b68b5 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleType.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleType.cs @@ -17,9 +17,6 @@ using System; namespace System.Data.OracleClient { -#if !NET_2_0 - [Serializable] -#endif public enum OracleType { BFile = 0x01, |