Menu
▾
▴
SF.net SVN: orm:[1395] trunk
|
From: <mcu...@us...> - 2009-06-20 23:48:33
|
Revision: 1395
http://orm.svn.sourceforge.net/orm/?rev=1395&view=rev
Author: mcurland
Date: 2009-06-20 23:48:17 +0000 (Sat, 20 Jun 2009)
Log Message:
-----------
* Recognize MultiPart conceptual names in relational name generator and eliminate partial word collapsing. refs #338
* Fix column header update issue for entity identifiers in population editor
Modified Paths:
--------------
trunk/ORMModel/Shell/SamplePopulationEditor.cs
trunk/RelationalModel/OialDcilBridge/NameGeneration.cs
trunk/RelationalModel/OialDcilBridge/OialDcilBridge.DeserializationFixupListeners.cs
trunk/Setup/Readme.htm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test1.Compare.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test2.Compare.WithIndependent.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test2.Compare.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.AfterReorder.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.OriginalOrder.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test4.Compare.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.FullyAbsorbed.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.SeparateObjectification.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.SeparateRemoteSupertype.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test6.Compare.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test7.Compare.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test8.Compare.orm
trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test9.Compare.orm
Modified: trunk/ORMModel/Shell/SamplePopulationEditor.cs
===================================================================
--- trunk/ORMModel/Shell/SamplePopulationEditor.cs 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/ORMModel/Shell/SamplePopulationEditor.cs 2009-06-20 23:48:17 UTC (rev 1395)
@@ -4329,7 +4329,7 @@
private void RoleNameChangedEvent(object sender, ElementPropertyChangedEventArgs e)
{
Role role = (Role)e.ModelElement;
- if (!role.IsDeleted && IsPartOfDisplayedIdentifier(myEntityTypeSubtype ?? myEntityTypeSubtype, role))
+ if (!role.IsDeleted && IsPartOfDisplayedIdentifier(myEntityTypeSubtype ?? myEntityType, role))
{
UpdateColumnHeaders();
}
Modified: trunk/RelationalModel/OialDcilBridge/NameGeneration.cs
===================================================================
--- trunk/RelationalModel/OialDcilBridge/NameGeneration.cs 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/RelationalModel/OialDcilBridge/NameGeneration.cs 2009-06-20 23:48:17 UTC (rev 1395)
@@ -674,26 +674,77 @@
}
#endregion // Accessor properties
#region Regex patterns
- private static Regex myReplaceFieldsPattern;
- private Regex ReplaceFieldsPattern
+ private static Regex myEmbeddedCapsRegex;
+ /// <summary>
+ /// The regular expression used to determine if a string contains
+ /// an embedded capital
+ /// </summary>
+ private Regex EmbeddedCapsRegex
{
get
{
- Regex retVal = myReplaceFieldsPattern;
+ Regex retVal = myEmbeddedCapsRegex;
if (retVal == null)
{
System.Threading.Interlocked.CompareExchange<Regex>(
- ref myReplaceFieldsPattern,
+ ref myEmbeddedCapsRegex,
new Regex(
- @"{\d+}",
+ @"(\s|.)+\p{Lu}",
RegexOptions.Compiled),
null);
- retVal = myReplaceFieldsPattern;
+ retVal = myEmbeddedCapsRegex;
}
return retVal;
}
}
+ private static Regex myAdjacentCapsRegex;
+ /// <summary>
+ /// The regular expression used to determine if a string contains
+ /// two adjacent upper case characters.
+ /// </summary>
+ private static Regex AdjacentCapsRegex
+ {
+ get
+ {
+ Regex retVal = myAdjacentCapsRegex;
+ if (retVal == null)
+ {
+ System.Threading.Interlocked.CompareExchange<Regex>(
+ ref myAdjacentCapsRegex,
+ new Regex(
+ @"\p{Lu}(?=\p{Lu})",
+ RegexOptions.Compiled),
+ null);
+ retVal = myAdjacentCapsRegex;
+ }
+ return retVal;
+ }
+ }
#endregion // Regex patterns
+ private static Regex mySplitOnUpperRegex;
+ /// <summary>
+ /// The regular expression used to split a camel or
+ /// pascal cased string into pieces. Assumes spaces
+ /// are previously stripped.
+ /// </summary>
+ private static Regex SplitOnUpperRegex
+ {
+ get
+ {
+ Regex retVal = mySplitOnUpperRegex;
+ if (retVal == null)
+ {
+ System.Threading.Interlocked.CompareExchange<Regex>(
+ ref mySplitOnUpperRegex,
+ new Regex(
+ @"(?n)\G(?<name>((^(\s|.))|\p{Lu})\P{Lu}*)",
+ RegexOptions.Compiled),
+ null);
+ retVal = mySplitOnUpperRegex;
+ }
+ return retVal;
+ }
+ }
#region Name generation methods
private string GenerateTableName(Table table, int phase)
{
@@ -843,7 +894,10 @@
{
string readingText = string.Format(CultureInfo.CurrentCulture, reading.Text, isUnary ? "\x1" : "", "\x1");
int splitPosition = readingText.LastIndexOf('\x1');
- addPart(readingText.Substring(0, splitPosition), null);
+ if (splitPosition > 0)
+ {
+ addPart(readingText.Substring(0, splitPosition), null);
+ }
if (!isUnary)
{
if (nextNode != null)
@@ -1073,7 +1127,6 @@
string newName = newNamePart;
newName = newName.Trim();
NamePartOptions options = newNamePart.Options;
- Debug.Assert(newName != null);
if (newName.IndexOfAny(NameDelimiterArray) != -1)
{
string[] individualEntries = newName.Split(NameDelimiterArray, StringSplitOptions.RemoveEmptyEntries);
@@ -1085,6 +1138,22 @@
return;
}
+ // Test for multi-part names
+ if (0 == (options & NamePartOptions.ExplicitCasing) &&
+ EmbeddedCapsRegex.IsMatch(newName) &&
+ !AdjacentCapsRegex.IsMatch(newName))
+ {
+ Match match = SplitOnUpperRegex.Match(newName);
+ int matchIndex = 0;
+ while (match.Success)
+ {
+ AddToNameCollection(ref singleName, ref nameCollection, match.Value, index == -1 ? -1 : index + matchIndex);
+ ++matchIndex;
+ match = match.NextMatch();
+ }
+ return;
+ }
+
if (singleName.IsEmpty)
{
//we only have one name so far, so just use the string
@@ -1113,8 +1182,8 @@
}
//remove duplicate information
int nextIndex;
- if ((index > 0 && ((string)nameCollection[index - 1]).EndsWith(newName, StringComparison.CurrentCultureIgnoreCase))
- || ((nextIndex = index + 1) < count && ((string)nameCollection[nextIndex]).StartsWith(newName, StringComparison.CurrentCultureIgnoreCase)))
+ if ((index > 0 && ((string)nameCollection[index - 1]).Equals(newName, StringComparison.CurrentCultureIgnoreCase))
+ || ((nextIndex = index + 1) < count && ((string)nameCollection[nextIndex]).Equals(newName, StringComparison.CurrentCultureIgnoreCase)))
{
//we don't need the name that was just added
// UNDONE: Possiblye kill this check? Name scrubbing should be handled by the current algorithm
@@ -1125,7 +1194,7 @@
//check if we need the following name
while (nextIndex < count)
{
- if (newName.EndsWith(nameCollection[nextIndex], StringComparison.CurrentCultureIgnoreCase))
+ if (newName.Equals(nameCollection[nextIndex], StringComparison.CurrentCultureIgnoreCase))
{
nameCollection.RemoveAt(nextIndex);
--count;
@@ -1139,7 +1208,7 @@
nextIndex = index - 1;
while (nextIndex > -1)
{
- if (newName.StartsWith(nameCollection[nextIndex], StringComparison.CurrentCultureIgnoreCase))
+ if (newName.Equals(nameCollection[nextIndex], StringComparison.CurrentCultureIgnoreCase))
{
nameCollection.RemoveAt(nextIndex--);
}
@@ -1545,6 +1614,10 @@
private string DoFirstLetterCase(NamePart name, bool upper, TextInfo textInfo)
{
string nameValue = name;
+ if (string.IsNullOrEmpty(nameValue))
+ {
+ return nameValue;
+ }
char c = nameValue[0];
if (upper)
{
Modified: trunk/RelationalModel/OialDcilBridge/OialDcilBridge.DeserializationFixupListeners.cs
===================================================================
--- trunk/RelationalModel/OialDcilBridge/OialDcilBridge.DeserializationFixupListeners.cs 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/RelationalModel/OialDcilBridge/OialDcilBridge.DeserializationFixupListeners.cs 2009-06-20 23:48:17 UTC (rev 1395)
@@ -51,7 +51,7 @@
/// <summary>
/// The algorithm version written to the file for the name generation algorithm
/// </summary>
- public const string CurrentNameAlgorithmVersion = "1.010";
+ public const string CurrentNameAlgorithmVersion = "1.011";
#endregion // Algorithm Version Constants
#region Fully populate from OIAL
Modified: trunk/Setup/Readme.htm
===================================================================
--- trunk/Setup/Readme.htm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/Setup/Readme.htm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -41,9 +41,10 @@
</ul>-->
<hr/>
<h2>June 2009 CTP Changes</h2>
-<div>The June 2009 CTP release includes all modifications through changeset 1394. 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 June 2009 CTP release includes all modifications through changeset 1395. 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="#Sample population mandatory error activation 2009-06">Sample population mandatory error activation</a> </li>
+<li><a href="#Relational compound name interpretation 2009-06">Relational compound name interpretation</a> </li>
<li>Other Features:
<ol>
<li>Added verbalization of default values for custom properties. This setting can be configured on a per-property basis.</li>
@@ -361,6 +362,8 @@
<li>We now have two parallel generation algorithms examining the ORM model. The current algorithm is only used when generating DDL and for the LinqToSqlAttributeMapping generator (Visual Studio 2008 only). The older code generation pieces (Plix Implementation in the generator settings dialog) are not yet using the new information. If you have an existing project with old DDL generation, it is likely you are not picking up the new generator. To fix this problem, select the .ORM file in the Solution Explorer, open the 'ORMGeneratorSettings' dialog, and expand the 'Intermediate and Secondary Files' and 'DCIL' nodes. The DCIL node should contain the 'ConceptualDB to DCIL' and 'OIAL to DCIL' generation choices. Make sure the first one is selected. This will also automatically load the required extensions when you 'Save Changes' in the 'ORM Generator Selection' dialog. In the future, all generation will use the same absorption source.</li>
<li>Column name generation has an extensive set of options. Names should now be shorter and less repetitive with other names. The main point of control for name generation is specifying how popular, unit-based, and general reference mode patterns are used when referencing EntityTypes or specifying identifying columns. The default settings for these are available on the model itself (under the 'Relational Mapping' categories) and are repeated under the 'Name Generation Settings' branch (specifically the Column Specific refinement of the 'Relational Names' branch). Overrides for individual EntityTypes are available by selecting that EntityType.</li>
<li>Additional abbreviation of individual ObjectType names as well as specific phrases are available in the 'Abbreviations' dialog for any of the Name Generation Settings nodes. Phrase abbreviations can include multiple words and can map to empty strings, which will omit the phrase. Phrases are treated case insensitively for replacement. Note that each child node in the Name Generation Settings branch is a refinement of the parent node and affects the scope where the abbreviation is supplied and all children. For example, changes made with the <em>Relational Names</em> node selected apply to both column and table names.</li>
+<li><a id="Relational compound name interpretation 2009-06" class="new" title="June 2009 CTP: Relational compound name interpretation">2009-06</a>
+Name collapsing (showing only one of two equivalent adjacent names) is performed on a whole-word basis to avoid overaggressive collapsing of partial words. For example, in previous releases, <em>BidId</em> would reduce to <em>Bid</em> and <em>FemaleMale</em> to <em>Female</em>, which was clearly incorrect. To balance this fix, the notion of a whole word has been enhanced by recognizing each part of a multi-part word in the conceptual model as a whole word. Any word with embedded capitalization that does not also have two adjacent capitals is automatically treated as a multi-part word (<em>ObjectType</em>, etc). Recognition of these word patterns also enables easier word replacement. For example, replacing the phrase <em>Employee</em> with <em>Emp</em> will affect both <em>Employee</em> and <em>ContractEmployee</em>.</li>
</ol>
<a href="#The Top">Return to top</a>
<hr/>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test1.Compare.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test1.Compare.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test1.Compare.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -11200,7 +11200,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_52A37F5B-1E80-4FCB-802E-AA9FA4315D0D" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_AFA60651-CCAD-47F2-B397-70E5855BF20B" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_CD0EC594-EDEA-44FC-9593-1DE35929D199" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_CD0EC594-EDEA-44FC-9593-1DE35929D199" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_1CA1A0E5-2553-4907-AC75-1850287F4A51" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test2.Compare.WithIndependent.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test2.Compare.WithIndependent.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test2.Compare.WithIndependent.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -285,7 +285,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_216FCBEF-24A6-4138-9F8D-255066420DD2" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_FE3D35D4-8BFA-4604-B769-6F8224F4CC89" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_AB43283A-160B-4A51-9E75-F464582D1F72" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_AB43283A-160B-4A51-9E75-F464582D1F72" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_3F310E69-550D-441F-9F8C-15CBA2CE8CEB" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test2.Compare.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test2.Compare.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test2.Compare.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -291,7 +291,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_1ECF9C7E-EC03-4118-9BF0-78AC98140751" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_4EE0E222-C3E6-4E2F-93BD-2832FD0CA530" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_B469B281-6731-4214-9C2C-6CFDAC31C903" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_B469B281-6731-4214-9C2C-6CFDAC31C903" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_DC73DBF4-111D-49C1-B301-B5F5B89FB4D8" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.AfterReorder.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.AfterReorder.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.AfterReorder.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -748,7 +748,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_93A125B5-363A-454B-A6FC-473B4987BBF7" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_B227B9F1-E66D-4885-9EBB-FA6C30E3AC66" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_75FDA8E6-2EB8-493D-A6BF-CB382F439713" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_75FDA8E6-2EB8-493D-A6BF-CB382F439713" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_0C507CBC-61D4-4B2D-ACE1-7BED6CF800A3" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
@@ -971,7 +971,7 @@
</rcd:Table>
<rcd:Table Name="I" id="_93C19EC9-9262-4EAF-B622-D7132E0AF44D">
<rcd:Columns>
- <rcd:Column id="_585E8BEC-81A5-4DD5-943D-50485EC0E57F" Name="id" />
+ <rcd:Column id="_585E8BEC-81A5-4DD5-943D-50485EC0E57F" Name="iId" />
<rcd:Column id="_D09DBE03-DC80-46B0-B58F-20EE31A06E0C" Name="f" />
<rcd:Column id="_F9F8A022-DD10-44FA-BE1F-88E240320DBD" Name="bId" />
<rcd:Column id="_8DDC2665-340B-407F-98BB-232E02D6EFCF" Name="c" />
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.OriginalOrder.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.OriginalOrder.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.OriginalOrder.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -748,7 +748,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_4CA750F7-00B1-492A-9BC2-CF24B78D16D1" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_B227B9F1-E66D-4885-9EBB-FA6C30E3AC66" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_2FD2BA8B-8F38-413C-A5ED-5C43A9F3ED0C" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_2FD2BA8B-8F38-413C-A5ED-5C43A9F3ED0C" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_0C507CBC-61D4-4B2D-ACE1-7BED6CF800A3" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
@@ -971,7 +971,7 @@
</rcd:Table>
<rcd:Table Name="I" id="_93C19EC9-9262-4EAF-B622-D7132E0AF44D">
<rcd:Columns>
- <rcd:Column id="_585E8BEC-81A5-4DD5-943D-50485EC0E57F" Name="id" />
+ <rcd:Column id="_585E8BEC-81A5-4DD5-943D-50485EC0E57F" Name="iId" />
<rcd:Column id="_D09DBE03-DC80-46B0-B58F-20EE31A06E0C" Name="f" />
<rcd:Column id="_F9F8A022-DD10-44FA-BE1F-88E240320DBD" Name="bId" />
<rcd:Column id="_8DDC2665-340B-407F-98BB-232E02D6EFCF" Name="c" />
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test3.Compare.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -748,7 +748,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_4F4B5F39-12A2-4488-9BA9-EEF2F2BB5E6D" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_21511FEB-5B88-4FBD-A74C-06B4A3C70480" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_6E61D4EE-E269-4EB5-8CD2-5D643CA8F6AB" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_6E61D4EE-E269-4EB5-8CD2-5D643CA8F6AB" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_318C6F91-A8B5-4657-8FF0-8BC95C2C83B5" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
@@ -971,7 +971,7 @@
</rcd:Table>
<rcd:Table Name="I" id="_01DCCA5F-E5CE-4753-8CED-179AD8135A06">
<rcd:Columns>
- <rcd:Column id="_7591C84C-A78E-484E-887D-628AD1BF5AC4" Name="id" />
+ <rcd:Column id="_7591C84C-A78E-484E-887D-628AD1BF5AC4" Name="iId" />
<rcd:Column id="_A642E016-33BC-402F-8723-A4759EDBA71A" Name="c" />
<rcd:Column id="_7C6D1CB3-BFD7-45C7-B74C-8D91EA55E515" Name="bId" />
<rcd:Column id="_F56A54F0-F93A-4346-974F-C792A13595B6" Name="f" />
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test4.Compare.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test4.Compare.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test4.Compare.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -382,7 +382,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_7C818355-A612-4252-B259-D23C1B8B80CB" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_479BA1D0-80FB-48DE-894E-50E9E8FC0F0B" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_035C2A13-BCD7-4021-B939-C7B0714C8324" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_035C2A13-BCD7-4021-B939-C7B0714C8324" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_C2350E6F-6523-49F4-A2E3-B021A5CE58E6" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.FullyAbsorbed.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.FullyAbsorbed.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.FullyAbsorbed.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -886,7 +886,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_953B9230-0B01-406E-B73F-E99E73B31F8D" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_B6DA4F58-8BCF-478E-82AE-C04CD0DD68C9" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_0C331C48-4E21-4197-8186-4A3769048023" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_0C331C48-4E21-4197-8186-4A3769048023" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_77081B66-EB8A-44C5-9D03-DF6573330E4B" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.SeparateObjectification.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.SeparateObjectification.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.SeparateObjectification.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -886,7 +886,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_077B1376-3174-4CAC-9C4A-B8245485F67E" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_C50661E8-E857-43F3-A1D2-9EF787A84EFE" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_CC0244D5-F67A-4DE3-8E18-4B16640FB1F1" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_CC0244D5-F67A-4DE3-8E18-4B16640FB1F1" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_BDE38DCE-8504-4AC9-9156-A927376B73B6" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.SeparateRemoteSupertype.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.SeparateRemoteSupertype.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.SeparateRemoteSupertype.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -922,7 +922,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_F689860F-F598-413B-B7D2-0DD7D4CACE41" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_B774300C-8F49-43EB-AB62-17534D8DBB42" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_0F8EAA5B-2586-41D4-9523-EDE35695503A" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_0F8EAA5B-2586-41D4-9523-EDE35695503A" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_EC000843-0D4E-43C1-80E8-527C74F04153" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test5.Compare.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -922,7 +922,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_F689860F-F598-413B-B7D2-0DD7D4CACE41" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_B774300C-8F49-43EB-AB62-17534D8DBB42" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_0F8EAA5B-2586-41D4-9523-EDE35695503A" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_0F8EAA5B-2586-41D4-9523-EDE35695503A" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_EC000843-0D4E-43C1-80E8-527C74F04153" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test6.Compare.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test6.Compare.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test6.Compare.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -328,7 +328,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_D7A0794A-6A4E-4F57-AABD-1EAA875ADCEC" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_82B2C906-24E6-4CF4-ADE5-30AEAE09EC10" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_92EDE6BB-60EE-45AE-8D58-B58A04114F45" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_92EDE6BB-60EE-45AE-8D58-B58A04114F45" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_52DB28BD-3E61-47BD-B0B9-32D2C6CA80B7" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test7.Compare.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test7.Compare.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test7.Compare.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -700,7 +700,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_65638CB4-2653-4514-A38D-9380F676A78C" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_AB78A179-3D57-4D6D-A2C8-A7FD52DCC729" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting CoreAlgorithmVersion="1.004" id="_E6A31A5A-A145-4F45-A0E9-47F04AA49D97" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting CoreAlgorithmVersion="1.004" id="_E6A31A5A-A145-4F45-A0E9-47F04AA49D97" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_A71D70CB-02A4-42A5-8CD4-DDBDE316A25B" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test8.Compare.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test8.Compare.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test8.Compare.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -205,7 +205,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_CA317692-2D5E-4094-9CC9-F7B049F0A505" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_9C9BECFF-37EA-4156-B4BF-55AD6ED21CD2" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_7A16F888-F499-4270-94C6-894CF461C356" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_7A16F888-F499-4270-94C6-894CF461C356" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_58CD2382-A0F9-4C22-806A-7FC12438339C" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
Modified: trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test9.Compare.orm
===================================================================
--- trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test9.Compare.orm 2009-06-19 01:37:26 UTC (rev 1394)
+++ trunk/TestSuites/RelationalTests/FullRegeneration/Tests.Test9.Compare.orm 2009-06-20 23:48:17 UTC (rev 1395)
@@ -364,7 +364,7 @@
<ormtooial:AbstractionModelGenerationSetting id="_FA93223F-D82D-479F-A103-D8886756E8E2" AlgorithmVersion="1.005">
<ormtooial:AbstractionModel ref="_2F7377B5-BC91-4951-B9DC-8D6389C48738" />
</ormtooial:AbstractionModelGenerationSetting>
- <oialtocdb:SchemaGenerationSetting id="_833EE616-E4B4-4F9E-9DBC-522A018D54FC" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.010">
+ <oialtocdb:SchemaGenerationSetting id="_833EE616-E4B4-4F9E-9DBC-522A018D54FC" CoreAlgorithmVersion="1.004" NameAlgorithmVersion="1.011">
<oialtocdb:Schema ref="_384966C8-3A43-4591-933B-A4D426CC424D" />
</oialtocdb:SchemaGenerationSetting>
</orm:GenerationSettings>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|