[Nhibernate-commit] SF.net SVN: nhibernate:[3940] trunk/nhibernate/src/NHibernate

[<fab...@us...>]

Revision: 3940
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3940&view=rev
Author:   fabiomaulo
Date:     2008-11-30 20:10:54 +0000 (Sun, 30 Nov 2008)

Log Message:
-----------
Revert of r3937 because NH-1579 is not an issue (wrong mapping)

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1579/Mappings.hbm.xml

Modified: trunk/nhibernate/src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs	2008-11-30 00:54:18 UTC (rev 3939)
+++ trunk/nhibernate/src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs	2008-11-30 20:10:54 UTC (rev 3940)
@@ -522,8 +522,7 @@
 
 		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)

Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1579/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1579/Mappings.hbm.xml	2008-11-30 00:54:18 UTC (rev 3939)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1579/Mappings.hbm.xml	2008-11-30 20:10:54 UTC (rev 3940)
@@ -4,7 +4,7 @@
     <id name="ID">
       <generator class="guid.comb" />
     </id>
-    <discriminator column="EntityType" length="64"/>
+    <discriminator column="EntityType" length="64" force="true"/>
   </class>
 
   <subclass name="Fruit" abstract="true" discriminator-value="Fruit" extends="NHibernate.Test.NHSpecificTest.NH1579.Entity, NHibernate.Test">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.