SF.net SVN: orm:[1518] trunk

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

Revision: 1518
          http://orm.svn.sourceforge.net/orm/?rev=1518&view=rev
Author:   mcurland
Date:     2013-05-19 05:07:26 +0000 (Sun, 19 May 2013)
Log Message:
-----------
 * Fixed bug with subset constraint from subtype to role in simple case with no supertypes between the subtype and role.

Modified Paths:
--------------
    trunk/ORMModel/ObjectModel/Constraint.cs
    trunk/Setup/Readme.htm

Modified: trunk/ORMModel/ObjectModel/Constraint.cs
===================================================================
--- trunk/ORMModel/ObjectModel/Constraint.cs	2013-05-17 23:23:44 UTC (rev 1517)
+++ trunk/ORMModel/ObjectModel/Constraint.cs	2013-05-19 05:07:26 UTC (rev 1518)
@@ -2544,9 +2544,11 @@
 										}
 									}
 									else if (subsetSupertypeRole != null &&
-											column == 0 &&
-											sequence == 1 &&
-											!superTypesCache.ContainsKey(currentRolePlayer))
+										column == 0 &&
+										sequence == 1 &&
+										populatedCaches &&
+										populatedCachesForType != currentRolePlayer &&
+										(superTypesCache == null || !superTypesCache.ContainsKey(currentRolePlayer)))
 									{
 										// Don't set if not compatible.
 										hasSubtypeSubsetError = true;

Modified: trunk/Setup/Readme.htm
===================================================================
--- trunk/Setup/Readme.htm	2013-05-17 23:23:44 UTC (rev 1517)
+++ trunk/Setup/Readme.htm	2013-05-19 05:07:26 UTC (rev 1518)
@@ -44,7 +44,7 @@
 
 <hr/>
 <h2>May 2013 CTP Changes</h2>
-<div>The May 2013 CTP release includes all modifications through changeset 1517. Full changeset descriptions can be found at the <a href="http://orm.svn.sourceforge.net/viewvc/orm/trunk/?view=log">sourceforge code repository</a> (be patient with this link, the page contains a full changeset history).</div>
+<div>The May 2013 CTP release includes all modifications through changeset 1518. Full changeset descriptions can be found at the <a href="http://orm.svn.sourceforge.net/viewvc/orm/trunk/?view=log">sourceforge code repository</a> (be patient with this link, the page contains a full changeset history).</div>
 <ul>
 <li>Feature Changes:
 <ol>
@@ -61,6 +61,7 @@
 <li>Modified z-order on an ORM diagram to ensure consistent display. By default, z-order is determined by shape creation order. Creating a new shape for an object type or fact type that uses an existing role connector would draw the connector behind the shape. This was especially noticable with objectified fact types, which could obscur the role player connects behind the objectified fact type shape.</li>
 <li>Verbalization of disjunctive mandatory constraints over multiple roles in the same fact type and multiple role player types was incorrectly correlating unrelated variables.</li>
 <li>Fixed a timing issue with shape deletion. If mouse movement started a tooltip timer on a shape that was deleted before the timer fired and the tooltip requested text, then the IDE would crash. This was hard to hit, but was not recoverable and resulted in data loss.</li>
+<li>Validating a subset constraint from a subtype to a single role crashes if the supertype hierarchy is not sufficiently complex.</li>
 </ol>
 </li>
 </ul>

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