Merge pull request #303 from fvoncina/prevent-first-chance-exceptions

Prevent raising inner exceptions while IDataReader tries to get ordinal for field names.

Author: mythz

src/ServiceStack.OrmLite/OrmLiteReadExtensions.cs

@@ -155,8 +155,8 @@ internal static IEnumerable<T> Each<T>(this IDbCommand dbCmd, string filter, par
 			var fieldDefs = ModelDefinition<T>.Definition.FieldDefinitionsArray;
 			using (var reader = dbCmd.ExecReader(
 				OrmLiteConfig.DialectProvider.ToSelectStatement(typeof(T),  filter, filterParams)))
-			{
-                var indexCache = new Dictionary<string, int>();
+			{
+				var indexCache = reader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
                 while (reader.Read())
 				{
                     var row = OrmLiteUtilExtensions.CreateInstance<T>();
@@ -480,8 +480,8 @@ internal static IEnumerable<T> QueryEach<T>(this IDbCommand dbCmd, string sql, o
 
 			var fieldDefs = ModelDefinition<T>.Definition.FieldDefinitionsArray;
 			using (var reader = dbCmd.ExecuteReader())
-			{
-                var indexCache = new Dictionary<string, int>();
+			{
+				var indexCache = reader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
                 while (reader.Read())
 				{
                     var row = OrmLiteUtilExtensions.CreateInstance<T>();
@@ -497,8 +497,8 @@ internal static IEnumerable<T> EachWhere<T>(this IDbCommand dbCmd, object anonTy
 
 			var fieldDefs = ModelDefinition<T>.Definition.FieldDefinitionsArray;
 			using (var reader = dbCmd.ExecuteReader())
-			{
-                var indexCache = new Dictionary<string, int>();
+			{
+				var indexCache = reader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
                 while (reader.Read())
 				{
                     var row = OrmLiteUtilExtensions.CreateInstance<T>();

src/ServiceStack.OrmLite/OrmLiteUtilExtensions.cs

@@ -34,7 +34,8 @@ public static T ConvertTo<T>(this IDataReader dataReader)
 				if (dataReader.Read())
 				{
                     var row = CreateInstance<T>();
-					row.PopulateWithSqlReader(dataReader, fieldDefs, null);
+					var indexCache = dataReader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
+					row.PopulateWithSqlReader(dataReader, fieldDefs, indexCache);
 					return row;
 				}
 				return default(T);
@@ -48,7 +49,7 @@ public static List<T> ConvertToList<T>(this IDataReader dataReader)
 			var to = new List<T>();
 			using (dataReader)
 			{
-                var indexCache = new Dictionary<string, int>();
+				var indexCache = dataReader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
 				while (dataReader.Read())
 				{
                     var row = CreateInstance<T>();
@@ -149,5 +150,26 @@ public static SqlInValues SqlInValues<T>(this T[] values)
 		{
 			return new SqlInValues(values);
 		}
+
+		public static Dictionary<string, int> GetIndexFieldsCache(this IDataReader reader, ModelDefinition modelDefinition = null)
+		{
+			var rv = new Dictionary<string, int>();
+			for (var i = 0; i < reader.FieldCount; i++)
+			{
+				rv.Add(reader.GetName(i), i);
+			}
+			if (modelDefinition != null)
+			{
+				modelDefinition.IgnoredFieldDefinitions.ForEach(field =>
+				{
+					if (!rv.ContainsKey(field.FieldName))
+					{
+						rv.Add(field.FieldName, -1);
+					}
+				});
+			}
+			return rv;
+		}
+
 	}
 }