reverting patch for NH-1579

SVN: branches/2.0.x@3941

src/NHibernate.Test/NHibernate.Test-2.0.csproj

@@ -1,19 +1,14 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7AEE5B37-C552-4E59-9B6F-88755BCB5070}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NHibernate.Test</RootNamespace>
     <AssemblyName>NHibernate.Test</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -270,12 +265,6 @@
     <Compile Include="NHSpecificTest\BasicTimeFixture.cs" />
     <Compile Include="NHSpecificTest\BugTestCase.cs" />
     <Compile Include="NHSpecificTest\CollectionFixture.cs" />
-    <Compile Include="NHSpecificTest\NH1579\Apple.cs" />
-    <Compile Include="NHSpecificTest\NH1579\Cart.cs" />
-    <Compile Include="NHSpecificTest\NH1579\Entity.cs" />
-    <Compile Include="NHSpecificTest\NH1579\Fruit.cs" />
-    <Compile Include="NHSpecificTest\NH1579\NH1579Fixture.cs" />
-    <Compile Include="NHSpecificTest\NH1579\Orange.cs" />
     <Compile Include="NHSpecificTest\NH1077\A.cs" />
     <Compile Include="NHSpecificTest\NH1077\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1098\FilterParameterOrderFixture.cs" />
@@ -1373,9 +1362,6 @@
   <ItemGroup>
     <EmbeddedResource Include="NHSpecificTest\NH1508\Mappings.hbm.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="NHSpecificTest\NH1579\Mappings.hbm.xml" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
@@ -1395,4 +1381,4 @@ if exist hibernate.cfg.xml (del hibernate.cfg.xml)
 if exist "$(ProjectDir)hibernate.cfg.xml" (copy "$(ProjectDir)hibernate.cfg.xml" "hibernate.cfg.xml")
 copy /y "..\..\..\NHibernate.DomainModel\ABC.hbm.xml" "ABC.hbm.xml"</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs

@@ -522,8 +522,7 @@ public override string FilterFragment(string alias)
 
 		public override string OneToManyFilterFragment(string alias)
 		{
-			//Previous code was checking forceDiscriminator value here, which caused issues with collection loading.
-			return DiscriminatorFilterFragment(alias);
+			return forceDiscriminator ? DiscriminatorFilterFragment(alias) : string.Empty;
 		}
 
 		private string DiscriminatorFilterFragment(string alias)