User: mzywitza
Date: 2010/01/04 08:50 AM
Modified:
/ActiveRecord/trunk/src/
Changes.txt
/ActiveRecord/trunk/src/Castle.ActiveRecord.Framework.Internal.Tests/
Castle.ActiveRecord.Framework.Internal.Tests-vs2008.csproj,
GraphConnectorTestCase.cs
/ActiveRecord/trunk/src/Castle.ActiveRecord.Framework.Internal.Tests/Model/
GenBaseJoinedClass.cs
/ActiveRecord/trunk/src/Castle.ActiveRecord/Framework/Internal/Visitors/
GraphConnectorVisitor.cs
Log:
Resolved AR-ISSUE-274
File Changes:
Directory: /ActiveRecord/trunk/src/Castle.ActiveRecord.Framework.Internal.Tests/
================================================================================
File [modified]: Castle.ActiveRecord.Framework.Internal.Tests-vs2008.csproj
Delta lines: +12 -0
===================================================================
---
ActiveRecord/trunk/src/Castle.ActiveRecord.Framework.Internal.Tests/GraphConnectorTestCase.cs
2010-01-03 17:19:53 UTC (rev 6561)
+++
ActiveRecord/trunk/src/Castle.ActiveRecord.Framework.Internal.Tests/GraphConnectorTestCase.cs
2010-01-04 15:50:31 UTC (rev 6562)
@@ -34,5 +34,17 @@
ActiveRecordModel.GetModel(typeof(DiscriminatorGrandchild)).Parent
);
}
+
+ [Test]
+ public void ArIssue274_CanConnectGenericJoinedBase()
+ {
+ ActiveRecordStarter.Initialize(GetConfigSource(),
+ typeof(GenBaseJoinedClass<>),
+ typeof(GenIntermediateClass<>),
+ typeof(GenGrandsonClass));
+
+
Assert.That(ActiveRecordModel.GetModel(typeof(GenBaseJoinedClass<>)),
+
Is.EqualTo(ActiveRecordModel.GetModel(typeof(GenGrandsonClass)).Parent));
+ }
}
File [modified]: GraphConnectorTestCase.cs
Delta lines: +15 -0
===================================================================
---
ActiveRecord/trunk/src/Castle.ActiveRecord.Framework.Internal.Tests/Model/GenBaseJoinedClass.cs
2010-01-03 17:19:53 UTC (rev 6561)
+++
ActiveRecord/trunk/src/Castle.ActiveRecord.Framework.Internal.Tests/Model/GenBaseJoinedClass.cs
2010-01-04 15:50:31 UTC (rev 6562)
@@ -56,4 +56,19 @@
set { age = value; }
}
}
+
+ public abstract class GenIntermediateClass<T> : GenBaseJoinedClass<T>
where T:class
+ {
+
+ }
+
+ [ActiveRecord("disctableG", Lazy=false)]
+ public class GenGrandsonClass : GenIntermediateClass<GenGrandsonClass>
+ {
+ [JoinedKey]
+ public int AId { get; set; }
+
+ [Property]
+ public int AProperty { get; set; }
+ }
Directory:
/ActiveRecord/trunk/src/Castle.ActiveRecord.Framework.Internal.Tests/Model/
======================================================================================
File [modified]: GenBaseJoinedClass.cs
Delta lines: +1 -0
===================================================================
--- ActiveRecord/trunk/src/Changes.txt 2010-01-03 17:19:53 UTC (rev 6561)
+++ ActiveRecord/trunk/src/Changes.txt 2010-01-04 15:50:31 UTC (rev 6562)
@@ -3,6 +3,7 @@
- Bugs fixed:
AR-ISSUE-271
AR-ISSUE-272
+ AR-ISSUE-274
AR-ISSUE-275
AR-ISSUE-276
Directory:
/ActiveRecord/trunk/src/Castle.ActiveRecord/Framework/Internal/Visitors/
===================================================================================
File [modified]: GraphConnectorVisitor.cs
Delta lines: +6 -6
===================================================================
---
ActiveRecord/trunk/src/Castle.ActiveRecord.Framework.Internal.Tests/Castle.ActiveRecord.Framework.Internal.Tests-vs2008.csproj
2010-01-03 17:19:53 UTC (rev 6561)
+++
ActiveRecord/trunk/src/Castle.ActiveRecord.Framework.Internal.Tests/Castle.ActiveRecord.Framework.Internal.Tests-vs2008.csproj
2010-01-04 15:50:31 UTC (rev 6562)
@@ -77,21 +77,21 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Castle.Components.Validator, Version=0.0.1.0,
Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+ <Reference Include="Castle.Components.Validator, Version=1.1.0.0,
Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
-
<HintPath>..\..\build\net-3.5\debug\Castle.Components.Validator.dll</HintPath>
+ <HintPath>..\..\lib\net-3.5\Castle.Components.Validator.dll</HintPath>
</Reference>
- <Reference Include="Castle.Core, Version=0.0.1.0, Culture=neutral,
PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+ <Reference Include="Castle.Core, Version=1.1.0.0, Culture=neutral,
PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\build\net-3.5\debug\Castle.Core.dll</HintPath>
+ <HintPath>..\..\lib\net-3.5\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Castle.DynamicProxy2, Version=2.1.0.0,
Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\net-3.5\Castle.DynamicProxy2.dll</HintPath>
</Reference>
- <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral,
PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+ <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral,
PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\build\net-3.5\debug\Iesi.Collections.dll</HintPath>
+ <HintPath>..\..\lib\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=2.1.0.2002, Culture=neutral,
PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
Directory: /ActiveRecord/trunk/src/
===================================
File [modified]: Changes.txt
Delta lines: +0 -0
===================================================================
--
You received this message because you are subscribed to the Google Groups
"Castle Project Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/castle-project-commits?hl=en.
