1:1 with Composite PK that is also Composite FK

I am having a few difficulties getting NetTiers to understand my database. Basically i've got a database that looks like this:

DB Paradigm
So basically the MarketProduct is related to a Product table (ProductId), and a Market table (MarketId), and uses that association as a composite primarykey. The MainProduct Table Extends some products in the MarketProduct Table with additional Data. When I try to compile my .Net Tiers solution, I get an error (probably a naming clash):

Code Excerpt (Highlighted red line causes error):
#region MainProductCollection
//Relationship Type One : Many
if (CanDeepLoad(entity, "List<MainProduct>|MainProductCollection", deepLoadType, innerList))
{

#if NETTIERS_DEBUG
System.Diagnostics.Debug.WriteLine("- property 'MainProductCollection' loaded. key " + entity.EntityTrackingKey);
#endif
entity.MainProductCollection = DataRepository.MainProductProvider.GetByProductIdMarketId(transactionManager, entity.Id, entity.MarketId);
if (deep && entity.MainProductCollection.Count > 0)
{

deepHandles.Add("MainProductCollection",
new KeyValuePair<Delegate, object>((DeepLoadHandle<MainProduct>) DataRepository.MainProductProvider.DeepLoad,
new object[] { transactionManager, entity.MainProductCollection, deep, deepLoadType, childTypes, innerList }
));

}

}
#endregion

Sorry, Create script:

CREATE TABLE [dbo].[MainProductGroup](
 [Id] [int] NOT NULL,
 [MarketId] [int] NOT NULL,
 [ImageURL] [nvarchar](255) COLLATE Danish_Norwegian_CI_AS NOT NULL,
 [ThumbnailUrl] [nvarchar](255) COLLATE Danish_Norwegian_CI_AS NOT NULL,
 CONSTRAINT [PK_MainProductGroup_1] PRIMARY KEY CLUSTERED
(
 [Id] ASC,
 [MarketId] ASC
)WITH (IGNORE_DUP_KEY = OFF) ON [PRIMARY],
 CONSTRAINT [IX_MainProductGroup] UNIQUE NONCLUSTERED
(
 [MarketId] ASC
)WITH (IGNORE_DUP_KEY = OFF) ON [PRIMARY]
) ON [PRIMARY]

The problem is that identifying the relationship between MainProductGroup and MainProduct as a 1:M instead of 1:1.  There is a function in CommonSqlCode.cs called IsRelationOneToOne.  There is a line that is checking to see if FK table (MainProduct) is a junction table and it is returning true, which it isn't.  I don't see why this check needs to be done, since all you really need to do is see if the relationship is tied to the PK of the FK table.  I just commented out the check for the junction table and all seems well:

//The index must contain the same column
      if(i.MemberColumns.Contains(column.Name)) //&& (!IsJunctionTable(keyschema.ForeignKeyTable)))
      {
       columnIsUnique = true;
      }

If anyone can tell me why you would need that check, I would interested to hear it.  Give this a try and let us know how it works.

Everything compiles now, so far so good. I will report back here if something seems to be off in the generated code.

Appreciate the advice :)

btw. I'm running SVN 935, which resolved another issue we bumped into.

I went ahead and checked in this change with SVN 655.