loses subsonic#148 - test and Territory class added to verify fix

SubSonic.Core/Linq/Structure/QueryMapping.cs

@@ -98,8 +98,7 @@ public QueryLanguage Language
         /// <returns></returns>
         public virtual IEnumerable<MemberInfo> GetMappedMembers(Type rowType)
         {
-            HashSet<MemberInfo> members = new HashSet<MemberInfo>(rowType.GetFields().Cast<MemberInfo>().Where(m => this.IsMapped(m)));
-            members.UnionWith(rowType.GetProperties().Cast<MemberInfo>().Where(m => this.IsMapped(m)));
+            HashSet<MemberInfo> members = new HashSet<MemberInfo>(rowType.GetProperties().Cast<MemberInfo>().Where(m => this.IsMapped(m)));
             return members.OrderBy(m => m.Name);
         }
 

SubSonic.Tests/BugReports/ActiveRecord.cs

@@ -4,6 +4,8 @@
 using System.Text;
 using Xunit;
 using SouthWind;
+using SubSonic.Tests.Linq.TestBases;
+using SubSonic.Linq.Structure;
 
 namespace SubSonic.Tests.BugReports {
 
@@ -97,6 +99,18 @@ public void Issue158_GetPaged_With_SortOrder_Should_Not_Expect_Case_Sensitive_Or
 
             Assert.Equal("Seafood", paged[0].CategoryName);
         }
+
+				[Fact]
+				public void Issue148_TestMode_Field_Should_Not_Be_Included_In_Query()
+				{
+					var value = from employees in Employee.All()
+											join employeeTerritories in EmployeeTerritory.All() on employees.EmployeeID equals employeeTerritories.EmployeeID
+											join territories in Territory.All() on employeeTerritories.TerritoryID equals territories.TerritoryID
+											select territories.Region;
+
+
+					Assert.DoesNotContain("TestMode", (value as Query<Region>).QueryText);					 
+				}
     }
 
 }

SubSonic.Tests/BugReports/Generated/Territory.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace SouthWind
+{
+	/// <summary>
+	/// Added to enable test Issue148_TestMode_Field_Should_Not_Be_Included_In_Query
+	/// </summary>
+	public partial class Territory
+	{
+		public Region Region
+		{
+			get { return Regions.FirstOrDefault(); }
+		}
+	}
+}

SubSonic.Tests/SubSonic.Tests.csproj

@@ -78,6 +78,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Structs.tt</DependentUpon>
     </Compile>
+    <Compile Include="BugReports\Generated\Territory.cs" />
     <Compile Include="BugReports\Linq.cs" />
     <Compile Include="BugReports\LinqGeneratorBugs.cs" />
     <Compile Include="BugReports\Update.cs" />