From b9549ae4911ab443fcd5779c384494812ce04827 Mon Sep 17 00:00:00 2001
From: Davy Brion <davybrion@users.sourceforge.net>
Date: Sun, 30 Nov 2008 20:32:19 +0000
Subject: [PATCH] reverting patch for NH-1579

SVN: branches/2.0.x@3941
---
 .../NHSpecificTest/NH1579/Apple.cs            | 18 -------
 .../NHSpecificTest/NH1579/Cart.cs             | 34 -------------
 .../NHSpecificTest/NH1579/Entity.cs           | 15 ------
 .../NHSpecificTest/NH1579/Fruit.cs            | 23 ---------
 .../NHSpecificTest/NH1579/Mappings.hbm.xml    | 27 -----------
 .../NHSpecificTest/NH1579/NH1579Fixture.cs    | 48 -------------------
 .../NHSpecificTest/NH1579/Orange.cs           | 18 -------
 .../NHibernate.Test-2.0.csproj                | 20 ++------
 .../Entity/SingleTableEntityPersister.cs      |  3 +-
 9 files changed, 4 insertions(+), 202 deletions(-)
 delete mode 100644 src/NHibernate.Test/NHSpecificTest/NH1579/Apple.cs
 delete mode 100644 src/NHibernate.Test/NHSpecificTest/NH1579/Cart.cs
 delete mode 100644 src/NHibernate.Test/NHSpecificTest/NH1579/Entity.cs
 delete mode 100644 src/NHibernate.Test/NHSpecificTest/NH1579/Fruit.cs
 delete mode 100644 src/NHibernate.Test/NHSpecificTest/NH1579/Mappings.hbm.xml
 delete mode 100644 src/NHibernate.Test/NHSpecificTest/NH1579/NH1579Fixture.cs
 delete mode 100644 src/NHibernate.Test/NHSpecificTest/NH1579/Orange.cs

