Merge pull request dotnet#4332 from kkurni/fix-sqludt-exception

kkurni · kkurni · commit ec6e00c254bb · 2015-11-04T23:04:26.000-08:00
SqlClient - Fix SqlUDT Type Exception
diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlEnums.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlEnums.cs
@@ -704,6 +704,7 @@ internal static MetaType GetSqlDataType(int tdsType, UInt32 userType, int length
                 case TdsEnums.SQLNVARCHAR: return MetaNVarChar;
                 case TdsEnums.SQLNTEXT: return MetaNText;
                 case TdsEnums.SQLVARIANT: return s_metaVariant;
+                case TdsEnums.SQLUDT: return s_metaUdt;
                 case TdsEnums.SQLXMLTYPE: return MetaXml;
                 case TdsEnums.SQLTABLE: return s_metaTable;
                 case TdsEnums.SQLDATE: return s_metaDate;
@@ -832,6 +833,8 @@ internal static String GetStringFromXml(XmlReader xmlreader)
         private static readonly MetaType s_metaVariant = new MetaType
             (255, 255, -1, true, false, false, TdsEnums.SQLVARIANT, TdsEnums.SQLVARIANT, MetaTypeName.VARIANT, typeof(System.Object), typeof(System.Object), SqlDbType.Variant, DbType.Object, 0);
 
+        private static readonly MetaType s_metaUdt = new MetaType
+           (255, 255, -1, false, false, true, TdsEnums.SQLUDT, TdsEnums.SQLUDT, MetaTypeName.UDT, typeof(System.Object), typeof(System.Object), SqlDbType.Udt, DbType.Object, 0);
 
         private static readonly MetaType s_metaTable = new MetaType
             (255, 255, -1, false, false, false, TdsEnums.SQLTABLE, TdsEnums.SQLTABLE, MetaTypeName.TABLE, typeof(IEnumerable<DbDataRecord>), typeof(IEnumerable<DbDataRecord>), SqlDbType.Structured, DbType.Object, 0);
diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParser.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParser.cs
@@ -3199,6 +3199,8 @@ internal bool TryProcessReturnValue(int length, TdsParserStateObject stateObj, o
 
             if (tdsType == TdsEnums.SQLUDT)
             {
+                _state = TdsParserState.Broken;
+                _connHandler.BreakConnection();
                 throw SQL.UnsupportedFeatureAndToken(_connHandler, SqlDbType.Udt.ToString());
             }
 

Original file line number	Diff line number	Diff line change
`@@ -3199,6 +3199,8 @@ internal bool TryProcessReturnValue(int length, TdsParserStateObject stateObj, o`
`3199`	`3199`
`3200`	`3200`	`if (tdsType == TdsEnums.SQLUDT)`
`3201`	`3201`	`{`
	`3202`	`+ _state = TdsParserState.Broken;`
	`3203`	`+ _connHandler.BreakConnection();`
`3202`	`3204`	`throw SQL.UnsupportedFeatureAndToken(_connHandler, SqlDbType.Udt.ToString());`
`3203`	`3205`	`}`
`3204`	`3206`