Handling NCHAR as CHAR

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

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 18bff1261e155e71131e07c86bda6c7d351648f9..1aaac9c27d3df1aec70efad362b6365cc2b108f7 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,6 @@
+2006-05-09 Boris Kirzner <borisk@mainsoft.com>
+       * OleDbSqlServerProvider.cs: handling NCHAR as CHAR for metadata.
+
 2006-05-07 Boris Kirzner <borisk@mainsoft.com>
        * OleDbSqlServerProvider.cs: adeed wrappers for sql server 2005, 
        handling NVARCHAR as VARCHAR for metadata.

diff --git a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
index 681f3af643c89d82b9887e1f0d00466bc4320e15..68ec1a354fdbb4c51e52cedfd18947971f592175 100755 (executable)
--- a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
+++ b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
@@ -312,6 +312,9 @@ namespace Mainsoft.Data.Jdbc.Providers
                                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 @@ namespace Mainsoft.Data.Jdbc.Providers
                                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;
                        }