Author: kostat
Date: 2006-01-29 08:25:31 -0500 (Sun, 29 Jan 2006)
New Revision: 56222

Modified:
   trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs
   trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs
   trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs
   trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConvert.cs
   trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataReader.cs
   trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlErrorCollection.cs
   trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlParameter.cs
   trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlTransaction.cs
Log:
correcting method signatures

Modified: trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs 
2006-01-29 13:23:51 UTC (rev 56221)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs 
2006-01-29 13:25:31 UTC (rev 56222)
@@ -137,7 +137,7 @@
                        return (SqlParameter)CreateParameterInternal();
                }
 
-               protected override void CheckParameters()
+               protected sealed override void CheckParameters()
                {
                        // do nothing
                }
@@ -171,17 +171,17 @@
                        return null; 
                }
 
-               protected override DbParameter CreateParameterInternal()
+               protected sealed override DbParameter CreateParameterInternal()
                {
                        return new SqlParameter();
                }
 
-               protected override DbDataReader CreateReader()
+               protected sealed override DbDataReader CreateReader()
                {
                        return new SqlDataReader(this);
                }
 
-               protected override DbParameterCollection 
CreateParameterCollection(AbstractDbCommand parent)
+               protected sealed override DbParameterCollection 
CreateParameterCollection(AbstractDbCommand parent)
                {
                        return new SqlParameterCollection((SqlCommand)parent);
                }
@@ -193,7 +193,7 @@
                        return clone;
                }
 
-               protected override SystemException CreateException(SQLException 
e)
+               protected internal sealed override SystemException 
CreateException(SQLException e)
                {
                        return new SqlException(e, Connection);         
                }

Modified: 
trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs  
2006-01-29 13:23:51 UTC (rev 56221)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs  
2006-01-29 13:25:31 UTC (rev 56222)
@@ -35,9 +35,10 @@
 using System.Data;
 using System.Data.Common;
 using System.Text;
+using System.Data.ProviderBase;
 
 namespace System.Data.SqlClient {
-       public sealed class SqlCommandBuilder : Component
+       public sealed class SqlCommandBuilder : AbstractDbCommandBuilder
        {
                #region Fields
 
@@ -364,10 +365,7 @@
 
                public static void DeriveParameters (SqlCommand 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);
                }
 
                protected override void Dispose (bool disposing)

Modified: trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs      
2006-01-29 13:23:51 UTC (rev 56221)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs      
2006-01-29 13:25:31 UTC (rev 56222)
@@ -32,6 +32,7 @@
 using System.Data;
 using System.Data.Common;
 using System.Collections;
+using System.Data.ProviderBase;
 
 using java.sql;
 
@@ -203,7 +204,7 @@
                        return CreateCommand();
                }
 
-               internal override void OnSqlWarning(SQLWarning warning)
+               protected internal sealed override void OnSqlWarning(SQLWarning 
warning)
                {
                        SqlErrorCollection col = new 
SqlErrorCollection(warning, this);
                        OnSqlInfoMessage(new SqlInfoMessageEventArgs(col));
@@ -221,12 +222,12 @@
                        return clone;
                }
 
-               protected override SystemException CreateException(SQLException 
e)
+               protected sealed override SystemException 
CreateException(SQLException e)
                {
                        return new SqlException(e, this);               
                }
 
-               protected override SystemException CreateException(string 
message)
+               protected sealed override SystemException 
CreateException(string message)
                {
                        return new SqlException(message, null, this);           
                }
@@ -238,7 +239,7 @@
                        }
                }
 
-               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.SqlClient.jvm/SqlConvert.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConvert.cs 
2006-01-29 13:23:51 UTC (rev 56221)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConvert.cs 
2006-01-29 13:25:31 UTC (rev 56222)
@@ -32,6 +32,7 @@
 
 using System;
 using System.Data.Common;
+using System.Data.ProviderBase;
 
 using java.sql;
 

