Author: anagappan
Date: 2007-05-04 00:25:27 -0400 (Fri, 04 May 2007)
New Revision: 76657
Modified:
trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
trunk/mcs/class/System.Data/System.Data.Odbc/libodbc.cs
Log:
2007-05-04 Nagappan A <[EMAIL PROTECTED]>
* libodbc.cs: Wrong ODBC API definitions (using ints instead of
shorts) - Fixes bug 81306. Thanks to [EMAIL PROTECTED] and
[EMAIL PROTECTED]
* OdbcDataReader.cs: Wrong ODBC API definitions (using ints
instead of shorts) - Fixes bug 81306. Thanks to
[EMAIL PROTECTED] and [EMAIL PROTECTED]
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog 2007-05-04
04:08:23 UTC (rev 76656)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog 2007-05-04
04:25:27 UTC (rev 76657)
@@ -1,3 +1,13 @@
+2007-05-04 Nagappan A <[EMAIL PROTECTED]>
+
+ * libodbc.cs: Wrong ODBC API definitions (using ints instead of
+ shorts) - Fixes bug 81306. Thanks to [EMAIL PROTECTED] and
+ [EMAIL PROTECTED]
+
+ * OdbcDataReader.cs: Wrong ODBC API definitions (using ints
+ instead of shorts) - Fixes bug 81306. Thanks to
+ [EMAIL PROTECTED] and [EMAIL PROTECTED]
+
2007-02-09 Nagappan A <[EMAIL PROTECTED]>
* OdbcDataReader.cs (GetDecimal): Implemented new API.
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
2007-05-04 04:08:23 UTC (rev 76656)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
2007-05-04 04:25:27 UTC (rev 76657)
@@ -904,10 +904,10 @@
{
OdbcReturn ret = OdbcReturn.Error;
byte [] buffer = new byte [255];
- int outsize = 0;
+ short outsize = 0;
int val = 0;
- ret = libodbc.SQLColAttribute (hstmt, column, fieldId,
- buffer, buffer.Length,
+ ret = libodbc.SQLColAttribute (hstmt, (short)column,
fieldId,
+ buffer,
(short)buffer.Length,
ref outsize, ref val);
if (ret != OdbcReturn.Success && ret !=
OdbcReturn.SuccessWithInfo)
throw new OdbcException (new OdbcError
("SQLColAttribute",
@@ -922,10 +922,10 @@
{
OdbcReturn ret = OdbcReturn.Error;
byte [] buffer = new byte [255];
- int outsize = 0;
+ short outsize = 0;
int val = 0;
- ret = libodbc.SQLColAttribute (hstmt, column, fieldId,
- buffer, buffer.Length,
+ ret = libodbc.SQLColAttribute (hstmt, (short)column,
fieldId,
+ buffer,
(short)buffer.Length,
ref outsize, ref val);
if (ret != OdbcReturn.Success && ret !=
OdbcReturn.SuccessWithInfo)
throw new OdbcException (new OdbcError
("SQLColAttribute",
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/libodbc.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/libodbc.cs 2007-05-04
04:08:23 UTC (rev 76656)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/libodbc.cs 2007-05-04
04:25:27 UTC (rev 76657)
@@ -94,7 +94,7 @@
}
// Keep this sorted.
- internal enum FieldIdentifier
+ internal enum FieldIdentifier : short
{
AutoUniqueValue = 11, /*
SQL_DESC_AUTO_UNIQUE_VALUE */
BaseColumnName = 22, /*
SQL_DESC_BASE_COLUMN_NAME */
@@ -309,38 +309,38 @@
ref short
remainingStrLen);
[DllImport ("odbc32.dll")]
internal static extern OdbcReturn SQLColAttribute (IntPtr
StmtHandle,
- int column,
+ short
column,
FieldIdentifier fieldId,
byte []
charAttributePtr,
- int
bufferLength,
- ref int
strLengthPtr,
+ short
bufferLength,
+ ref short
strLengthPtr,
ref int
numericAttributePtr
);
[DllImport ("odbc32.dll")]
internal static extern OdbcReturn SQLPrimaryKeys (IntPtr
StmtHandle,
string
catalog,
- int
catalogLength,
+ short
catalogLength,
string
schema,
- int
schemaLength,
+ short
schemaLength,
string
tableName,
- int
tableLength
+ short
tableLength
);
[DllImport ("odbc32.dll")]
internal static extern OdbcReturn SQLStatistics (IntPtr
StmtHandle,
string catalog,
- int
catalogLength,
+ short
catalogLength,
string schema,
- int
schemaLength,
+ short
schemaLength,
string
tableName,
- int
tableLength,
+ short
tableLength,
short unique,
short Reserved
);
[DllImport ("odbc32.dll")]
internal static extern OdbcReturn SQLBindCol (IntPtr
StmtHandle,
- int column,
+ short
column,
SQL_C_TYPE
targetType,
byte []
buffer,
int
bufferLength,
@@ -349,7 +349,7 @@
[DllImport ("odbc32.dll")]
internal static extern OdbcReturn SQLBindCol (IntPtr
StmtHandle,
- int column,
+ short
column,
SQL_C_TYPE
targetType,
ref short
value,
int
bufferLength,
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
