Author: borisk
Date: 2006-05-09 07:17:07 -0400 (Tue, 09 May 2006)
New Revision: 60437
Modified:
trunk/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
Log:
merge 60376:60436
Modified:
trunk/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
===================================================================
---
trunk/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
2006-05-09 10:43:16 UTC (rev 60436)
+++
trunk/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
2006-05-09 11:17:07 UTC (rev 60437)
@@ -312,6 +312,9 @@
if (res == -9) // sql server 2005 jdbc driver
value for NVARCHAR
if (String.CompareOrdinal (getMetaData
().getColumnName (arg_0), DataType) == 0)
return java.sql.Types.VARCHAR;
+ if (res == -8) // sql server 2005 jdbc driver
value for NVARCHAR
+ if (String.CompareOrdinal (getMetaData
().getColumnName (arg_0), DataType) == 0)
+ return java.sql.Types.CHAR;
return res;
}
@@ -322,6 +325,10 @@
if (res == -9) // sql server 2005 jdbc driver
value for NVARCHAR
if (String.CompareOrdinal (arg_0,
DataType) == 0)
return java.sql.Types.VARCHAR;
+
+ if (res == -8) // sql server 2005 jdbc driver
value for NVARCHAR
+ if (String.CompareOrdinal (arg_0,
DataType) == 0)
+ return java.sql.Types.CHAR;
return res;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