diff --git a/src/NHibernate.Test/NHSpecificTest/NH1579/Apple.cs b/src/NHibernate.Test/NHSpecificTest/NH1579/Apple.cs
deleted file mode 100644
index cb432c26c42..00000000000
--- a/src/NHibernate.Test/NHSpecificTest/NH1579/Apple.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NHibernate.Test.NHSpecificTest.NH1579
-{
-	public class Apple : Fruit
-	{
-		public Apple(Entity container)
-			: base(container)
-		{
-		}
-
-		protected Apple()
-		{
-		}
-	}
-}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1579/Cart.cs b/src/NHibernate.Test/NHSpecificTest/NH1579/Cart.cs
deleted file mode 100644
index a5018594995..00000000000
--- a/src/NHibernate.Test/NHSpecificTest/NH1579/Cart.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NHibernate.Test.NHSpecificTest.NH1579
-{
-	public class Cart : Entity
-	{
-		public Cart(string vendorName)
-		{
-			if (String.IsNullOrEmpty(vendorName))
-				throw new ArgumentNullException("vendorName");
-
-			VendorName = vendorName;
-			EnsureCollections();
-		}
-
-		private void EnsureCollections()
-		{
-			if(Apples == null)
-				Apples = new List<Apple>();
-			if(Oranges == null)
-				Oranges = new List<Orange>();
-		}
-
-		protected Cart()
-		{
-		}
-
-		public string VendorName { get; set; }
-		public IList<Apple> Apples { get; set; }
-		public IList<Orange> Oranges { get; set; }
-	}
-}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1579/Entity.cs b/src/NHibernate.Test/NHSpecificTest/NH1579/Entity.cs
deleted file mode 100644
index 9266d449b00..00000000000
--- a/src/NHibernate.Test/NHSpecificTest/NH1579/Entity.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NHibernate.Test.NHSpecificTest.NH1579
-{
-	public abstract class Entity
-	{
-		public Entity()
-		{
-		}
-
-		public Guid ID { get; private set; }
-	}
-}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1579/Fruit.cs b/src/NHibernate.Test/NHSpecificTest/NH1579/Fruit.cs
deleted file mode 100644
index 4f019215d3a..00000000000
--- a/src/NHibernate.Test/NHSpecificTest/NH1579/Fruit.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NHibernate.Test.NHSpecificTest.NH1579
-{
-	public abstract class Fruit : Entity
-	{
-		public Fruit(Entity container)
-		{
-			if (container == null)
-				throw new ArgumentNullException("container");
-			Container = container;
-		}
-
-		protected Fruit()
-		{
-		}
-
-		public Entity Container { get; private set; }
-
-	}
-}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1579/Mappings.hbm.xml b/src/NHibernate.Test/NHSpecificTest/NH1579/Mappings.hbm.xml
deleted file mode 100644
index 98fdf74f749..00000000000
--- a/src/NHibernate.Test/NHSpecificTest/NH1579/Mappings.hbm.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.Test.NHSpecificTest.NH1579" assembly="NHibernate.Test" default-lazy="false">
-  <class name="Entity" abstract="true" table="Entities">
-    <id name="ID">
-      <generator class="guid.comb" />
-    </id>
-    <discriminator column="EntityType" length="64"/>
-  </class>
-
-  <subclass name="Fruit" abstract="true" discriminator-value="Fruit" extends="NHibernate.Test.NHSpecificTest.NH1579.Entity, NHibernate.Test">
-    <many-to-one name="Container" column="ContainerID" />
-  </subclass>
-  <subclass name="Apple" discriminator-value="Apple" extends="NHibernate.Test.NHSpecificTest.NH1579.Fruit, NHibernate.Test"/>
-  <subclass name="Orange" discriminator-value="Orange" extends="NHibernate.Test.NHSpecificTest.NH1579.Fruit, NHibernate.Test"/>
-
-  <subclass name="Cart" discriminator-value="Cart" extends="NHibernate.Test.NHSpecificTest.NH1579.Entity, NHibernate.Test">
-    <property name="VendorName" length="128"/>
-    <bag name="Apples" cascade="all-delete-orphan" inverse="true">
-      <key column="ContainerID"/>
-      <one-to-many class="NHibernate.Test.NHSpecificTest.NH1579.Apple, NHibernate.Test"/>
-    </bag>
-    <bag name="Oranges" cascade="all-delete-orphan" inverse="true">
-      <key column="ContainerID"/>
-      <one-to-many class="NHibernate.Test.NHSpecificTest.NH1579.Orange, NHibernate.Test"/>
-    </bag>
-  </subclass>
-</hibernate-mapping>
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1579/NH1579Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1579/NH1579Fixture.cs
deleted file mode 100644
index a7daba78531..00000000000
--- a/src/NHibernate.Test/NHSpecificTest/NH1579/NH1579Fixture.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-using NUnit.Framework;
-
-namespace NHibernate.Test.NHSpecificTest.NH1579
-{
-	[TestFixture]
-	public class NH1579Fixture : BugTestCase
-	{
-		[Test]
-		public void Test()
-		{
-			Cart cart = new Cart("Fred");
-			Apple apple = new Apple(cart);
-			Orange orange = new Orange(cart);
-			cart.Apples.Add(apple);
-			cart.Oranges.Add(orange);
-
-			using (ISession session = OpenSession())
-			{
-				using (ITransaction tx = session.BeginTransaction())
-				{
-					session.Save(cart);
-					tx.Commit();
-				}
-			}
-
-			using (ISession session = OpenSession())
-			{
-				IQuery query = session.CreateQuery("FROM Fruit f WHERE f.Container.id = :containerID");
-				query.SetGuid("containerID", cart.ID);
-				IList<Fruit> fruit = query.List<Fruit>();
-				Assert.AreEqual(2, fruit.Count);
-			}
-
-			using (ISession session = OpenSession())
-			{
-				using (ITransaction tx = session.BeginTransaction())
-				{
-					session.Delete("FROM Entity");
-					tx.Commit();
-				}
-			}
-		}
-	}
-}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1579/Orange.cs b/src/NHibernate.Test/NHSpecificTest/NH1579/Orange.cs
deleted file mode 100644
index 0295cb4d44b..00000000000
--- a/src/NHibernate.Test/NHSpecificTest/NH1579/Orange.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NHibernate.Test.NHSpecificTest.NH1579
-{
-	public class Orange : Fruit
-	{
-		public Orange(Entity container)
-			: base(container)
-		{
-		}
-
-		protected Orange()
-		{
-		}
-	}
-}
diff --git a/src/NHibernate.Test/NHibernate.Test-2.0.csproj b/src/NHibernate.Test/NHibernate.Test-2.0.csproj
index 6f97807a4a6..dd117fe50eb 100644
--- a/src/NHibernate.Test/NHibernate.Test-2.0.csproj
+++ b/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>
\ No newline at end of file
diff --git a/src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs b/src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs
index c8f77c41815..df66244801b 100644
--- a/src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs
+++ b/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)