Author: kostat
Date: 2006-01-29 08:26:16 -0500 (Sun, 29 Jan 2006)
New Revision: 56223
Modified:
trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs
trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommandBuilder.cs
trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnectionFactory.cs
trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConvert.cs
trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataReader.cs
trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs
trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbTransaction.cs
Log:
correcting method signatures
Modified: trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs
2006-01-29 13:25:31 UTC (rev 56222)
+++ trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs
2006-01-29 13:26:16 UTC (rev 56223)
@@ -139,7 +139,7 @@
set { base.Transaction = (DbTransaction)value; }
}
- internal override ResultSet CurrentResultSet
+ protected internal sealed override ResultSet CurrentResultSet
{
get {
try {
@@ -188,7 +188,7 @@
return (OleDbParameter)CreateParameterInternal();
}
- protected override void CheckParameters()
+ protected sealed override void CheckParameters()
{
for(int i = 0; i < Parameters.Count; i++) {
OleDbParameter parameter =
(OleDbParameter)Parameters[i];
@@ -204,12 +204,12 @@
}
}
- protected override DbParameter CreateParameterInternal()
+ protected sealed override DbParameter CreateParameterInternal()
{
return new OleDbParameter();
}
- protected override DbParameterCollection
CreateParameterCollection(AbstractDbCommand parent)
+ protected sealed override DbParameterCollection
CreateParameterCollection(AbstractDbCommand parent)
{
return new
OleDbParameterCollection((OleDbCommand)parent);
}
@@ -243,7 +243,7 @@
return ((OleDbParameter)parameter).IsOracleRefCursor;
}
- internal override bool NextResultSet()
+ protected internal override bool NextResultSet()
{
try {
bool hasMoreResults = base.NextResultSet();
@@ -272,12 +272,12 @@
return false;
}
- protected override DbDataReader CreateReader()
+ protected sealed override DbDataReader CreateReader()
{
return new OleDbDataReader(this);
}
- protected override SystemException CreateException(SQLException
e)
+ protected internal sealed override SystemException
CreateException(SQLException e)
{
return new OleDbException(e,Connection);
}
Modified:
trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommandBuilder.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommandBuilder.cs
2006-01-29 13:25:31 UTC (rev 56222)
+++ trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommandBuilder.cs
2006-01-29 13:26:16 UTC (rev 56223)
@@ -37,13 +37,14 @@
using System.ComponentModel;
using System.Data;
using System.Data.Common;
+using System.Data.ProviderBase;
namespace System.Data.OleDb
{
/// <summary>
/// Provides a means of automatically generating single-table commands
used to reconcile changes made to a DataSet with the associated database. This
class cannot be inherited.
/// </summary>
- public sealed class OleDbCommandBuilder : Component
+ public sealed class OleDbCommandBuilder : AbstractDbCommandBuilder
{
#region Fields
@@ -105,10 +106,7 @@
public static void DeriveParameters (OleDbCommand command)
{
- if (command.Connection.State != ConnectionState.Open) {
- throw new
InvalidOperationException("DeriveParameters requires an open and available
Connection. The connection's current state is Closed.");
- }
- command.DeriveParameters ();
+ DeriveParameters((AbstractDbCommand)command);
}
[MonoTODO]
Modified: trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
2006-01-29 13:25:31 UTC (rev 56222)
+++ trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
2006-01-29 13:26:16 UTC (rev 56223)
@@ -34,6 +34,7 @@
using System.Data;
using System.Data.Common;
using System.Collections;
+using System.Data.ProviderBase;
using java.sql;
@@ -242,12 +243,12 @@
return clone;
}
- protected override SystemException CreateException(SQLException
e)
+ protected sealed override SystemException
CreateException(SQLException e)
{
return new OleDbException(e,this);
}
- protected override SystemException CreateException(string
message)
+ protected sealed override SystemException
CreateException(string message)
{
return new OleDbException(message, null, this);
}
@@ -294,7 +295,7 @@
return schemaTable;
}
- protected internal override void
ValidateConnectionString(string connectionString)
+ protected internal sealed override void
ValidateConnectionString(string connectionString)
{
base.ValidateConnectionString(connectionString);
@@ -332,13 +333,13 @@
//throw new NotImplementedException();
}
- internal override void OnSqlWarning(SQLWarning warning)
+ protected internal sealed override void OnSqlWarning(SQLWarning
warning)
{
OleDbErrorCollection col = new
OleDbErrorCollection(warning, this);
OnOleDbInfoMessage(new OleDbInfoMessageEventArgs(col));
}
- internal override Connection GetConnectionFromProvider()
+ protected internal sealed override Connection
GetConnectionFromProvider()
{
if ((ProviderType == PROVIDER_TYPE.MSDAORA) &&
("true").Equals(StringManager.GetString("ORA_CONNECTION_POOLING_ENABLED","false")))
{
@@ -362,7 +363,7 @@
+ ServerName + ":" + Port + ":" + CatalogName;
}
- internal override void OnStateChanged(ConnectionState orig,
ConnectionState current)
+ protected internal sealed override void
OnStateChanged(ConnectionState orig, ConnectionState current)
{
if(StateChange != null) {
StateChange(this, new
StateChangeEventArgs(orig, current));
Modified:
trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnectionFactory.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnectionFactory.cs
2006-01-29 13:25:31 UTC (rev 56222)
+++ trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnectionFactory.cs
2006-01-29 13:26:16 UTC (rev 56223)
@@ -34,6 +34,7 @@
using System;
using System.Data;
using System.Data.Common;
+using System.Data.ProviderBase;
using System.Reflection;
using System.Collections;
Modified: trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConvert.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConvert.cs
2006-01-29 13:25:31 UTC (rev 56222)
+++ trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConvert.cs
2006-01-29 13:26:16 UTC (rev 56223)
@@ -33,6 +33,7 @@
using System;
using System.Collections;
using System.Data.Common;
+using System.Data.ProviderBase;
using java.sql;
Modified: trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataReader.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataReader.cs
2006-01-29 13:25:31 UTC (rev 56222)
+++ trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataReader.cs
2006-01-29 13:26:16 UTC (rev 56223)
@@ -52,12 +52,12 @@
#region Methods
- protected override SystemException CreateException(string
message, SQLException e)
+ protected sealed override SystemException
CreateException(string message, SQLException e)
{
return new OleDbException(message,e,
(OleDbConnection)_command.Connection);
}
- protected override SystemException
CreateException(java.io.IOException e)
+ protected sealed override SystemException
CreateException(java.io.IOException e)
{
return new OleDbException(e,
(OleDbConnection)_command.Connection);
}
Modified: trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs
2006-01-29 13:25:31 UTC (rev 56222)
+++ trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs
2006-01-29 13:26:16 UTC (rev 56223)
@@ -137,7 +137,7 @@
}
}
- internal override bool IsSpecial {
+ protected internal sealed override bool IsSpecial {
get {
return (Direction == ParameterDirection.Output)
&& IsOracleRefCursor;
}
@@ -170,7 +170,7 @@
return clone;
}
- internal override object ConvertValue(object value)
+ protected internal sealed override object ConvertValue(object
value)
{
// can not convert null or DbNull to other types
if (value == null || value == DBNull.Value) {
@@ -194,7 +194,7 @@
return convertedValue;
}
- internal override void SetParameterName(ResultSet res)
+ protected internal sealed override void
SetParameterName(ResultSet res)
{
ParameterName = res.getString("COLUMN_NAME");
@@ -203,7 +203,7 @@
}
}
- internal override void SetParameterDbType(ResultSet res)
+ protected internal sealed override void
SetParameterDbType(ResultSet res)
{
int jdbcType = res.getInt("DATA_TYPE");
// FIXME : is that correct?
@@ -229,12 +229,12 @@
JdbcType = (DbTypes.JavaSqlTypes)jdbcType;
}
- internal override void SetSpecialFeatures(ResultSet res)
+ protected internal sealed override void
SetSpecialFeatures(ResultSet res)
{
IsOracleRefCursor = (res.getString("TYPE_NAME") == "REF
CURSOR");
}
- internal override DbTypes.JavaSqlTypes
JdbcTypeFromProviderType()
+ protected internal sealed override DbTypes.JavaSqlTypes
JdbcTypeFromProviderType()
{
return
(DbTypes.JavaSqlTypes)OleDbConvert.OleDbTypeToJdbcType(OleDbType);
}
Modified: trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbTransaction.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbTransaction.cs
2006-01-29 13:25:31 UTC (rev 56222)
+++ trunk/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbTransaction.cs
2006-01-29 13:26:16 UTC (rev 56223)
@@ -34,6 +34,7 @@
{
using System.Data.Common;
+ using System.Data.ProviderBase;
using System.Data;
public class OleDbTransaction : AbstractTransaction
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches