merge -r 58185:58216

svn path=/branches/mainsoft/gh1.7/mcs/; revision=58347

diff --git a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/ChangeLog b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/ChangeLog
index e2b0744aaf09567fbaafe4e044224558676dc278..9734cab95ea20abd5d99efa1958e813f3b5fde71 100644 (file)
--- a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/ChangeLog
+++ b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-21     Boris Kirzner <borisk@miansoft.com>
+       * wrappers.cs: added ResultSet and ResultSetMetaData wrappers.
+       * OleDbOracleProvider.cs: fix OleDbOracleProvider ResultSet 
+       and ResultSetMetaData wrappers and method overrides.
+
 2006-03-05  Konstantin Triger <kostat@mainsoft.com>
 
        * IProvider.cs: add PreparedStatement extension interface.

diff --git a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbOracleProvider.cs b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbOracleProvider.cs
index 4a71e559ec75bc77f33dae595408d9142595b745..db359cc32d898c1fcc0207d9f4c01ee37c577eb9 100755 (executable)
--- a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbOracleProvider.cs
+++ b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbOracleProvider.cs
@@ -1,5 +1,5 @@
 //
-// System.Data.OleDb.OleDbConnection
+// Mainsoft.Data.Jdbc.Providers.OleDbOracleProvider
 //
 // Authors:
 //     Konstantin Triger <kostat@mainsoft.com>
@@ -41,9 +41,59 @@ namespace Mainsoft.Data.Jdbc.Providers
                #region Consts
 
                private const string Port = "Port";
+               private const string ROWID = "ROWID";
+               private const string DBTYPE_CHAR = "DBTYPE_CHAR";
 
                #endregion //Consts
 
+               #region oracle.sql.Types constants
+
+               private enum JavaSqlTypes {
+                       ARRAY = 2003 ,
+                       BIGINT = -5, 
+                       BINARY = -2 ,
+                       BIT = -7 ,
+                       BLOB = 2004, 
+                       BOOLEAN = 16, 
+                       CHAR = 1, 
+                       CLOB = 2005, 
+                       DATALINK = 70, 
+                       DATE = 91, 
+                       DECIMAL = 3, 
+                       DISTINCT = 2001, 
+                       DOUBLE = 8, 
+                       FLOAT = 6, 
+                       INTEGER = 4, 
+                       JAVA_OBJECT = 2000, 
+                       LONGVARBINARY = -4,
+                       LONGVARCHAR = -1, 
+                       NULL = 0, 
+                       NUMERIC = 2 ,
+                       OTHER = 1111 ,
+                       REAL = 7 ,
+                       REF = 2006 ,
+                       SMALLINT = 5,
+                       STRUCT = 2002, 
+                       TIME = 92, 
+                       TIMESTAMP = 93, 
+                       TINYINT = -6, 
+                       VARBINARY = -3, 
+                       VARCHAR = 12,
+
+                       //ORACLE types, see oracle.jdbc.OracleTypes
+                       BINARY_FLOAT  = 100,
+                       BINARY_DOUBLE = 101,
+                       ROWID = -8,
+                       CURSOR = -10,
+                       TIMESTAMPNS = -100,
+                       TIMESTAMPTZ = -101,
+                       TIMESTAMPLTZ = -102,
+                       INTERVALYM      = -103,
+                       INTERVALDS      = -104,
+               }
+
+               #endregion
+
                #region Fields
 
                #endregion // Fields
@@ -89,8 +139,20 @@ namespace Mainsoft.Data.Jdbc.Providers
                        public OracleConnection(java.sql.Connection connection)
                                : base(connection) {}
 
+                       public override java.sql.Statement createStatement() {
+                               return new OracleStatement (base.createStatement());
+                       }
+
+                       public override java.sql.Statement createStatement(int arg_0, int arg_1) {
+                               return new OracleStatement (base.createStatement(arg_0, arg_1));
+                       }
+
+                       public override java.sql.Statement createStatement(int arg_0, int arg_1, int arg_2) {
+                               return new OracleStatement (base.createStatement(arg_0, arg_1, arg_2));
+                       }
+
                        public override java.sql.CallableStatement prepareCall(string arg_0) {
-                               return base.prepareCall (arg_0);
+                               return new OracleCallableStatement(base.prepareCall (arg_0));
                        }
 
                        public override java.sql.CallableStatement prepareCall(string arg_0, int arg_1, int arg_2) {
@@ -128,6 +190,21 @@ namespace Mainsoft.Data.Jdbc.Providers
 
                #endregion
 
+               sealed class OracleStatement : Statement {
+
+                       public OracleStatement (java.sql.Statement statement) 
+                               : base (statement) {
+                       }
+
+                       public override java.sql.ResultSet executeQuery(string arg_0) {
+                               return new OracleResultSet (base.executeQuery(arg_0));
+                       }
+
+                       public override java.sql.ResultSet getResultSet() {
+                               return new OracleResultSet (base.getResultSet());
+                       }
+               }
+
                sealed class OraclePreparedStatement : PreparedStatement, IPreparedStatement {
                        readonly MethodInfo _info;
 
@@ -136,6 +213,10 @@ namespace Mainsoft.Data.Jdbc.Providers
                                _info = Wrapped.GetType().GetMethod("setFixedCHAR");
                        }
 
+                       public override java.sql.ResultSet executeQuery(string arg_0) {
+                               return new OracleResultSet (base.executeQuery(arg_0));
+                       }
+
                        #region IPreparedStatement Members
 
                        public void setBit(int parameterIndex, int value) {
@@ -172,6 +253,10 @@ namespace Mainsoft.Data.Jdbc.Providers
                                _info = Wrapped.GetType().GetMethod("setFixedCHAR");
                        }
 
+                       public override java.sql.ResultSet executeQuery(string arg_0) {
+                               return new OracleResultSet (base.executeQuery(arg_0));
+                       }
+
                        #region IPreparedStatement Members
 
                        public void setBit(int parameterIndex, int value) {
@@ -201,5 +286,36 @@ namespace Mainsoft.Data.Jdbc.Providers
 
                }
 
+               sealed class OracleResultSet : ResultSet {
+                       public OracleResultSet (java.sql.ResultSet resultSet) : base (resultSet) {
+                       }
+
+                       public override java.sql.ResultSetMetaData getMetaData() {
+                               return new OracleResultSetMetaData (base.getMetaData ());
+                       }
+               }
+
+               sealed class OracleResultSetMetaData: ResultSetMetaData {
+                       public OracleResultSetMetaData (java.sql.ResultSetMetaData resultSetMetaData)
+                               : base (resultSetMetaData) {
+                       }
+
+                       public override int getColumnType(int arg_0) {
+                               int jdbcType = base.getColumnType (arg_0);
+                               if ((JavaSqlTypes)jdbcType == JavaSqlTypes.ROWID)
+                                       return (int)JavaSqlTypes.VARCHAR;
+
+                               return jdbcType;
+                       }
+
+                       public override string getColumnTypeName(int arg_0) {
+                               string columnTypeName = base.getColumnTypeName (arg_0);
+                               if (ROWID == columnTypeName)
+                                       return DBTYPE_CHAR;
+
+                               return columnTypeName;
+                       }
+               }
+
        }
 }

diff --git a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/wrappers.cs b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/wrappers.cs
index 85a5585569afa0a04edf467627ddf7916f423ddf..bcbe1a893c542be9c308fb4ae45932abfa09d3bb 100755 (executable)
--- a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/wrappers.cs
+++ b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/wrappers.cs
@@ -1,5 +1,5 @@
 //
-// System.Data.OleDb.OleDbConnection
+// Mainsoft.Data.Jdbc.Providers
 //
 // Authors:
 //     Konstantin Triger <kostat@mainsoft.com>
@@ -852,5 +852,679 @@ namespace Mainsoft.Data.Jdbc.Providers {
 
        }
 
+       public class ResultSet : java.sql.ResultSet     {
+               readonly java.sql.ResultSet _resultSet;
+
+               public ResultSet (java.sql.ResultSet resultSet) {
+                       _resultSet = resultSet;
+               }
+
+               protected java.sql.ResultSet Wrapped {
+                       get { return _resultSet; }
+               }
+
+               #region ResultSet Members\r
+\r
+               public virtual java.io.InputStream getBinaryStream(int arg_0) {\r
+                       return Wrapped.getBinaryStream (arg_0);                 \r
+               }\r
+\r
+               public virtual java.io.InputStream getBinaryStream(string arg_0) {\r
+                       return Wrapped.getBinaryStream (arg_0);\r
+               }\r
+\r
+               public virtual void updateTime(int arg_0, java.sql.Time arg_1) {\r
+                       Wrapped.updateTime (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateTime(string arg_0, java.sql.Time arg_1) {\r
+                       Wrapped.updateTime (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual bool next() {\r
+                       return Wrapped.next ();\r
+               }\r
+\r
+               public virtual int getInt(int arg_0) {\r
+                       return Wrapped.getInt (arg_0);\r
+               }\r
+\r
+               public virtual int getInt(string arg_0) {\r
+                       return Wrapped.getInt (arg_0);\r
+               }\r
+\r
+               public virtual java.io.InputStream getUnicodeStream(int arg_0) {\r
+                       return Wrapped.getUnicodeStream (arg_0);\r
+               }\r
+\r
+               public virtual java.io.InputStream getUnicodeStream(string arg_0) {\r
+                       return Wrapped.getUnicodeStream (arg_0);\r
+               }\r
+\r
+               public virtual bool isAfterLast() {\r
+                       return Wrapped.isAfterLast ();\r
+               }\r
+\r
+               public virtual bool isLast() {\r
+                       return Wrapped.isLast ();\r
+               }\r
+\r
+               public virtual bool isFirst() {\r
+                       return Wrapped.isFirst ();\r
+               }\r
+\r
+               public virtual void updateRow() {\r
+                       Wrapped.updateRow ();\r
+               }\r
+\r
+               public virtual java.net.URL getURL(int arg_0) {\r
+                       return Wrapped.getURL (arg_0);                  \r
+               }\r
+\r
+               public virtual java.net.URL getURL(string arg_0) {\r
+                       return Wrapped.getURL (arg_0);                  \r
+               }\r
+\r
+               public virtual bool rowDeleted() {\r
+                       return Wrapped.rowDeleted ();\r
+               }\r
+\r
+               public virtual void updateFloat(int arg_0, float arg_1) {\r
+                       Wrapped.updateFloat (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateFloat(string arg_0, float arg_1) {\r
+                       Wrapped.updateFloat (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual object getObject(int arg_0) {\r
+                       return Wrapped.getObject (arg_0);\r
+               }\r
+\r
+               public virtual object getObject(string arg_0) {\r
+                       return Wrapped.getObject (arg_0);\r
+               }\r
+\r
+               public virtual object getObject(int arg_0, java.util.Map arg_1) {\r
+                       return Wrapped.getObject (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual object getObject(string arg_0, java.util.Map arg_1) {\r
+                       return Wrapped.getObject (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual sbyte[] getBytes(int arg_0) {\r
+                       return Wrapped.getBytes (arg_0);\r
+               }\r
+\r
+               public virtual sbyte[] getBytes(string arg_0) {\r
+                       return Wrapped.getBytes (arg_0);\r
+               }\r
+\r
+               public virtual void moveToCurrentRow() {\r
+                       Wrapped.moveToCurrentRow ();\r
+               }\r
+\r
+               public virtual sbyte getByte(int arg_0) {\r
+                       return Wrapped.getByte (arg_0);\r
+               }\r
+\r
+               public virtual sbyte getByte(string arg_0) {\r
+                       return Wrapped.getByte (arg_0);\r
+               }\r
+\r
+               public virtual void updateCharacterStream(int arg_0, java.io.Reader arg_1, int arg_2) {\r
+                       Wrapped.updateCharacterStream (arg_0, arg_1, arg_2);\r
+               }\r
+\r
+               public virtual void updateCharacterStream(string arg_0, java.io.Reader arg_1, int arg_2) {\r
+                       Wrapped.updateCharacterStream (arg_0, arg_1, arg_2);\r
+               }\r
+\r
+               public virtual void insertRow() {\r
+                       Wrapped.insertRow ();\r
+               }\r
+\r
+               public virtual void updateBoolean(int arg_0, bool arg_1) {\r
+                       Wrapped.updateBoolean (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateBoolean(string arg_0, bool arg_1) {\r
+                       Wrapped.updateBoolean (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual bool relative(int arg_0) {\r
+                       return Wrapped.relative (arg_0);\r
+               }\r
+\r
+               public virtual java.sql.Timestamp getTimestamp(int arg_0) {\r
+                       return Wrapped.getTimestamp (arg_0);\r
+               }\r
+\r
+               public virtual java.sql.Timestamp getTimestamp(string arg_0) {\r
+                       return Wrapped.getTimestamp (arg_0);\r
+               }\r
+\r
+               public virtual java.sql.Timestamp getTimestamp(int arg_0, java.util.Calendar arg_1) {\r
+                       return Wrapped.getTimestamp (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual java.sql.Timestamp getTimestamp(string arg_0, java.util.Calendar arg_1) {\r
+                       return Wrapped.getTimestamp (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateBigDecimal(int arg_0, java.math.BigDecimal arg_1) {\r
+                       Wrapped.updateBigDecimal (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateBigDecimal(string arg_0, java.math.BigDecimal arg_1) {\r
+                       Wrapped.updateBigDecimal (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateBinaryStream(int arg_0, java.io.InputStream arg_1, int arg_2) {\r
+                       Wrapped.updateBinaryStream (arg_0, arg_1, arg_2);\r
+               }\r
+\r
+               public virtual void updateBinaryStream(string arg_0, java.io.InputStream arg_1, int arg_2) {\r
+                       Wrapped.updateBinaryStream (arg_0, arg_1, arg_2);\r
+               }\r
+\r
+               public virtual void updateByte(int arg_0, sbyte arg_1) {\r
+                       Wrapped.updateByte (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateByte(string arg_0, sbyte arg_1) {\r
+                       Wrapped.updateByte (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual bool isBeforeFirst() {\r
+                       return Wrapped.isBeforeFirst ();\r
+               }\r
+\r
+               public virtual bool first() {\r
+                       return Wrapped.first ();\r
+               }\r
+\r
+               public virtual java.math.BigDecimal getBigDecimal(int arg_0, int arg_1) {\r
+                       return Wrapped.getBigDecimal (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual java.math.BigDecimal getBigDecimal(string arg_0, int arg_1) {\r
+                       return Wrapped.getBigDecimal (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual java.math.BigDecimal getBigDecimal(int arg_0) {\r
+                       return Wrapped.getBigDecimal (arg_0);\r
+               }\r
+\r
+               public virtual java.math.BigDecimal getBigDecimal(string arg_0) {\r
+                       return Wrapped.getBigDecimal (arg_0);\r
+               }\r
+\r
+               public virtual int getFetchSize() {\r
+                       return Wrapped.getFetchSize ();\r
+               }\r
+\r
+               public virtual string getString(int arg_0) {\r
+                       return Wrapped.getString (arg_0);\r
+               }\r
+\r
+               public virtual string getString(string arg_0) {\r
+                       return Wrapped.getString (arg_0);\r
+               }\r
+\r
+               public virtual bool absolute(int arg_0) {\r
+                       return Wrapped.absolute (arg_0);\r
+               }\r
+\r
+               public virtual bool last() {\r
+                       return Wrapped.last ();\r
+               }\r
+\r
+               public virtual int getFetchDirection() {\r
+                       return Wrapped.getFetchDirection ();\r
+               }\r
+\r
+               public virtual java.sql.Time getTime(int arg_0) {\r
+                       return Wrapped.getTime (arg_0);\r
+               }\r
+\r
+               public virtual java.sql.Time getTime(string arg_0) {\r
+                       return Wrapped.getTime (arg_0);\r
+               }\r
+\r
+               public virtual java.sql.Time getTime(int arg_0, java.util.Calendar arg_1) {\r
+                       return Wrapped.getTime (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual java.sql.Time getTime(string arg_0, java.util.Calendar arg_1) {\r
+                       return Wrapped.getTime (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void close() {\r
+                       Wrapped.close ();\r
+               }\r
+\r
+               public virtual void deleteRow() {\r
+                       Wrapped.deleteRow ();\r
+               }\r
+\r
+               public virtual void updateObject(int arg_0, object arg_1, int arg_2) {\r
+                       Wrapped.updateObject (arg_0, arg_1, arg_2);\r
+               }\r
+\r
+               public virtual void updateObject(int arg_0, object arg_1) {\r
+                       Wrapped.updateObject (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateObject(string arg_0, object arg_1, int arg_2) {\r
+                       Wrapped.updateObject (arg_0, arg_1, arg_2);\r
+               }\r
+\r
+               public virtual void updateObject(string arg_0, object arg_1) {\r
+                       Wrapped.updateObject (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateString(int arg_0, string arg_1) {\r
+                       Wrapped.updateString (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateString(string arg_0, string arg_1) {\r
+                       Wrapped.updateString (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual java.sql.Date getDate(int arg_0) {\r
+                       return Wrapped.getDate (arg_0);\r
+               }\r
+\r
+               public virtual java.sql.Date getDate(string arg_0) {\r
+                       return Wrapped.getDate (arg_0);\r
+               }\r
+\r
+               public virtual java.sql.Date getDate(int arg_0, java.util.Calendar arg_1) {\r
+                       return Wrapped.getDate (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual java.sql.Date getDate(string arg_0, java.util.Calendar arg_1) {\r
+                       return Wrapped.getDate (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual java.sql.Clob getClob(int arg_0) {\r
+                       return Wrapped.getClob (arg_0);\r
+               }\r
+\r
+               public virtual java.sql.Clob getClob(string arg_0) {\r
+                       return Wrapped.getClob (arg_0);\r
+               }\r
+\r
+               public virtual void moveToInsertRow() {\r
+                       Wrapped.moveToInsertRow ();\r
+               }\r
+\r
+               public virtual void updateAsciiStream(int arg_0, java.io.InputStream arg_1, int arg_2) {\r
+                       Wrapped.updateAsciiStream (arg_0, arg_1, arg_2);\r
+               }\r
+\r
+               public virtual void updateAsciiStream(string arg_0, java.io.InputStream arg_1, int arg_2) {\r
+                       Wrapped.updateAsciiStream (arg_0, arg_1, arg_2);\r
+               }\r
+\r
+               public virtual void updateRef(int arg_0, java.sql.Ref arg_1) {\r
+                       Wrapped.updateRef (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateRef(string arg_0, java.sql.Ref arg_1) {\r
+                       Wrapped.updateRef (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual int findColumn(string arg_0) {\r
+                       return Wrapped.findColumn (arg_0);\r
+               }\r
+\r
+               public virtual bool rowInserted() {\r
+                       return Wrapped.rowInserted ();\r
+               }\r
+\r
+               public virtual void updateBlob(int arg_0, java.sql.Blob arg_1) {\r
+                       Wrapped.updateBlob (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateBlob(string arg_0, java.sql.Blob arg_1) {\r
+                       Wrapped.updateBlob (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual java.sql.Array getArray(int arg_0) {\r
+                       return Wrapped.getArray (arg_0);\r
+               }\r
+\r
+               public virtual java.sql.Array getArray(string arg_0) {\r
+                       return Wrapped.getArray (arg_0);\r
+               }\r
+\r
+               public virtual void updateDouble(int arg_0, double arg_1) {\r
+                       Wrapped.updateDouble (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateDouble(string arg_0, double arg_1)\r
+               {\r
+                       Wrapped.updateDouble (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateInt(int arg_0, int arg_1) {\r
+                       Wrapped.updateInt (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateInt(string arg_0, int arg_1) {\r
+                       Wrapped.updateInt (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual long getLong(int arg_0) {\r
+                       return Wrapped.getLong (arg_0);\r
+               }\r
+\r
+               public virtual long getLong(string arg_0) {\r
+                       return Wrapped.getLong (arg_0);\r
+               }\r
+\r
+               public virtual void updateDate(int arg_0, java.sql.Date arg_1) {\r
+                       Wrapped.updateDate (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateDate(string arg_0, java.sql.Date arg_1) {\r
+                       Wrapped.updateDate (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void beforeFirst() {\r
+                       Wrapped.beforeFirst ();\r
+               }\r
+\r
+               public virtual bool wasNull() {\r
+                       return Wrapped.wasNull ();\r
+               }\r
+\r
+               public virtual void updateClob(int arg_0, java.sql.Clob arg_1) {\r
+                       Wrapped.updateClob (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateClob(string arg_0, java.sql.Clob arg_1) {\r
+                       Wrapped.updateClob (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual java.sql.Statement getStatement() {\r
+                       return Wrapped.getStatement ();\r
+               }\r
+\r
+               public virtual void setFetchDirection(int arg_0) {\r
+                       Wrapped.setFetchDirection (arg_0);\r
+               }\r
+\r
+               public virtual void cancelRowUpdates() {\r
+                       Wrapped.cancelRowUpdates ();\r
+               }\r
+\r
+               public virtual double getDouble(int arg_0) {\r
+                       return Wrapped.getDouble (arg_0);\r
+               }\r
+\r
+               public virtual double getDouble(string arg_0) {\r
+                       return Wrapped.getDouble (arg_0);\r
+               }\r
+\r
+               public virtual void updateBytes(int arg_0, sbyte[] arg_1) {\r
+                       Wrapped.updateBytes (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateBytes(string arg_0, sbyte[] arg_1) {\r
+                       Wrapped.updateBytes (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual bool previous() {\r
+                       return Wrapped.previous ();\r
+               }\r
+\r
+               public virtual float getFloat(int arg_0) {\r
+                       return Wrapped.getFloat (arg_0);\r
+               }\r
+\r
+               public virtual float getFloat(string arg_0) {\r
+                       return Wrapped.getFloat (arg_0);\r
+               }\r
+\r
+               public virtual java.io.InputStream getAsciiStream(int arg_0) {\r
+                       return Wrapped.getAsciiStream (arg_0);\r
+               }\r
+\r
+               public virtual java.io.InputStream getAsciiStream(string arg_0) {\r
+                       return Wrapped.getAsciiStream (arg_0);\r
+               }\r
+\r
+               public virtual short getShort(int arg_0) {\r
+                       return Wrapped.getShort (arg_0);\r
+               }\r
+\r
+               public virtual short getShort(string arg_0) {\r
+                       return Wrapped.getShort (arg_0);\r
+               }\r
+\r
+               public virtual java.io.Reader getCharacterStream(int arg_0) {\r
+                       return Wrapped.getCharacterStream (arg_0);\r
+               }\r
+\r
+               public virtual java.io.Reader getCharacterStream(string arg_0) {\r
+                       return Wrapped.getCharacterStream (arg_0);\r
+               }\r
+\r
+               public virtual int getConcurrency() {\r
+                       return Wrapped.getConcurrency ();\r
+               }\r
+\r
+               public virtual java.sql.ResultSetMetaData getMetaData() {\r
+                       return Wrapped.getMetaData ();\r
+               }\r
+\r
+               public virtual bool getBoolean(int arg_0) {\r
+                       return Wrapped.getBoolean (arg_0);\r
+               }\r
+\r
+               public virtual bool getBoolean(string arg_0) {\r
+                       return Wrapped.getBoolean (arg_0);\r
+               }\r
+\r
+               public virtual void updateNull(int arg_0) {\r
+                       Wrapped.updateNull (arg_0);\r
+               }\r
+\r
+               public virtual void updateNull(string arg_0) {\r
+                       Wrapped.updateNull (arg_0);\r
+               }\r
+\r
+               public void updateArray(int arg_0, java.sql.Array arg_1) {\r
+                       Wrapped.updateArray (arg_0, arg_1);\r
+               }\r
+\r
+               public void updateArray(string arg_0, java.sql.Array arg_1) {\r
+                       Wrapped.updateArray (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateLong(int arg_0, long arg_1) {\r
+                       Wrapped.updateLong (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateLong(string arg_0, long arg_1) {\r
+                       Wrapped.updateLong (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual java.sql.SQLWarning getWarnings() {\r
+                       return Wrapped.getWarnings ();\r
+                       \r
+               }\r
+\r
+               public virtual java.sql.Ref getRef(int arg_0) {\r
+                       return Wrapped.getRef (arg_0);\r
+               }\r
+\r
+               public virtual java.sql.Ref getRef(string arg_0) {\r
+                       return Wrapped.getRef (arg_0);\r
+               }\r
+\r
+               public virtual void updateTimestamp(int arg_0, java.sql.Timestamp arg_1) {\r
+                       Wrapped.updateTimestamp (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateTimestamp(string arg_0, java.sql.Timestamp arg_1) {\r
+                       Wrapped.updateTimestamp (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual bool rowUpdated() {\r
+                       return Wrapped.rowUpdated ();\r
+               }\r
+\r
+               public virtual string getCursorName() {\r
+                       return Wrapped.getCursorName ();\r
+               }\r
+\r
+               public virtual java.sql.Blob getBlob(int arg_0) {\r
+                       return Wrapped.getBlob (arg_0);\r
+               }\r
+\r
+               public virtual java.sql.Blob getBlob(string arg_0) {\r
+                       return Wrapped.getBlob (arg_0);\r
+               }\r
+\r
+               public virtual void afterLast() {\r
+                       Wrapped.afterLast ();\r
+               }\r
+\r
+               public virtual int getRow() {\r
+                       return Wrapped.getRow ();\r
+               }\r
+\r
+               public virtual void refreshRow() {\r
+                       Wrapped.refreshRow ();\r
+               }\r
+\r
+               public virtual void updateShort(int arg_0, short arg_1) {\r
+                       Wrapped.updateShort (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual void updateShort(string arg_0, short arg_1) {\r
+                       Wrapped.updateShort (arg_0, arg_1);\r
+               }\r
+\r
+               public virtual int getType() {\r
+                       return Wrapped.getType ();\r
+               }\r
+\r
+               public virtual void clearWarnings() {\r
+                       Wrapped.clearWarnings ();\r
+               }\r
+\r
+               public virtual void setFetchSize(int arg_0) {\r
+                       Wrapped.setFetchSize (arg_0);\r
+               }\r
+\r
+               #endregion
+       }
+
+       public class ResultSetMetaData : java.sql.ResultSetMetaData\r
+       {\r
+               readonly java.sql.ResultSetMetaData _resultSetMetaData;\r
+\r
+               public ResultSetMetaData (java.sql.ResultSetMetaData resultSetMetaData) {\r
+                       _resultSetMetaData = resultSetMetaData;\r
+               }\r
+\r
+               protected java.sql.ResultSetMetaData Wrapped {\r
+                       get { return _resultSetMetaData; }\r
+               }\r
+\r
+               #region ResultSetMetaData Members\r
+\r
+               public virtual int getColumnCount() {\r
+                       return Wrapped.getColumnCount ();\r
+               }\r
+\r
+               public virtual bool isReadOnly(int arg_0) {\r
+                       return Wrapped.isReadOnly (arg_0);\r
+               }\r
+\r
+               public virtual string getSchemaName(int arg_0) {\r
+                       return Wrapped.getSchemaName (arg_0);\r
+               }\r
+\r
+               public virtual int getColumnDisplaySize(int arg_0) {\r
+                       return Wrapped.getColumnDisplaySize (arg_0);\r
+               }\r
+\r
+               public virtual int getColumnType(int arg_0) {\r
+                       return Wrapped.getColumnType (arg_0);\r
+               }\r
+\r
+               public virtual bool isSigned(int arg_0) {\r
+                       return Wrapped.isSigned (arg_0);\r
+               }\r
+\r
+               public virtual int getScale(int arg_0) {\r
+                       return Wrapped.getScale (arg_0);\r
+               }\r
+\r
+               public virtual int getPrecision(int arg_0) {\r
+                       return Wrapped.getPrecision (arg_0);\r
+               }\r
+\r
+               public virtual bool isCaseSensitive(int arg_0) {\r
+                       return Wrapped.isCaseSensitive (arg_0);\r
+               }\r
+\r
+               public virtual string getTableName(int arg_0) {\r
+                       return Wrapped.getTableName (arg_0);\r
+               }\r
+\r
+               public virtual string getColumnName(int arg_0) {\r
+                       return Wrapped.getColumnName (arg_0);\r
+               }\r
+\r
+               public virtual bool isDefinitelyWritable(int arg_0) {\r
+                       return Wrapped.isDefinitelyWritable (arg_0);\r
+               }\r
+\r
+               public virtual bool isSearchable(int arg_0) {\r
+                       return Wrapped.isSearchable (arg_0);\r
+               }\r
+\r
+               public virtual string getCatalogName(int arg_0) {\r
+                       return Wrapped.getCatalogName (arg_0);\r
+               }\r
+\r
+               public virtual string getColumnTypeName(int arg_0) {\r
+                       return Wrapped.getColumnTypeName (arg_0);\r
+               }\r
+\r
+               public virtual int isNullable(int arg_0) {\r
+                       return Wrapped.isNullable (arg_0);\r
+               }\r
+\r
+               public virtual string getColumnClassName(int arg_0) {\r
+                       return Wrapped.getColumnClassName (arg_0);\r
+               }\r
+\r
+               public virtual string getColumnLabel(int arg_0) {\r
+                       return Wrapped.getColumnLabel (arg_0);\r
+               }\r
+\r
+               public virtual bool isAutoIncrement(int arg_0) {\r
+                       return Wrapped.isAutoIncrement (arg_0);\r
+               }\r
+\r
+               public virtual bool isCurrency(int arg_0) {\r
+                       return Wrapped.isCurrency (arg_0);\r
+               }\r
+\r
+               public virtual bool isWritable(int arg_0) {\r
+                       return Wrapped.isWritable (arg_0);\r
+               }
+
+               #endregion 
+       }
 
 }
\ No newline at end of file

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog b/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog
index 11ab14dec0da47294ca3b5a46a2f050c15ca4c49..756cd1289f03dbd657200eff7bc3ea980bf7e237 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog
@@ -1,3 +1,6 @@
+2006-03-21     Boris Kirzner <borisk@mainsoft.com>
+       * OleDbConnection.cs: resolve ambiguity.
+
 2006-03-06  Konstantin Triger <kostat@mainsoft.com>
 
        * OleDbConnection.cs: compare up to the provider name length.

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
index de513782a73eb921f4f0f078f6435f650a8aa2c6..2c3140c009f1ad35b94205ebc68518074913a62d 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
@@ -160,7 +160,7 @@ namespace System.Data.OleDb
                        String catalog = con.getCatalog();\r
             \r
                        DatabaseMetaData meta = con.getMetaData();\r
-                       ResultSet schemaRes = meta.getSchemas();\r
+                       java.sql.ResultSet schemaRes = meta.getSchemas();\r
                        System.Collections.ArrayList schemas = new System.Collections.ArrayList();\r
                        while(schemaRes.next()) {\r
                                schemas.Add(schemaRes.getString(1));\r
@@ -168,7 +168,7 @@ namespace System.Data.OleDb
                        schemaRes.close();\r
 \r
                        for(int i = 0; i < schemas.Count; i++) {\r
-                               ResultSet tableRes = meta.getTables(catalog, schemas[i].ToString(), null, null);\r
+                               java.sql.ResultSet tableRes = meta.getTables(catalog, schemas[i].ToString(), null, null);\r
                                while(tableRes.next()) {\r
                                        DataRow row = schemaTable.NewRow();\r
                                        row["TABLE_CATALOG"] = catalog;\r

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs
index f584b8498fe093801c5b333368606327a41b2f04..d69c1981b33b90daa4f456672227859b7b128665 100644 (file)
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs
@@ -563,7 +563,7 @@ namespace System.Data.ProviderBase
                        ArrayList col = new ArrayList();\r
                        try {\r
                                ObjectNameResolver[] nameResolvers = SyntaxPatterns;\r
-                               ResultSet res = null;\r
+                               java.sql.ResultSet res = null;\r
                                string catalog = null;\r
                                string schema = null;\r
                                string spname = null;\r

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
index e77cdb0ce396405d052ebee9bd65ec0ea0093180..14ee0809cfabd6f97c8897f9a733ee62319a6778 100644 (file)
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
@@ -1,3 +1,6 @@
+2006-03-21     Boris Kirzner <borisk@mainsoft.com>
+       * AbstractDBConnection.cs: resolve abguity.
+
 2006-03-05  Konstantin Triger <kostat@mainsoft.com>
 
        * AbstractDBCommand.cs: differentiate between setting varying and fixed length strings.