Menu
▾
▴
SF.net SVN: orm:[1498] trunk
|
From: <mcu...@us...> - 2012-10-31 04:41:13
|
Revision: 1498
http://orm.svn.sourceforge.net/orm/?rev=1498&view=rev
Author: mcurland
Date: 2012-10-31 04:41:06 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Various bug fixes and verbalization enhancements
* Objectification of formally fully derived fact type should not create a table and did not create one on load, but did during incremental processing.
* Multiple value constraints created on load. Regression caused by [1493] modifications.
* Name generation and object type name normalization now recognize punctuation and symbol characters as name part delimiters.
* Verbalization of separated object type names now has an option to replace certain characters with spaces. The default is ".:_"
* Verbalization of derivation rules that project a value type on an entity type use 'is identified by' to relate the entity and value. Changes to type the value (the VALUETYPE 'CONST') are still pending.
* Updated test case baselines to match recent shape and column ordering changes.
Modified Paths:
--------------
trunk/ORMModel/ObjectModel/Verbalization.cs
trunk/Setup/Readme.htm
Modified: trunk/ORMModel/ObjectModel/Verbalization.cs
===================================================================
--- trunk/ORMModel/ObjectModel/Verbalization.cs 2012-10-25 16:34:18 UTC (rev 1497)
+++ trunk/ORMModel/ObjectModel/Verbalization.cs 2012-10-31 04:41:06 UTC (rev 1498)
@@ -4720,7 +4720,7 @@
#endregion // Member variables
#region Constructor
/// <summary>
- /// Create a new <see cref="InlineSubqueryContext"/>
+ /// Create a new <see cref="InlineSubqueryRole"/>
/// </summary>
/// <param name="parentContext">The context representing the derivation path that invokes this subquery.</param>
/// <param name="parentEntryRole">The <see cref="PathedRole"/> in the context path used to invoke an instance of this subquery.</param>
@@ -4830,7 +4830,7 @@
#endregion // Member variables
#region Constructor
/// <summary>
- /// Create a new <see cref="InlineSubqueryContext"/>
+ /// Create a new <see cref="InlineSubqueryParameter"/>
/// </summary>
/// <param name="parentContext">The context representing the derivation path that invokes this subquery.</param>
/// <param name="parentEntryRole">The <see cref="PathedRole"/> in the context path used to invoke an instance of this subquery.</param>
@@ -5416,7 +5416,7 @@
/// <summary>
/// Create and attach a new variable equality node.
/// </summary>
- /// <param name="equivalentVariableKeys">A list of keys to render as equivlanet</param>
+ /// <param name="equivalentVariableKeys">A list of keys to render as equivalent</param>
/// <param name="pathContext">The path context for this node.</param>
/// <param name="parentNode">The parent <see cref="VerbalizationPlanNode"/> for the new node.</param>
/// <param name="rootNode">A reference to the root node of the chain.</param>
@@ -6478,7 +6478,7 @@
// Populate path variables for this owner and process all role paths in the root (null) path context
LinkedNode<object> pendingRequiredVariableKeys = null;
- InitializeRolePaths(null, null, pathOwner, AddPathProjections(pathOwner), ref pendingRequiredVariableKeys);
+ InitializeRolePaths(null, null, null, pathOwner, AddPathProjections(pathOwner), ref pendingRequiredVariableKeys);
VerbalizationPlanNode newRootNode = myRootPlanNode;
if (newRootNode != null)
@@ -6518,7 +6518,7 @@
BeginQuantificationUsePhase();
}
private delegate object PathContextCreator(LeadRolePath rolePath);
- private void InitializeRolePaths(object pathContext, PathContextCreator contextCreator, RolePathOwner pathOwner, IDictionary<LeadRolePath, IList<IList<object>>> equivalentVariableKeysByPath, ref LinkedNode<object> pendingRequiredVariableKeys)
+ private void InitializeRolePaths(object pathContext, PathContextCreator contextCreator, VariableKeyDecorator keyDecorator, RolePathOwner pathOwner, IDictionary<LeadRolePath, IList<IList<object>>> equivalentVariableKeysByPath, ref LinkedNode<object> pendingRequiredVariableKeys)
{
// Determine owned paths to verbalize
// Verbalize in owned/shared order. The LeadRolePathCollection is unordered.
@@ -6573,7 +6573,7 @@
{
PushSplit(outerContext, VerbalizationPlanBranchType.AndSplit, ref pendingRequiredVariableKeys);
}
- InitializeRolePath(pathContext, pathOwner, filteredPath, ref pendingRequiredVariableKeys);
+ InitializeRolePath(pathContext, pathOwner, filteredPath, keyDecorator, ref pendingRequiredVariableKeys);
if (equivalentVariables != null)
{
int equivalentVariableSetCount = equivalentVariables.Count;
@@ -6591,7 +6591,7 @@
}
}
}
- private void InitializeRolePath(object initialPathContext, RolePathOwner pathOwner, LeadRolePath leadRolePath, ref LinkedNode<object> requiredVariableKeys)
+ private void InitializeRolePath(object initialPathContext, RolePathOwner pathOwner, LeadRolePath leadRolePath, VariableKeyDecorator keyDecorator, ref LinkedNode<object> requiredVariableKeys)
{
LinkedElementCollection<CalculatedPathValue> pathConditions = leadRolePath.CalculatedConditionCollection;
int pathConditionCount = pathConditions.Count;
@@ -7045,7 +7045,7 @@
}
}
}
- AddCalculatedAndConstantProjections(initialPathContext, pathOwner, leadRolePath);
+ AddCalculatedAndConstantProjections(initialPathContext, pathOwner, leadRolePath, keyDecorator);
PopConditionalChainNode();
if (rootObjectTypeVariable != null &&
!rootObjectTypeVariable.HasBeenUsed(myLatestUsePhase, false) &&
@@ -8126,6 +8126,27 @@
int localInlineSubqueryRoleBaseIndex = inlineSubqueryRoleBaseIndex;
List<InlineSubqueryParameter> localInlineSubqueryParameters = inlineSubqueryParameters;
int localInlineSubqueryParameterBaseIndex = inlineSubqueryParameterBaseIndex;
+ VariableKeyDecorator keyDecorator = delegate(object key)
+ {
+ Role role;
+ QueryParameter parameter;
+ int index;
+ if (null != (role = key as Role))
+ {
+ if (-1 != (index = ResolveRoleIndex(queryRoles, role))) // Guard against bogus path
+ {
+ return localInlineSubqueryRoles[localInlineSubqueryRoleBaseIndex + index];
+ }
+ }
+ else if (null != (parameter = key as QueryParameter))
+ {
+ if (-1 != (index = queryParameters.IndexOf(parameter)))
+ {
+ return localInlineSubqueryParameters[localInlineSubqueryParameterBaseIndex + index]; // Guard against bogus path
+ }
+ }
+ return key; // Fallback, shouldn't reach here
+ };
IDictionary<LeadRolePath, IList<IList<object>>> equivalentSubqueryProjectionKeysByPath = GenerateRoleAndParameterProjections(
subqueryRule,
delegate(object key, LeadRolePath forRolePath, ObjectType variableType, RolePathNode correlationNode)
@@ -8143,33 +8164,16 @@
correlationNode = new RolePathNode(correlationNode, innerPathContext);
}
RolePlayerVariable newVar = RegisterRolePlayerUse(variableType, null, correlationNode, correlationNode);
- RolePlayerVariableUse? correlateWithVar = GetRolePlayerVariableUse(key);
- if (correlateWithVar.HasValue)
+ if (!correlationNode.IsEmpty)
{
- CustomCorrelateVariables(correlateWithVar.Value.PrimaryRolePlayerVariable, newVar);
- }
- },
- delegate(object key)
- {
- Role role;
- QueryParameter parameter;
- int index;
- if (null != (role = key as Role))
- {
- if (-1 != (index = ResolveRoleIndex(queryRoles, role))) // Guard against bogus path
+ RolePlayerVariableUse? correlateWithVar = GetRolePlayerVariableUse(key);
+ if (correlateWithVar.HasValue)
{
- return localInlineSubqueryRoles[localInlineSubqueryRoleBaseIndex + index];
+ CustomCorrelateVariables(correlateWithVar.Value.PrimaryRolePlayerVariable, newVar);
}
}
- else if (null != (parameter = key as QueryParameter))
- {
- if (-1 != (index = queryParameters.IndexOf(parameter)))
- {
- return localInlineSubqueryParameters[localInlineSubqueryParameterBaseIndex + index]; // Guard against bogus path
- }
- }
- return key; // Fallback, shouldn't reach here
- });
+ },
+ keyDecorator);
// Add value constraints and local condition code based on roles in the outer path
int currentPathedRoleCount = pathedRoles.Count;
@@ -8294,6 +8298,7 @@
}
return innerPathContext;
},
+ keyDecorator,
subqueryRule,
equivalentSubqueryProjectionKeysByPath,
ref pendingRequiredVariableKeys);
@@ -9133,6 +9138,12 @@
return null;
}
/// <summary>
+ /// A callback for decorating variable keys.
+ /// </summary>
+ /// <param name="key">The key value.</param>
+ /// <returns>The original key or a decorated value.</returns>
+ protected delegate object VariableKeyDecorator(object key);
+ /// <summary>
/// Add calculations and constants that are bound directly to a
/// head variable registered during <see cref="AddPathProjections"/>
/// using the <see cref="ProjectExternalVariable(Object,CalculatedPathValue,Object)"/> and
@@ -9141,7 +9152,8 @@
/// <param name="pathContext">The context representing a use of this path.</param>
/// <param name="pathOwner">The <see cref="RolePathOwner"/></param>
/// <param name="rolePath">A <see cref="LeadRolePath"/> with associated projections.</param>
- protected virtual void AddCalculatedAndConstantProjections(object pathContext, RolePathOwner pathOwner, LeadRolePath rolePath)
+ /// <param name="keyDecorator">A callback function for decorating keys of projected items.</param>
+ protected virtual void AddCalculatedAndConstantProjections(object pathContext, RolePathOwner pathOwner, LeadRolePath rolePath, VariableKeyDecorator keyDecorator)
{
// Default implementation is empty
}
@@ -10435,8 +10447,9 @@
testChildIndex = testChildIndex == 0 ? 1 : 0;
int usePhase = CurrentQuantificationUsePhase;
object pathContext = node.PathContext;
+ RolePlayerVariableUse? resolvedChildVariableUse;
if (testChildIndex >= childPathedRoles.Count || // Indicates a pure existential, we're here because the entry role can possibly be partnered.
- !GetRolePlayerVariableUse(new RolePathNode(childPathedRoles[testChildIndex], pathContext)).Value.PrimaryRolePlayerVariable.HasBeenUsed(usePhase, true))
+ ((resolvedChildVariableUse = GetRolePlayerVariableUse(new RolePathNode(childPathedRoles[testChildIndex], pathContext))).HasValue && !resolvedChildVariableUse.Value.PrimaryRolePlayerVariable.HasBeenUsed(usePhase, true)))
{
RolePlayerVariableUse variableUse = GetRolePlayerVariableUse(new RolePathNode(entryPathedRole, pathContext)).Value;
RolePlayerVariable primaryVariable = variableUse.PrimaryRolePlayerVariable;
@@ -10987,7 +11000,6 @@
return retVal;
}
private delegate void RegisterSubqueryProjectionVariable(object key, LeadRolePath rolePath, ObjectType variableType, RolePathNode correlationNode);
- private delegate object DecorateSubqueryProjectionKey(object key);
/// <summary>
/// Register variables required for projection by a subquery object. Helper method to
/// ensure consistency in subquery projection processing by <see cref="InitializeRolePath"/> and
@@ -10997,7 +11009,7 @@
/// <param name="variableRegistrar">A callback to register variables.</param>
/// <param name="keyDecorator">A callback to translate a projection key (either a role or a parameter) into a decorated key.
/// If specified, keys are preprocessed by this call before being passed to the variable registrar.</param>
- private IDictionary<LeadRolePath, IList<IList<object>>> GenerateRoleAndParameterProjections(RolePathOwner pathOwner, RegisterSubqueryProjectionVariable variableRegistrar, DecorateSubqueryProjectionKey keyDecorator)
+ private IDictionary<LeadRolePath, IList<IList<object>>> GenerateRoleAndParameterProjections(RolePathOwner pathOwner, RegisterSubqueryProjectionVariable variableRegistrar, VariableKeyDecorator keyDecorator)
{
// Overlay all projection information
// Make the QueryDerivationRule optional so that this supports inlining of derived fact types
@@ -11575,7 +11587,7 @@
/// <summary>
/// Override to bind calculation and constant projections
/// </summary>
- protected override void AddCalculatedAndConstantProjections(object pathContext, RolePathOwner pathOwner, LeadRolePath rolePath)
+ protected override void AddCalculatedAndConstantProjections(object pathContext, RolePathOwner pathOwner, LeadRolePath rolePath, VariableKeyDecorator keyDecorator)
{
// Overlay projection information
RoleSetDerivationProjection projection = RoleSetDerivationProjection.GetLink((RoleProjectedDerivationRule)pathOwner, rolePath);
@@ -11585,13 +11597,16 @@
{
CalculatedPathValue calculation;
PathConstant constant;
+ Role role;
if (null != (calculation = roleProjection.ProjectedFromCalculatedValue))
{
- ProjectExternalVariable(roleProjection.ProjectedRole, calculation, pathContext);
+ role = roleProjection.ProjectedRole;
+ ProjectExternalVariable(keyDecorator != null ? keyDecorator(role) : role, calculation, pathContext);
}
else if (null != (constant = roleProjection.ProjectedFromConstant))
{
- ProjectExternalVariable(roleProjection.ProjectedRole, constant, pathContext);
+ role = roleProjection.ProjectedRole;
+ ProjectExternalVariable(keyDecorator != null ? keyDecorator(role) : role, constant, pathContext);
}
}
}
@@ -11903,9 +11918,10 @@
/// <summary>
/// Override to bind calculation and constant projections
/// </summary>
- protected override void AddCalculatedAndConstantProjections(object pathContext, RolePathOwner pathOwner, LeadRolePath rolePath)
+ protected override void AddCalculatedAndConstantProjections(object pathContext, RolePathOwner pathOwner, LeadRolePath rolePath, VariableKeyDecorator keyDecorator)
{
- // Overlay projection information
+ // Overlay projection information.
+ // Key decorator is ignored as this is always called top level.
ConstraintRoleSequenceJoinPathProjection projection = ConstraintRoleSequenceJoinPathProjection.GetLink((ConstraintRoleSequenceJoinPath)pathOwner, rolePath);
if (projection != null)
{
@@ -12071,9 +12087,10 @@
/// <summary>
/// Override to bind calculation and constant projections
/// </summary>
- protected override void AddCalculatedAndConstantProjections(object pathContext, RolePathOwner pathOwner, LeadRolePath rolePath)
+ protected override void AddCalculatedAndConstantProjections(object pathContext, RolePathOwner pathOwner, LeadRolePath rolePath, VariableKeyDecorator keyDecorator)
{
// Overlay projection information
+ // Key decorator is ignored as this is always called top level.
ConstraintRoleSequenceJoinPathProjection projection = ConstraintRoleSequenceJoinPathProjection.GetLink((ConstraintRoleSequenceJoinPath)pathOwner, rolePath);
if (projection != null)
{
Modified: trunk/Setup/Readme.htm
===================================================================
--- trunk/Setup/Readme.htm 2012-10-25 16:34:18 UTC (rev 1497)
+++ trunk/Setup/Readme.htm 2012-10-31 04:41:06 UTC (rev 1498)
@@ -14,7 +14,7 @@
<p><b><a id="The Top" style="font-family:Verdana;font-size:medium">NORMA October 2012 CTP Readme</a> </b></p>
<p>This file supersedes the previous readme.txt and older readme.htm files. This readme has parallel indexing mechanisms: by topic, and by release date (starting with the October 2008 (2008-10) release). The file will be extended for future product releases.<br/><br/>
-The October 2012 release adds Visual Studio 2012 support and some enhances some disjunctive mandatory and external uniqueness verbalization patterns, and other bug fixes. See detailed change notes below for specifics.<br/><br/>
+The October 2012 release adds Visual Studio 2012 support, some enhancements to disjunctive mandatory and external uniqueness verbalization patterns, and other bug fixes. See detailed change notes below for specifics.<br/><br/>
</p>
<h2>Contents</h2>
<ul>
@@ -44,8 +44,9 @@
<hr/>
<h2>October 2012 CTP Changes</h2>
-<div>The October 2012 CTP release includes all modifications through changeset 1496. 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 October 2012 CTP release includes all modifications through changeset 1498. 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><a href="#VerbalizedObjectTypeNameRemoveSpecialCharacterDisplay 2012-10">Verbalized object type name separator character removal options</a></li>
<li>Bug Fixes:
<ol>
<li>Crash verbalizing internal uniqueness constraints with no roles (possible from toolbox and with error activation).</li>
@@ -574,6 +575,14 @@
<a id="VerbalizePossiblePopulationsOption 2012-04" class="new" title="April 2012 CTP: Verbalize possible populations option">2012-04</a>
The <strong>Possible Populations</strong> option has replaced the <strong>Verbalization Default Constraint</strong> option in the <em>Verbalization</em> section of the <em>ORM Designer</em> tab on the <em>Options</em> page (available on the <em>Tools</em> menu). This option now applies to the possible populations of spanning internal uniqueness constraints in addition to many-to-one binary fact types.
</li>
+<li>
+<a id="VerbalizedObjectTypeNameRemoveSpecialCharacterDisplay 2012-10" class="new" title="October 2012 CTP: Verbalized object type name separator character removal options">2012-10</a>
+As an enhancement to automatic name separation and casing of object type names (see <a href="#VerbalizedObjectTypeNameDisplay 2012-01">Verbalized object type name options</a>), punctuation and symbol characters are recognized in addition to upper cases and numeric characters.
+<ul>
+<li>All symbol and punctuation characters form word boundaries.</li>
+<li>Most special characters remain in the final name and do not get extra spaces around them.</li>
+<li>The new <em>Object Type Name Removed Characters</em> options lists special characters that should be replaced with a space. The default setting replaces the <strong>.:_</strong> (period, colon, and underscore) characters with a space in the final name.</li></ul>
+</li>
</ol>
<a href="#The Top">Return to top</a>
<hr />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
