SF.net SVN: orm:[1491] trunk/ORMModel/ObjectModel/Verbalization.cs

[<mcu...@us...>]

Revision: 1491
          http://orm.svn.sourceforge.net/orm/?rev=1491&view=rev
Author:   mcurland
Date:     2012-09-10 23:19:43 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
Set comparison constraint paired columns in non-joined rows did not pair compatible but unequal variables. 'some A that is that B' was rendered incorrectly as 'some A'. Bug introduced in [1490]

Modified Paths:
--------------
    trunk/ORMModel/ObjectModel/Verbalization.cs

Modified: trunk/ORMModel/ObjectModel/Verbalization.cs
===================================================================
--- trunk/ORMModel/ObjectModel/Verbalization.cs	2012-09-08 03:59:31 UTC (rev 1490)
+++ trunk/ORMModel/ObjectModel/Verbalization.cs	2012-09-10 23:19:43 UTC (rev 1491)
@@ -8968,13 +8968,14 @@
 				}
 				if (joinToVariable != null)
 				{
-					if (joinedToCustomCorrelatedVariable && !existingVariable.IsCustomCorrelated)
+					if (joinedToExternalVariable && !existingVariable.IsExternalVariable)
 					{
+						existingVariable.IsExternalVariable = true;
 						CustomCorrelateVariables(joinToVariable, existingVariable);
 					}
-					if (joinedToExternalVariable && !existingVariable.IsExternalVariable)
+					else if (joinedToCustomCorrelatedVariable && !existingVariable.IsCustomCorrelated)
 					{
-						existingVariable.IsExternalVariable = true;
+						CustomCorrelateVariables(joinToVariable, existingVariable);
 					}
 				}
 				existingVariable.Use(myLatestUsePhase, false);

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