Modified: trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataReader.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataReader.cs      
2006-01-29 13:23:51 UTC (rev 56221)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataReader.cs      
2006-01-29 13:25:31 UTC (rev 56222)
@@ -30,12 +30,13 @@
 //
 
 using System.Data.SqlTypes;
+using System.Data.ProviderBase;
 
 using java.sql;
 
 namespace System.Data.SqlClient
 {
-    public class SqlDataReader : System.Data.Common.AbstractDataReader
+    public class SqlDataReader : AbstractDataReader
     {
 
                #region Constructors
@@ -52,12 +53,12 @@
 
                #region Methods
 
-               protected override SystemException CreateException(string 
message, SQLException e)
+               protected sealed override SystemException 
CreateException(string message, SQLException e)
                {
                        return new SqlException(message, e, 
(SqlConnection)_command.Connection);                
                }
 
-               protected override SystemException 
CreateException(java.io.IOException e)
+               protected sealed override SystemException 
CreateException(java.io.IOException e)
                {
                        return new SqlException(e, 
(SqlConnection)_command.Connection);
                }

Modified: 
trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlErrorCollection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlErrorCollection.cs 
2006-01-29 13:23:51 UTC (rev 56221)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlErrorCollection.cs 
2006-01-29 13:25:31 UTC (rev 56222)
@@ -60,7 +60,7 @@
             }
         }
 
-               protected override AbstractDbError 
CreateDbError(java.sql.SQLException e, System.Data.Common.AbstractDBConnection 
connection) {
+               protected override AbstractDbError 
CreateDbError(java.sql.SQLException e, AbstractDBConnection connection) {
                        return new SqlError(e, connection);
                }
 

Modified: trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlParameter.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlParameter.cs       
2006-01-29 13:23:51 UTC (rev 56221)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlParameter.cs       
2006-01-29 13:25:31 UTC (rev 56222)
@@ -199,7 +199,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) {
@@ -210,7 +210,7 @@
                        return convertedValue;
                }
 
-               internal override void SetParameterName(ResultSet res)
+               protected internal sealed override void 
SetParameterName(ResultSet res)
                {
                        string name = res.getString("COLUMN_NAME");
                        if (name != null && name.Length > 0 && name[0] != '@')
@@ -218,19 +218,19 @@
                        ParameterName = name;
                }
 
-               internal override void SetParameterDbType(ResultSet res)
+               protected internal sealed override void 
SetParameterDbType(ResultSet res)
                {
                        int dataType = res.getInt("DATA_TYPE");
                        SqlDbType = SqlConvert.JdbcTypeToSqlDbType(dataType);
                        JdbcType = (DbTypes.JavaSqlTypes) dataType;
                }
 
-               internal override void SetSpecialFeatures(ResultSet res)
+               protected internal sealed override void 
SetSpecialFeatures(ResultSet res)
                {
                        // do nothing
                }
 
-               internal override DbTypes.JavaSqlTypes 
JdbcTypeFromProviderType()
+               protected internal sealed override DbTypes.JavaSqlTypes 
JdbcTypeFromProviderType()
                {
                        return 
(DbTypes.JavaSqlTypes)SqlConvert.SqlDbTypeToJdbcType(SqlDbType);
                }

Modified: 
trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlTransaction.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlTransaction.cs     
2006-01-29 13:23:51 UTC (rev 56221)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlTransaction.cs     
2006-01-29 13:25:31 UTC (rev 56222)
@@ -32,13 +32,14 @@
 namespace System.Data.SqlClient
 {
     using System.Data;
+       using System.Data.ProviderBase;
     /*
     * Current Limitations:
     * 1. Rollback(String savePoint) - not implemented.
     * 2. Save(String) - not implemented.
     */
 
-    public sealed class SqlTransaction : System.Data.Common.AbstractTransaction
+    public sealed class SqlTransaction : AbstractTransaction
     {
     
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to