Menu
▾
▴
nhibernate-commit
|
From: <fab...@us...> - 2011-04-13 17:28:45
|
Revision: 5687
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5687&view=rev
Author: fabiomaulo
Date: 2011-04-13 17:28:38 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
Added schema-action for joined-subclass
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs
trunk/nhibernate/src/NHibernate/nhibernate-mapping.xsd
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs 2011-04-13 17:12:52 UTC (rev 5686)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs 2011-04-13 17:28:38 UTC (rev 5687)
@@ -2,7 +2,7 @@
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -83,7 +83,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -110,7 +110,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -128,7 +128,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -193,7 +193,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -207,7 +207,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -372,7 +372,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -386,7 +386,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -413,7 +413,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmCacheUsage {
@@ -436,7 +436,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmCacheInclude {
@@ -451,7 +451,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -465,7 +465,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -524,7 +524,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmOndelete {
@@ -539,7 +539,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -565,7 +565,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -586,7 +586,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -618,7 +618,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -636,7 +636,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -774,7 +774,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -788,7 +788,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmOuterJoinStrategy {
@@ -807,7 +807,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmFetchMode {
@@ -822,7 +822,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmLaziness {
@@ -841,7 +841,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmNotFoundMode {
@@ -856,7 +856,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -892,7 +892,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1009,7 +1009,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1027,7 +1027,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1045,7 +1045,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmPropertyGeneration {
@@ -1064,7 +1064,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1125,7 +1125,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1155,7 +1155,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1259,7 +1259,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1281,7 +1281,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmRestrictedLaziness {
@@ -1296,7 +1296,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1333,7 +1333,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1347,7 +1347,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1377,7 +1377,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmCustomSQLCheck {
@@ -1396,7 +1396,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmCollectionFetchMode {
@@ -1415,7 +1415,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1595,7 +1595,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmCollectionLazy {
@@ -1614,7 +1614,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1833,7 +1833,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1855,7 +1855,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmTuplizerEntitymode {
@@ -1874,7 +1874,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1924,7 +1924,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1983,7 +1983,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2028,7 +2028,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmUnsavedValueType {
@@ -2047,7 +2047,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2099,7 +2099,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2117,7 +2117,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2171,7 +2171,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2198,7 +2198,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2284,7 +2284,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2348,7 +2348,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2533,7 +2533,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2727,7 +2727,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2746,7 +2746,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2765,7 +2765,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2791,7 +2791,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2821,7 +2821,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2856,7 +2856,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2891,7 +2891,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2984,7 +2984,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3126,7 +3126,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmPrimitivearrayOuterjoin {
@@ -3145,7 +3145,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmPrimitivearrayFetch {
@@ -3164,7 +3164,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3348,7 +3348,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3531,7 +3531,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3564,7 +3564,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3617,7 +3617,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmTimestampUnsavedvalue {
@@ -3632,7 +3632,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmTimestampSource {
@@ -3647,7 +3647,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmVersionGeneration {
@@ -3662,7 +3662,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3723,7 +3723,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3775,7 +3775,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3858,7 +3858,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmJoinFetch {
@@ -3873,7 +3873,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3964,6 +3964,10 @@
public string table;
/// <remarks/>
+ [System.Xml.Serialization.XmlAttributeAttribute("schema-action")]
+ public string schemaaction;
+
+ /// <remarks/>
[System.Xml.Serialization.XmlAttributeAttribute()]
public string schema;
@@ -4034,7 +4038,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4055,7 +4059,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.0.0.4000")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "3.2.0.1001")]
[System.SerializableAttribute()]
...
[truncated message content] |
|
From: <fab...@us...> - 2011-04-13 17:34:42
|
Revision: 5688
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5688&view=rev
Author: fabiomaulo
Date: 2011-04-13 17:34:36 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
Fix NH-2644
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/JoinedSubclassBinder.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IJoinedSubclassMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinedSubclassMapper.cs
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/JoinedSubclassBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/JoinedSubclassBinder.cs 2011-04-13 17:28:38 UTC (rev 5687)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/JoinedSubclassBinder.cs 2011-04-13 17:34:36 UTC (rev 5688)
@@ -38,12 +38,7 @@
string schema = joinedSubclassMapping.schema ?? mappings.SchemaName;
string catalog = joinedSubclassMapping.catalog ?? mappings.CatalogName;
- // TODO: very strange, the schema does not support it
- //XmlAttribute actionNode = subnode.Attributes["schema-action"];
- //string action = actionNode == null ? "all" : actionNode.Value;
- string action = "all";
-
- Table mytable = mappings.AddTable(schema, catalog, GetClassTableName(subclass, joinedSubclassMapping.table), joinedSubclassMapping.Subselect, false, action);
+ Table mytable = mappings.AddTable(schema, catalog, GetClassTableName(subclass, joinedSubclassMapping.table), joinedSubclassMapping.Subselect, false, joinedSubclassMapping.schemaaction);
((ITableOwner)subclass).Table = mytable;
log.InfoFormat("Mapping joined-subclass: {0} -> {1}", subclass.EntityName, subclass.Table.Name);
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IJoinedSubclassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IJoinedSubclassMapper.cs 2011-04-13 17:28:38 UTC (rev 5687)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IJoinedSubclassMapper.cs 2011-04-13 17:34:36 UTC (rev 5688)
@@ -9,6 +9,7 @@
void Schema(string schemaName);
void Key(Action<IKeyMapper> keyMapping);
void Extends(System.Type baseType);
+ void SchemaAction(SchemaAction action);
}
public interface IJoinedSubclassMapper : IJoinedSubclassAttributesMapper, IPropertyContainerMapper {}
@@ -19,6 +20,7 @@
void Catalog(string catalogName);
void Schema(string schemaName);
void Key(Action<IKeyMapper<TEntity>> keyMapping);
+ void SchemaAction(SchemaAction action);
}
public interface IJoinedSubclassMapper<TEntity> : IJoinedSubclassAttributesMapper<TEntity>, IPropertyContainerMapper<TEntity> where TEntity : class {}
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs 2011-04-13 17:28:38 UTC (rev 5687)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs 2011-04-13 17:34:36 UTC (rev 5688)
@@ -25,6 +25,11 @@
keyMapping(keyMapper);
}
+ public void SchemaAction(SchemaAction action)
+ {
+ CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinedSubclassAttributesMapper m) => m.SchemaAction(action));
+ }
+
public void EntityName(string value)
{
CustomizersHolder.AddCustomizer(typeof (TEntity), (IJoinedSubclassAttributesMapper m) => m.EntityName(value));
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinedSubclassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinedSubclassMapper.cs 2011-04-13 17:28:38 UTC (rev 5687)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinedSubclassMapper.cs 2011-04-13 17:34:36 UTC (rev 5688)
@@ -171,6 +171,11 @@
classMapping.extends = baseType.GetShortClassName(MapDoc);
}
+ public void SchemaAction(SchemaAction action)
+ {
+ classMapping.schemaaction = action.ToSchemaActionString();
+ }
+
#endregion
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-13 17:44:42
|
Revision: 5689
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5689&view=rev
Author: fabiomaulo
Date: 2011-04-13 17:44:36 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
Improved filter for conformist mapping registration
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ClassMappingRegistrationTest.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-13 17:34:36 UTC (rev 5688)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-13 17:44:36 UTC (rev 5689)
@@ -1645,7 +1645,7 @@
{
throw new ArgumentNullException("types");
}
- foreach (var type in types.Where(x=> typeof(IConformistHoldersProvider).IsAssignableFrom(x)))
+ foreach (var type in types.Where(x=> typeof(IConformistHoldersProvider).IsAssignableFrom(x) && !x.IsGenericTypeDefinition))
{
AddMapping(type);
}
Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ClassMappingRegistrationTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ClassMappingRegistrationTest.cs 2011-04-13 17:34:36 UTC (rev 5688)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ClassMappingRegistrationTest.cs 2011-04-13 17:44:36 UTC (rev 5689)
@@ -15,6 +15,14 @@
public string Something { get; set; }
}
+ private class MyClassBaseMap<T> : ClassMapping<T> where T:MyClass
+ {
+ public MyClassBaseMap()
+ {
+ Id(x => x.Id, map => map.Column("MyClassId"));
+ }
+ }
+
private class MyClassMap: ClassMapping<MyClass>
{
public MyClassMap()
@@ -62,7 +70,7 @@
public void WhenRegisterClassMappingThroughCollectionOfTypeThenFilterValidMappings()
{
var mapper = new ModelMapper();
- mapper.Executing(x=> x.AddMappings(new[] { typeof(object), typeof(MyClassMap), typeof(MyClass) })).NotThrows();
+ mapper.Executing(x => x.AddMappings(new[] { typeof(object), typeof(MyClassMap), typeof(MyClass), typeof(MyClassBaseMap<>) })).NotThrows();
var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
ModelIsWellFormed(hbmMapping);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-13 18:16:47
|
Revision: 5691
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5691&view=rev
Author: fabiomaulo
Date: 2011-04-13 18:16:39 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
Minor
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/BasicMappingOfSimpleClass.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs 2011-04-13 18:03:13 UTC (rev 5690)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs 2011-04-13 18:16:39 UTC (rev 5691)
@@ -26,6 +26,7 @@
}
else
{
+ hbmId.type1 = typeof(int).GetNhTypeName();
accessorMapper = new NoMemberPropertyMapper();
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/BasicMappingOfSimpleClass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/BasicMappingOfSimpleClass.cs 2011-04-13 18:03:13 UTC (rev 5690)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/BasicMappingOfSimpleClass.cs 2011-04-13 18:16:39 UTC (rev 5691)
@@ -51,6 +51,23 @@
}
[Test]
+ public void WhenMapClassWithoutIdAndWithoutGeneratorThenTypeShouldHaveValue()
+ {
+ var mapper = new ModelMapper();
+ mapper.Class<MyClass>(ca => ca.Id(null, map =>
+ {
+ map.Column("MyClassId");
+ }));
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+ var hbmClass = hbmMapping.RootClasses[0];
+ hbmClass.Should().Not.Be.Null();
+ var hbmId = hbmClass.Id;
+ hbmId.Should().Not.Be.Null();
+ hbmId.column1.Should().Be("MyClassId");
+ hbmId.type1.Should().Not.Be.Null();
+ }
+
+ [Test]
public void WhenDuplicatePropertiesDoesNotDuplicateMapping()
{
var mapper = new ModelMapper();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-13 19:03:54
|
Revision: 5692
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5692&view=rev
Author: fabiomaulo
Date: 2011-04-13 19:03:48 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
ConventionModelMapper safe Poid
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/PropertyToField.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/SafePoidTests.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs 2011-04-13 18:16:39 UTC (rev 5691)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs 2011-04-13 19:03:48 UTC (rev 5692)
@@ -15,8 +15,45 @@
protected virtual void AppendDefaultEvents()
{
+ BeforeMapClass += NoPoidGuid;
+ BeforeMapClass += NoSetterPoidToField;
}
+ protected virtual void NoSetterPoidToField(IModelInspector modelInspector, System.Type type, IClassAttributesMapper classCustomizer)
+ {
+ MemberInfo poidPropertyOrField = MembersProvider.GetEntityMembersForPoid(type).FirstOrDefault(modelInspector.IsPersistentId);
+ if(MatchNoSetterProperty(poidPropertyOrField))
+ {
+ classCustomizer.Id(idm=> idm.Access(Accessor.NoSetter));
+ }
+ }
+
+ public bool MatchNoSetterProperty(MemberInfo subject)
+ {
+ var property = subject as PropertyInfo;
+ if (property == null || property.CanWrite || !property.CanRead)
+ {
+ return false;
+ }
+ var fieldInfo = PropertyToField.GetBackFieldInfo(property);
+ if (fieldInfo != null)
+ {
+ return fieldInfo.FieldType == property.PropertyType;
+ }
+
+ return false;
+ }
+
+ protected virtual void NoPoidGuid(IModelInspector modelInspector, System.Type type, IClassAttributesMapper classCustomizer)
+ {
+ MemberInfo poidPropertyOrField = MembersProvider.GetEntityMembersForPoid(type).FirstOrDefault(mi => modelInspector.IsPersistentId(mi));
+ if (!ReferenceEquals(null, poidPropertyOrField))
+ {
+ return;
+ }
+ classCustomizer.Id(null, idm=> idm.Generator(Generators.Guid));
+ }
+
protected SimpleModelInspector SimpleModelInspector
{
get { return (SimpleModelInspector) base.ModelInspector; }
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-13 18:16:39 UTC (rev 5691)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-13 19:03:48 UTC (rev 5692)
@@ -496,6 +496,11 @@
get { return modelInspector; }
}
+ protected ICandidatePersistentMembersProvider MembersProvider
+ {
+ get { return membersProvider; }
+ }
+
public void Class<TRootEntity>(Action<IClassMapper<TRootEntity>> customizeAction) where TRootEntity : class
{
var customizer = new ClassCustomizer<TRootEntity>(explicitDeclarationsHolder, customizerHolder);
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/PropertyToField.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/PropertyToField.cs 2011-04-13 18:16:39 UTC (rev 5691)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/PropertyToField.cs 2011-04-13 19:03:48 UTC (rev 5692)
@@ -1,4 +1,6 @@
using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
using NHibernate.Properties;
namespace NHibernate.Mapping.ByCode
@@ -28,5 +30,14 @@
return FieldNamningStrategies;
}
}
+
+ public static FieldInfo GetBackFieldInfo(PropertyInfo subject)
+ {
+ const BindingFlags defaultBinding = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly;
+ return (from s in FieldNamningStrategies.Values
+ let field = subject.DeclaringType.GetField(s.GetFieldName(subject.Name), defaultBinding)
+ where field != null
+ select field).FirstOrDefault();
+ }
}
}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/SafePoidTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/SafePoidTests.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/SafePoidTests.cs 2011-04-13 19:03:48 UTC (rev 5692)
@@ -0,0 +1,65 @@
+using NHibernate.Mapping.ByCode;
+using NHibernate.Mapping.ByCode.Impl;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.ConventionModelMapperTests
+{
+ public class SafePoidTests
+ {
+ private class MyClassWithoutPoid
+ {
+
+ }
+
+ private class MyClass
+ {
+ private int _id;
+ public int Id
+ {
+ get { return _id; }
+ }
+ }
+
+ [Test]
+ public void WhenClassWithoutPoidNorGeeneratorThenApplyGuid()
+ {
+ var mapper = new ConventionModelMapper();
+ mapper.Class<MyClassWithoutPoid>(x => { });
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClassWithoutPoid) });
+
+ var hbmClass = hbmMapping.RootClasses[0];
+ var hbmId = hbmClass.Id;
+ hbmId.Should().Not.Be.Null();
+ hbmId.generator.Should().Not.Be.Null();
+ hbm...@cl...().Be("guid");
+ hbmId.type1.Should().Be("Guid");
+ }
+
+ [Test]
+ public void WhenClassWithoutPoidWithGeneratorThenApplyDefinedGenerator()
+ {
+ var mapper = new ConventionModelMapper();
+ mapper.Class<MyClassWithoutPoid>(x => x.Id(null, idm=> idm.Generator(Generators.Native)));
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClassWithoutPoid) });
+
+ var hbmClass = hbmMapping.RootClasses[0];
+ var hbmId = hbmClass.Id;
+ hbmId.Should().Not.Be.Null();
+ hbmId.generator.Should().Not.Be.Null();
+ hbm...@cl...().Be("native");
+ hbmId.type1.Should().Be(Generators.Native.DefaultReturnType.GetNhTypeName());
+ }
+
+ [Test]
+ public void WhenPoidNoSetterThenApplyNosetter()
+ {
+ var mapper = new ConventionModelMapper();
+ mapper.Class<MyClass>(x => x.Id(mc=> mc.Id));
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+
+ var hbmClass = hbmMapping.RootClasses[0];
+ hbmClass.Id.access.Should().Be("nosetter.camelcase-underscore");
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-13 18:16:39 UTC (rev 5691)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-13 19:03:48 UTC (rev 5692)
@@ -511,6 +511,7 @@
<Compile Include="Linq\ByMethod\SumTests.cs" />
<Compile Include="Logging\Log4NetLoggerTest.cs" />
<Compile Include="Logging\LoggerProviderTest.cs" />
+ <Compile Include="MappingByCode\ConventionModelMapperTests\SafePoidTests.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\BagOfNestedComponentsWithParentTest.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\ClassWithComponentsTest.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\ClassMappingRegistrationTest.cs" />
@@ -2976,7 +2977,6 @@
<EmbeddedResource Include="DynamicEntity\Tuplizer\Customer.hbm.xml" />
</ItemGroup>
<ItemGroup>
- <Folder Include="MappingByCode\ConventionModelMapperTests\" />
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-13 20:17:03
|
Revision: 5693
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5693&view=rev
Author: fabiomaulo
Date: 2011-04-13 20:16:57 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
ConventionModelMapper safe property accessor
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/PropertyToFieldAccessorTest.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs 2011-04-13 19:03:48 UTC (rev 5692)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs 2011-04-13 20:16:57 UTC (rev 5693)
@@ -17,8 +17,42 @@
{
BeforeMapClass += NoPoidGuid;
BeforeMapClass += NoSetterPoidToField;
+
+ BeforeMapProperty += MemberToFieldAccessor;
+ BeforeMapBag += MemberToFieldAccessor;
+ BeforeMapSet += MemberToFieldAccessor;
+ BeforeMapMap += MemberToFieldAccessor;
+ BeforeMapList += MemberToFieldAccessor;
+
+ BeforeMapManyToOne += MemberToFieldAccessor;
+ BeforeMapOneToOne += MemberToFieldAccessor;
+ BeforeMapAny += MemberToFieldAccessor;
}
+ void MemberToFieldAccessor(IModelInspector modelInspector, PropertyPath member, IAccessorPropertyMapper propertyCustomizer)
+ {
+ if (MatchPropertyToField(member.LocalMember))
+ {
+ propertyCustomizer.Access(Accessor.Field);
+ }
+ }
+
+ protected bool MatchPropertyToField(MemberInfo subject)
+ {
+ var property = subject as PropertyInfo;
+ if (property == null)
+ {
+ return false;
+ }
+ var fieldInfo = PropertyToField.GetBackFieldInfo(property);
+ if (fieldInfo != null)
+ {
+ return fieldInfo.FieldType != property.PropertyType;
+ }
+
+ return false;
+ }
+
protected virtual void NoSetterPoidToField(IModelInspector modelInspector, System.Type type, IClassAttributesMapper classCustomizer)
{
MemberInfo poidPropertyOrField = MembersProvider.GetEntityMembersForPoid(type).FirstOrDefault(modelInspector.IsPersistentId);
@@ -28,7 +62,7 @@
}
}
- public bool MatchNoSetterProperty(MemberInfo subject)
+ protected bool MatchNoSetterProperty(MemberInfo subject)
{
var property = subject as PropertyInfo;
if (property == null || property.CanWrite || !property.CanRead)
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/PropertyToFieldAccessorTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/PropertyToFieldAccessorTest.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/PropertyToFieldAccessorTest.cs 2011-04-13 20:16:57 UTC (rev 5693)
@@ -0,0 +1,131 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.ConventionModelMapperTests
+{
+ public class PropertyToFieldAccessorTest
+ {
+ private class MyClass
+ {
+ public int Id { get; set; }
+ private string aField;
+ public int AProp { get; set; }
+
+ private ICollection<int> withDifferentBackField;
+ public IEnumerable<int> WithDifferentBackField
+ {
+ get { return withDifferentBackField; }
+ set { withDifferentBackField = value as ICollection<int>; }
+ }
+
+ private string readOnlyWithSameBackField;
+ public string ReadOnlyWithSameBackField
+ {
+ get { return readOnlyWithSameBackField; }
+ }
+
+ public string PropertyWithoutField
+ {
+ get { return ""; }
+ }
+
+ private string sameTypeOfBackField;
+ public string SameTypeOfBackField
+ {
+ get { return sameTypeOfBackField; }
+ set { sameTypeOfBackField = value; }
+ }
+
+ private int setOnlyProperty;
+ public int SetOnlyProperty
+ {
+ set { setOnlyProperty = value; }
+ }
+ }
+
+ [Test]
+ public void WhenFieldAccessToField()
+ {
+ var member = typeof(MyClass).GetField("aField",BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.DeclaredOnly);
+ var mapper = new ConventionModelMapper();
+ mapper.Class<MyClass>(mc => mc.Property(member, x => { }));
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+
+ var hbmClass = hbmMapping.RootClasses[0];
+ var hbmProperty = hbmClass.Properties.Single(x => x.Name == "aField");
+ hbmProperty.Access.Should().Be("field");
+ }
+
+ [Test]
+ public void WhenAutoPropertyNoAccessor()
+ {
+ var mapper = new ConventionModelMapper();
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+
+ var hbmClass = hbmMapping.RootClasses[0];
+ var hbmProperty = hbmClass.Properties.Single(x => x.Name == "AProp");
+ hbmProperty.Access.Should().Be.NullOrEmpty();
+ }
+
+ [Test]
+ public void WhenPropertyWithSameBackFieldNoMatch()
+ {
+ var mapper = new ConventionModelMapper();
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+
+ var hbmClass = hbmMapping.RootClasses[0];
+ var hbmProperty = hbmClass.Properties.Single(x => x.Name == "SameTypeOfBackField");
+ hbmProperty.Access.Should().Be.NullOrEmpty();
+ }
+
+ [Test]
+ public void WhenReadOnlyPropertyWithSameBackFieldNoMatch()
+ {
+ var mapper = new ConventionModelMapper();
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+
+ var hbmClass = hbmMapping.RootClasses[0];
+ var hbmProperty = hbmClass.Properties.Single(x => x.Name == "ReadOnlyWithSameBackField");
+ hbmProperty.Access.Should().Not.Contain("field");
+ }
+
+ [Test]
+ public void WhenPropertyWithoutFieldNoMatch()
+ {
+ var mapper = new ConventionModelMapper();
+ mapper.Class<MyClass>(mc => mc.Property(x => x.PropertyWithoutField));
+
+ var hbmMapping = mapper.CompileMappingFor(new[] {typeof (MyClass)});
+
+ var hbmClass = hbmMapping.RootClasses[0];
+ var hbmProperty = hbmClass.Properties.Single(x => x.Name == "PropertyWithoutField");
+ hbmProperty.Access.Should().Not.Contain("field");
+ }
+
+ [Test]
+ public void WhenPropertyWithDifferentBackFieldMatch()
+ {
+ var mapper = new ConventionModelMapper();
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+
+ var hbmClass = hbmMapping.RootClasses[0];
+ var hbmProperty = hbmClass.Properties.Single(x => x.Name == "WithDifferentBackField");
+ hbmProperty.Access.Should().Contain("field");
+ }
+
+ [Test]
+ public void WhenSetOnlyPropertyNoMatch()
+ {
+ var mapper = new ConventionModelMapper();
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+
+ var hbmClass = hbmMapping.RootClasses[0];
+ var hbmProperty = hbmClass.Properties.Single(x => x.Name == "SetOnlyProperty");
+ hbmProperty.Access.Should().Not.Contain("field");
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-13 19:03:48 UTC (rev 5692)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-13 20:16:57 UTC (rev 5693)
@@ -511,6 +511,7 @@
<Compile Include="Linq\ByMethod\SumTests.cs" />
<Compile Include="Logging\Log4NetLoggerTest.cs" />
<Compile Include="Logging\LoggerProviderTest.cs" />
+ <Compile Include="MappingByCode\ConventionModelMapperTests\PropertyToFieldAccessorTest.cs" />
<Compile Include="MappingByCode\ConventionModelMapperTests\SafePoidTests.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\BagOfNestedComponentsWithParentTest.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\ClassWithComponentsTest.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-13 22:04:33
|
Revision: 5697
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5697&view=rev
Author: fabiomaulo
Date: 2011-04-13 22:04:27 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
Fixed bug when version declared on base entity
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/VersionOnBaseClassIntegrationTest.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-13 21:57:13 UTC (rev 5696)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-13 22:04:27 UTC (rev 5697)
@@ -743,7 +743,7 @@
});
}
var splitGroups = modelInspector.GetPropertiesSplits(type);
- var propertiesToMap = persistentProperties.Where(mi => !modelInspector.IsVersion(mi)).Except(naturalIdPropeties).ToList();
+ var propertiesToMap = persistentProperties.Where(mi => !modelInspector.IsVersion(mi) && !modelInspector.IsVersion(mi.GetMemberFromDeclaringType())).Except(naturalIdPropeties).ToList();
var propertiesInSplits = new HashSet<MemberInfo>();
foreach (var splitGroup in splitGroups)
{
Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/VersionOnBaseClassIntegrationTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/VersionOnBaseClassIntegrationTest.cs 2011-04-13 21:57:13 UTC (rev 5696)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/VersionOnBaseClassIntegrationTest.cs 2011-04-13 22:04:27 UTC (rev 5697)
@@ -36,5 +36,28 @@
hbmVersion.Should().Not.Be.Null();
hbmVersion.name.Should().Be("Version");
}
+
+ [Test]
+ public void WhenVersionFromBaseEntityThenShouldntMapVersionAsProperty()
+ {
+ var mapper = new ConventionModelMapper();
+ var baseEntityType = typeof(BaseEntity);
+ mapper.IsEntity((t, declared) => baseEntityType.IsAssignableFrom(t) && baseEntityType != t && !t.IsInterface);
+ mapper.IsRootEntity((t, declared) => baseEntityType.Equals(t.BaseType));
+ mapper.Class<BaseEntity>(
+ map =>
+ {
+ map.Id(x => x.Id, idmap => { });
+ map.Version(x => x.Version, vm => { });
+ });
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(Person) });
+
+ var hbmClass = hbmMapping.RootClasses[0];
+ var hbmVersion = hbmClass.Version;
+ hbmVersion.Should().Not.Be.Null();
+ hbmVersion.name.Should().Be("Version");
+
+ hbmClass.Properties.Should("because one is the POID and the other is the version").Be.Empty();
+ }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-13 23:07:47
|
Revision: 5698
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5698&view=rev
Author: fabiomaulo
Date: 2011-04-13 23:07:40 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
Fixed issue when use event to map collection key
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/BagCollectionTests.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-13 22:04:27 UTC (rev 5697)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-13 23:07:40 UTC (rev 5698)
@@ -1052,9 +1052,9 @@
ICollectionElementRelationMapper cert = DetermineCollectionElementRelationType(member, propertyPath, collectionElementType);
propertiesContainer.Bag(member, collectionPropertiesMapper =>
{
- InvokeBeforeMapBag(propertyPath, collectionPropertiesMapper);
cert.MapCollectionProperties(collectionPropertiesMapper);
- ForEachMemberPath(member, propertyPath, pp => customizerHolder.InvokeCustomizers(pp, collectionPropertiesMapper));
+ InvokeBeforeMapBag(propertyPath, collectionPropertiesMapper);
+ ForEachMemberPath(member, propertyPath, pp => customizerHolder.InvokeCustomizers(pp, collectionPropertiesMapper));
InvokeAfterMapBag(propertyPath, collectionPropertiesMapper);
}, cert.Map);
}
@@ -1066,9 +1066,9 @@
ICollectionElementRelationMapper cert = DetermineCollectionElementRelationType(member, propertyPath, collectionElementType);
propertiesContainer.List(member, collectionPropertiesMapper =>
{
- InvokeBeforeMapList(propertyPath, collectionPropertiesMapper);
cert.MapCollectionProperties(collectionPropertiesMapper);
- ForEachMemberPath(member, propertyPath, pp => customizerHolder.InvokeCustomizers(pp, collectionPropertiesMapper));
+ InvokeBeforeMapList(propertyPath, collectionPropertiesMapper);
+ ForEachMemberPath(member, propertyPath, pp => customizerHolder.InvokeCustomizers(pp, collectionPropertiesMapper));
InvokeAfterMapList(propertyPath, collectionPropertiesMapper);
}, cert.Map);
}
@@ -1089,9 +1089,9 @@
propertiesContainer.Map(member, collectionPropertiesMapper =>
{
- InvokeBeforeMapMap(propertyPath, collectionPropertiesMapper);
cert.MapCollectionProperties(collectionPropertiesMapper);
- ForEachMemberPath(member, propertyPath, pp => customizerHolder.InvokeCustomizers(pp, collectionPropertiesMapper));
+ InvokeBeforeMapMap(propertyPath, collectionPropertiesMapper);
+ ForEachMemberPath(member, propertyPath, pp => customizerHolder.InvokeCustomizers(pp, collectionPropertiesMapper));
InvokeAfterMapMap(propertyPath, collectionPropertiesMapper);
}, mkrm.Map, cert.Map);
}
@@ -1103,9 +1103,9 @@
ICollectionElementRelationMapper cert = DetermineCollectionElementRelationType(member, propertyPath, collectionElementType);
propertiesContainer.Set(member, collectionPropertiesMapper =>
{
- InvokeBeforeMapSet(propertyPath, collectionPropertiesMapper);
cert.MapCollectionProperties(collectionPropertiesMapper);
- ForEachMemberPath(member, propertyPath, pp => customizerHolder.InvokeCustomizers(pp, collectionPropertiesMapper));
+ InvokeBeforeMapSet(propertyPath, collectionPropertiesMapper);
+ ForEachMemberPath(member, propertyPath, pp => customizerHolder.InvokeCustomizers(pp, collectionPropertiesMapper));
InvokeAfterMapSet(propertyPath, collectionPropertiesMapper);
}, cert.Map);
}
@@ -1121,8 +1121,8 @@
}
propertiesContainer.IdBag(member, collectionPropertiesMapper =>
{
+ cert.MapCollectionProperties(collectionPropertiesMapper);
InvokeBeforeMapIdBag(propertyPath, collectionPropertiesMapper);
- cert.MapCollectionProperties(collectionPropertiesMapper);
ForEachMemberPath(member, propertyPath, pp => customizerHolder.InvokeCustomizers(pp, collectionPropertiesMapper));
InvokeAfterMapIdBag(propertyPath, collectionPropertiesMapper);
}, cert.Map);
Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/BagCollectionTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/BagCollectionTests.cs 2011-04-13 22:04:27 UTC (rev 5697)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/BagCollectionTests.cs 2011-04-13 23:07:40 UTC (rev 5698)
@@ -1,5 +1,7 @@
using System.Collections.Generic;
+using System.Linq;
using System.Reflection;
+using NHibernate.Cfg.MappingSchema;
using NHibernate.Mapping.ByCode;
using NUnit.Framework;
using SharpTestsEx;
@@ -22,6 +24,17 @@
public string Simple { get; set; }
}
+ private class Parent
+ {
+ public int Id { get; set; }
+ public IEnumerable<Child> NickNames { get; set; }
+ }
+ private class Child
+ {
+ public int Id { get; set; }
+ public Parent AParent { get; set; }
+ }
+
[Test]
public void MatchWithEnumerableProperty()
{
@@ -71,5 +84,17 @@
inspector.IsBag(mi).Should().Be.False();
}
+
+ [Test]
+ public void WhenSetKeyThroughEventThenUseEvent()
+ {
+ var autoinspector = new SimpleModelInspector();
+ var mapper = new ModelMapper(autoinspector);
+ mapper.BeforeMapBag += (insp, prop, map) => map.Key(km => km.Column(prop.GetContainerEntity(insp).Name + "Id"));
+
+ var hbmMapping = mapper.CompileMappingFor(new[] {typeof(Parent)});
+ var hbmBag = hbmMapping.RootClasses[0].Properties.OfType<HbmBag>().Single();
+ hbmBag.Key.Columns.Single().name.Should().Be("ParentId");
+ }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-14 17:39:25
|
Revision: 5699
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5699&view=rev
Author: fabiomaulo
Date: 2011-04-14 17:39:19 +0000 (Thu, 14 Apr 2011)
Log Message:
-----------
Fix NH-2652
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs
trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs 2011-04-13 23:07:40 UTC (rev 5698)
+++ trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs 2011-04-14 17:39:19 UTC (rev 5699)
@@ -19,7 +19,7 @@
public static void QuoteTableAndColumns(Configuration configuration)
{
- ISet<string> reservedDb = GetReservedWords(configuration.Properties);
+ ISet<string> reservedDb = GetReservedWords(configuration.GetDerivedProperties());
foreach (var cm in configuration.ClassMappings)
{
QuoteTable(cm.Table, reservedDb);
Modified: trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs 2011-04-13 23:07:40 UTC (rev 5698)
+++ trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs 2011-04-14 17:39:19 UTC (rev 5699)
@@ -163,5 +163,28 @@
new SchemaExport(configuration).Drop(false, false);
}
+ [Test]
+ public void WhenConfiguredOnlyExplicitAutoQuote()
+ {
+ var configuration = TestConfigurationHelper.GetDefaultConfiguration();
+ var configuredDialect = Dialect.Dialect.GetDialect();
+ if(!configuredDialect.DefaultProperties.ContainsKey(Environment.ConnectionDriver))
+ {
+ Assert.Ignore(GetType() + " does not apply to " + configuredDialect);
+ }
+ configuration.Properties.Remove(Environment.ConnectionDriver);
+ configuration.AddResource("NHibernate.Test.Tools.hbm2ddl.SchemaMetadataUpdaterTest.HeavyEntity.hbm.xml",
+ GetType().Assembly);
+
+ SchemaMetadataUpdater.QuoteTableAndColumns(configuration);
+
+ var cm = configuration.GetClassMapping(typeof(Order));
+ Assert.That(cm.Table.IsQuoted);
+ var culs = new List<Column>(cm.Table.ColumnIterator);
+ Assert.That(GetColumnByName(culs, "From").IsQuoted);
+ Assert.That(GetColumnByName(culs, "And").IsQuoted);
+ Assert.That(GetColumnByName(culs, "Select").IsQuoted);
+ Assert.That(!GetColumnByName(culs, "Name").IsQuoted);
+ }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-14 19:32:06
|
Revision: 5702
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5702&view=rev
Author: fabiomaulo
Date: 2011-04-14 19:31:59 +0000 (Thu, 14 Apr 2011)
Log Message:
-----------
by-code: Synchronize for entities
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IEntityAttributesMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ClassCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/UnionSubclassCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinedSubclassMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/UnionSubclassMapper.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/ClassMapperTests/TablesSincronizationTests.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/JoinedSubclassMapperTests/TablesSincronizationTests.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/SubclassMapperTests/TablesSincronizationTests.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/UnionSubclassMapperTests/TablesSincronizationTests.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IEntityAttributesMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IEntityAttributesMapper.cs 2011-04-14 18:13:35 UTC (rev 5701)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IEntityAttributesMapper.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -12,5 +12,6 @@
void BatchSize(int value);
void SelectBeforeUpdate(bool value);
void Persister<T>() where T : IEntityPersister;
+ void Synchronize(params string[] table);
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs 2011-04-14 18:13:35 UTC (rev 5701)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -247,6 +247,18 @@
classMapping.persister = typeof (T).GetShortClassName(MapDoc);
}
+ public void Synchronize(params string[] table)
+ {
+ if (table == null)
+ {
+ return;
+ }
+ var existingSyncs = new HashSet<string>(classMapping.synchronize != null ? classMapping.synchronize.Select(x => x.table) : Enumerable.Empty<string>());
+ System.Array.ForEach(table.Where(x => x != null).Select(tableName => tableName.Trim()).Where(cleanedName => !"".Equals(cleanedName)).ToArray(),
+ x => existingSyncs.Add(x.Trim()));
+ classMapping.synchronize = existingSyncs.Select(x => new HbmSynchronize {table = x}).ToArray();
+ }
+
#endregion
#region Implementation of IEntitySqlsMapper
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ClassCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ClassCustomizer.cs 2011-04-14 18:13:35 UTC (rev 5701)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ClassCustomizer.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -178,6 +178,11 @@
CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Persister<T>());
}
+ public void Synchronize(params string[] table)
+ {
+ CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Synchronize(table));
+ }
+
#endregion
#region Implementation of IEntitySqlsMapper
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs 2011-04-14 18:13:35 UTC (rev 5701)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -70,6 +70,12 @@
CustomizersHolder.AddCustomizer(typeof (TEntity), (IJoinedSubclassAttributesMapper m) => m.Persister<T>());
}
+ public void Synchronize(params string[] table)
+ {
+ CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinedSubclassAttributesMapper m) => m.Synchronize(table));
+
+ }
+
#endregion
#region Implementation of IEntitySqlsMapper
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs 2011-04-14 18:13:35 UTC (rev 5701)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -88,6 +88,11 @@
CustomizersHolder.AddCustomizer(typeof (TEntity), (ISubclassMapper m) => m.Persister<T>());
}
+ public void Synchronize(params string[] table)
+ {
+ CustomizersHolder.AddCustomizer(typeof(TEntity), (ISubclassMapper m) => m.Synchronize(table));
+ }
+
#endregion
#region Implementation of IEntitySqlsMapper
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/UnionSubclassCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/UnionSubclassCustomizer.cs 2011-04-14 18:13:35 UTC (rev 5701)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/UnionSubclassCustomizer.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -57,6 +57,11 @@
CustomizersHolder.AddCustomizer(typeof (TEntity), (IUnionSubclassAttributesMapper m) => m.Persister<T>());
}
+ public void Synchronize(params string[] table)
+ {
+ CustomizersHolder.AddCustomizer(typeof(TEntity), (IUnionSubclassAttributesMapper m) => m.Synchronize(table));
+ }
+
#endregion
#region Implementation of IEntitySqlsMapper
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinedSubclassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinedSubclassMapper.cs 2011-04-14 18:13:35 UTC (rev 5701)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinedSubclassMapper.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Linq;
using NHibernate.Cfg.MappingSchema;
using NHibernate.Persister.Entity;
@@ -84,6 +85,18 @@
classMapping.persister = typeof (T).GetShortClassName(MapDoc);
}
+ public void Synchronize(params string[] table)
+ {
+ if (table == null)
+ {
+ return;
+ }
+ var existingSyncs = new HashSet<string>(classMapping.synchronize != null ? classMapping.synchronize.Select(x => x.table) : Enumerable.Empty<string>());
+ System.Array.ForEach(table.Where(x => x != null).Select(tableName => tableName.Trim()).Where(cleanedName => !"".Equals(cleanedName)).ToArray(),
+ x => existingSyncs.Add(x.Trim()));
+ classMapping.synchronize = existingSyncs.Select(x => new HbmSynchronize { table = x }).ToArray();
+ }
+
#endregion
#region Implementation of IEntitySqlsMapper
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs 2011-04-14 18:13:35 UTC (rev 5701)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -123,6 +123,18 @@
classMapping.persister = typeof (T).GetShortClassName(MapDoc);
}
+ public void Synchronize(params string[] table)
+ {
+ if (table == null)
+ {
+ return;
+ }
+ var existingSyncs = new HashSet<string>(classMapping.synchronize != null ? classMapping.synchronize.Select(x => x.table) : Enumerable.Empty<string>());
+ System.Array.ForEach(table.Where(x => x != null).Select(tableName => tableName.Trim()).Where(cleanedName => !"".Equals(cleanedName)).ToArray(),
+ x => existingSyncs.Add(x.Trim()));
+ classMapping.synchronize = existingSyncs.Select(x => new HbmSynchronize { table = x }).ToArray();
+ }
+
#endregion
#region Implementation of IEntitySqlsMapper
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/UnionSubclassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/UnionSubclassMapper.cs 2011-04-14 18:13:35 UTC (rev 5701)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/UnionSubclassMapper.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Linq;
using NHibernate.Cfg.MappingSchema;
using NHibernate.Persister.Entity;
@@ -80,6 +81,18 @@
classMapping.persister = typeof (T).GetShortClassName(MapDoc);
}
+ public void Synchronize(params string[] table)
+ {
+ if (table == null)
+ {
+ return;
+ }
+ var existingSyncs = new HashSet<string>(classMapping.synchronize != null ? classMapping.synchronize.Select(x => x.table) : Enumerable.Empty<string>());
+ System.Array.ForEach(table.Where(x => x != null).Select(tableName => tableName.Trim()).Where(cleanedName => !"".Equals(cleanedName)).ToArray(),
+ x => existingSyncs.Add(x.Trim()));
+ classMapping.synchronize = existingSyncs.Select(x => new HbmSynchronize { table = x }).ToArray();
+ }
+
#endregion
#region Implementation of IEntitySqlsMapper
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/ClassMapperTests/TablesSincronizationTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/ClassMapperTests/TablesSincronizationTests.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/ClassMapperTests/TablesSincronizationTests.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -0,0 +1,62 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode.Impl;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.MappersTests.ClassMapperTests
+{
+ public class TablesSincronizationTests
+ {
+ private class EntitySimple
+ {
+ public int Id { get; set; }
+ }
+
+ [Test]
+ public void WhenSetSyncWithNullThenDoesNotThrows()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new ClassMapper(typeof(EntitySimple), mapdoc, For<EntitySimple>.Property(x => x.Id));
+ rc.Executing(x=>x.Synchronize(null)).NotThrows();
+ }
+
+ [Test]
+ public void WhenSetSyncMixedWithNullAndEmptyThenAddOnlyValid()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new ClassMapper(typeof(EntitySimple), mapdoc, For<EntitySimple>.Property(x => x.Id));
+ rc.Synchronize("", " ATable ", " ", null);
+ mapdoc.RootClasses[0].Synchronize.Single().table.Should().Be("ATable");
+ }
+
+ [Test]
+ public void WhenSetMoreSyncThenAddAll()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new ClassMapper(typeof(EntitySimple), mapdoc, For<EntitySimple>.Property(x => x.Id));
+ rc.Synchronize("T1", "T2", "T3", null);
+ mapdoc.RootClasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+
+ [Test]
+ public void WhenSetMoreThenOnceThenAddAll()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new ClassMapper(typeof(EntitySimple), mapdoc, For<EntitySimple>.Property(x => x.Id));
+ rc.Synchronize("T1", "T2");
+ rc.Synchronize("T3");
+ mapdoc.RootClasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+
+ [Test]
+ public void WhenSetMoreThenOnceThenDoesNotDuplicate()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new ClassMapper(typeof(EntitySimple), mapdoc, For<EntitySimple>.Property(x => x.Id));
+ rc.Synchronize("T1", "T2");
+ rc.Synchronize("T3", "T2");
+ mapdoc.RootClasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/JoinedSubclassMapperTests/TablesSincronizationTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/JoinedSubclassMapperTests/TablesSincronizationTests.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/JoinedSubclassMapperTests/TablesSincronizationTests.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -0,0 +1,66 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode.Impl;
+using NHibernate.Persister.Entity;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.MappersTests.JoinedSubclassMapperTests
+{
+ public class TablesSincronizationTests
+ {
+ private class EntitySimple
+ {
+ public int Id { get; set; }
+ }
+
+ private class InheritedSimple : EntitySimple
+ {
+ }
+ [Test]
+ public void WhenSetSyncWithNullThenDoesNotThrows()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new JoinedSubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Executing(x => x.Synchronize(null)).NotThrows();
+ }
+
+ [Test]
+ public void WhenSetSyncMixedWithNullAndEmptyThenAddOnlyValid()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new JoinedSubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("", " ATable ", " ", null);
+ mapdoc.JoinedSubclasses[0].Synchronize.Single().table.Should().Be("ATable");
+ }
+
+ [Test]
+ public void WhenSetMoreSyncThenAddAll()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new JoinedSubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("T1", "T2", "T3", null);
+ mapdoc.JoinedSubclasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+
+ [Test]
+ public void WhenSetMoreThenOnceThenAddAll()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new JoinedSubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("T1", "T2");
+ rc.Synchronize("T3");
+ mapdoc.JoinedSubclasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+
+ [Test]
+ public void WhenSetMoreThenOnceThenDoesNotDuplicate()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new JoinedSubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("T1", "T2");
+ rc.Synchronize("T3", "T2");
+ mapdoc.JoinedSubclasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/SubclassMapperTests/TablesSincronizationTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/SubclassMapperTests/TablesSincronizationTests.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/SubclassMapperTests/TablesSincronizationTests.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -0,0 +1,67 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode.Impl;
+using NHibernate.Persister.Entity;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.MappersTests.SubclassMapperTests
+{
+ public class TablesSincronizationTests
+ {
+ private class EntitySimple
+ {
+ public int Id { get; set; }
+ }
+
+ private class InheritedSimple : EntitySimple
+ {
+ }
+
+ [Test]
+ public void WhenSetSyncWithNullThenDoesNotThrows()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new SubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Executing(x => x.Synchronize(null)).NotThrows();
+ }
+
+ [Test]
+ public void WhenSetSyncMixedWithNullAndEmptyThenAddOnlyValid()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new SubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("", " ATable ", " ", null);
+ mapdoc.SubClasses[0].Synchronize.Single().table.Should().Be("ATable");
+ }
+
+ [Test]
+ public void WhenSetMoreSyncThenAddAll()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new SubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("T1", "T2", "T3", null);
+ mapdoc.SubClasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+
+ [Test]
+ public void WhenSetMoreThenOnceThenAddAll()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new SubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("T1", "T2");
+ rc.Synchronize("T3");
+ mapdoc.SubClasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+
+ [Test]
+ public void WhenSetMoreThenOnceThenDoesNotDuplicate()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new SubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("T1", "T2");
+ rc.Synchronize("T3", "T2");
+ mapdoc.SubClasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/UnionSubclassMapperTests/TablesSincronizationTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/UnionSubclassMapperTests/TablesSincronizationTests.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/UnionSubclassMapperTests/TablesSincronizationTests.cs 2011-04-14 19:31:59 UTC (rev 5702)
@@ -0,0 +1,67 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode.Impl;
+using NHibernate.Persister.Entity;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.MappersTests.UnionSubclassMapperTests
+{
+ public class TablesSincronizationTests
+ {
+ private class EntitySimple
+ {
+ public int Id { get; set; }
+ }
+
+ private class InheritedSimple : EntitySimple
+ {
+ }
+
+ [Test]
+ public void WhenSetSyncWithNullThenDoesNotThrows()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new UnionSubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Executing(x => x.Synchronize(null)).NotThrows();
+ }
+
+ [Test]
+ public void WhenSetSyncMixedWithNullAndEmptyThenAddOnlyValid()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new UnionSubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("", " ATable ", " ", null);
+ mapdoc.UnionSubclasses[0].Synchronize.Single().table.Should().Be("ATable");
+ }
+
+ [Test]
+ public void WhenSetMoreSyncThenAddAll()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new UnionSubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("T1", "T2", "T3", null);
+ mapdoc.UnionSubclasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+
+ [Test]
+ public void WhenSetMoreThenOnceThenAddAll()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new UnionSubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("T1", "T2");
+ rc.Synchronize("T3");
+ mapdoc.UnionSubclasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+
+ [Test]
+ public void WhenSetMoreThenOnceThenDoesNotDuplicate()
+ {
+ var mapdoc = new HbmMapping();
+ var rc = new UnionSubclassMapper(typeof(InheritedSimple), mapdoc);
+ rc.Synchronize("T1", "T2");
+ rc.Synchronize("T3", "T2");
+ mapdoc.UnionSubclasses[0].Synchronize.Select(x => x.table).Should().Have.SameValuesAs("T1", "T2", "T3");
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-14 18:13:35 UTC (rev 5701)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-14 19:31:59 UTC (rev 5702)
@@ -541,14 +541,18 @@
<Compile Include="MappingByCode\MappersTests\AbstractPropertyContainerMapperTest.cs" />
<Compile Include="MappingByCode\MappersTests\ClassMapperTests\ClassMapperWithJoinPropertiesTest.cs" />
<Compile Include="MappingByCode\MappersTests\ClassMapperTests\SetPersisterTests.cs" />
+ <Compile Include="MappingByCode\MappersTests\ClassMapperTests\TablesSincronizationTests.cs" />
<Compile Include="MappingByCode\MappersTests\CollectionIdMapperTests.cs" />
<Compile Include="MappingByCode\MappersTests\FakeUserCollectionType.cs" />
<Compile Include="MappingByCode\MappersTests\IdBagMapperTest.cs" />
<Compile Include="MappingByCode\MappersTests\JoinedSubclassMapperTests\SetPersisterTests.cs" />
+ <Compile Include="MappingByCode\MappersTests\JoinedSubclassMapperTests\TablesSincronizationTests.cs" />
<Compile Include="MappingByCode\MappersTests\JoinMapperTests.cs" />
<Compile Include="MappingByCode\MappersTests\SubclassMapperTests\SetPersisterTests.cs" />
+ <Compile Include="MappingByCode\MappersTests\SubclassMapperTests\TablesSincronizationTests.cs" />
<Compile Include="MappingByCode\MappersTests\SubclassMapperWithJoinPropertiesTest.cs" />
<Compile Include="MappingByCode\MappersTests\UnionSubclassMapperTests\SetPersisterTests.cs" />
+ <Compile Include="MappingByCode\MappersTests\UnionSubclassMapperTests\TablesSincronizationTests.cs" />
<Compile Include="MappingByCode\MixAutomapping\ArrayCollectionTests.cs" />
<Compile Include="MappingByCode\MixAutomapping\BagCollectionTests.cs" />
<Compile Include="MappingByCode\MixAutomapping\ComponentsTests.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2011-04-15 04:10:59
|
Revision: 5705
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5705&view=rev
Author: patearl
Date: 2011-04-15 04:10:51 +0000 (Fri, 15 Apr 2011)
Log Message:
-----------
Harald Mueller's great contribution that fixes joins for member expression chains, especially where || operators are involved. This is basically the original patch. (NH-2583)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Linq/Visitors/QueryModelVisitor.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Linq/Clauses/NhJoinClause.cs
trunk/nhibernate/src/NHibernate/Linq/ReWriters/AddJoinsReWriter.cs
trunk/nhibernate/src/NHibernate/Linq/Visitors/AbstractJoinDetector.cs
trunk/nhibernate/src/NHibernate/Linq/Visitors/SelectAndOrderByJoinDetector.cs
trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/AbstractMassTestingFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/Domain.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/ManualTestFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingNotAndDeMorganFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOneOrTreeFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOrderByFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingSelectFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingThreeOrTreesSideBySideFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingTwoOrTreesSideBySideFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/SelfJoinTestFixture.cs
Added: trunk/nhibernate/src/NHibernate/Linq/Clauses/NhJoinClause.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Clauses/NhJoinClause.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Linq/Clauses/NhJoinClause.cs 2011-04-15 04:10:51 UTC (rev 5705)
@@ -0,0 +1,23 @@
+using System.Linq.Expressions;
+using Remotion.Linq.Clauses;
+using Remotion.Linq.Clauses;
+
+namespace NHibernate.Linq.Visitors
+{
+ /// <summary>
+ /// All joins are created as outer joins. An optimization in <see cref="WhereJoinDetector"/> finds
+ /// joins that may be inner joined and calls <see cref="MakeInner"/> on them.
+ /// <see cref="QueryModelVisitor"/>'s <see cref="QueryModelVisitor.VisitAdditionalFromClause"/> will
+ /// then emit the correct HQL join.
+ /// </summary>
+ public class NhJoinClause : AdditionalFromClause
+ {
+ public bool IsInner { get; private set; }
+ public void MakeInner() {
+ IsInner = true;
+ }
+ public NhJoinClause(string itemName, System.Type itemType, Expression fromExpression) : base(itemName, itemType, fromExpression) {
+ IsInner = false;
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate/Linq/ReWriters/AddJoinsReWriter.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/ReWriters/AddJoinsReWriter.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Linq/ReWriters/AddJoinsReWriter.cs 2011-04-15 04:10:51 UTC (rev 5705)
@@ -0,0 +1,105 @@
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using NHibernate.Linq.Visitors;
+using Remotion.Linq;
+using Remotion.Linq.Clauses;
+using Remotion.Linq.Clauses.Expressions;
+
+namespace NHibernate.Linq.ReWriters
+{
+ internal interface IIsEntityDecider
+ {
+ bool IsEntity(System.Type type);
+ }
+
+ public class AddJoinsReWriter : QueryModelVisitorBase, IIsEntityDecider
+ {
+ private readonly Dictionary<string, NhJoinClause> _joins = new Dictionary<string, NhJoinClause>();
+ private readonly Dictionary<MemberExpression, QuerySourceReferenceExpression> _expressionMap = new Dictionary<MemberExpression, QuerySourceReferenceExpression>();
+ private readonly NameGenerator _nameGenerator;
+ private readonly ISessionFactory _sessionFactory;
+
+ private AddJoinsReWriter(NameGenerator nameGenerator, ISessionFactory sessionFactory)
+ {
+ _nameGenerator = nameGenerator;
+ _sessionFactory = sessionFactory;
+ }
+
+ public static void ReWrite(QueryModel queryModel, ISessionFactory sessionFactory)
+ {
+ new AddJoinsReWriter(new NameGenerator(queryModel), sessionFactory).ReWrite(queryModel);
+ }
+
+ private void ReWrite(QueryModel queryModel)
+ {
+ VisitQueryModel(queryModel);
+
+ if (_joins.Count > 0)
+ {
+ MemberExpressionSwapper swap = new MemberExpressionSwapper(_expressionMap);
+ queryModel.TransformExpressions(swap.VisitExpression);
+
+ foreach (var join in _joins.Values)
+ {
+ queryModel.BodyClauses.Add(join);
+ }
+ }
+ }
+
+ public override void VisitSelectClause(SelectClause selectClause, QueryModel queryModel)
+ {
+ new SelectAndOrderByJoinDetector(_nameGenerator, this, _joins, _expressionMap).VisitExpression(selectClause.Selector);
+ }
+
+ public override void VisitWhereClause(WhereClause whereClause, QueryModel queryModel, int index)
+ {
+ WhereJoinDetector.Find(whereClause.Predicate,_nameGenerator,
+ this,
+ _joins,
+ _expressionMap);
+ }
+
+ public override void VisitOrderByClause(OrderByClause orderByClause, QueryModel queryModel, int index)
+ {
+ var joinDetector = new SelectAndOrderByJoinDetector(_nameGenerator, this, _joins, _expressionMap);
+ foreach (Ordering ordering in orderByClause.Orderings)
+ {
+ joinDetector.VisitExpression(ordering.Expression);
+ }
+ }
+
+ public bool IsEntity(System.Type type)
+ {
+ return _sessionFactory.GetClassMetadata(type) != null;
+ }
+ }
+
+ public class MemberExpressionSwapper : NhExpressionTreeVisitor
+ {
+ private readonly Dictionary<MemberExpression, QuerySourceReferenceExpression> _expressionMap;
+
+ public MemberExpressionSwapper(Dictionary<MemberExpression, QuerySourceReferenceExpression> expressionMap)
+ {
+ _expressionMap = expressionMap;
+ }
+
+ protected override Expression VisitMemberExpression(MemberExpression expression)
+ {
+ if (expression == null)
+ {
+ return null;
+ }
+
+ QuerySourceReferenceExpression replacement;
+
+ if (_expressionMap.TryGetValue(expression, out replacement))
+ {
+ return replacement;
+ }
+ else
+ {
+ return base.VisitMemberExpression(expression);
+ }
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate/Linq/Visitors/AbstractJoinDetector.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/AbstractJoinDetector.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/AbstractJoinDetector.cs 2011-04-15 04:10:51 UTC (rev 5705)
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using NHibernate.Linq.ReWriters;
+using Remotion.Linq.Clauses.Expressions;
+
+namespace NHibernate.Linq.Visitors
+{
+ public abstract class AbstractJoinDetector : NhExpressionTreeVisitor
+ {
+ private readonly NameGenerator _nameGenerator;
+ internal readonly IIsEntityDecider _isEntityDecider;
+ protected readonly Dictionary<string, NhJoinClause> _joins;
+ protected readonly Dictionary<MemberExpression, QuerySourceReferenceExpression> _expressionMap;
+
+ internal AbstractJoinDetector(NameGenerator nameGenerator, IIsEntityDecider isEntityDecider, Dictionary<string, NhJoinClause> joins, Dictionary<MemberExpression, QuerySourceReferenceExpression> expressionMap)
+ {
+ _nameGenerator = nameGenerator;
+ _expressionMap = expressionMap;
+ _joins = joins;
+ _isEntityDecider = isEntityDecider;
+ }
+
+ protected internal Expression AddJoin(MemberExpression expression)
+ {
+ string key = ExpressionKeyVisitor.Visit(expression, null);
+ NhJoinClause join;
+
+ if (!_joins.TryGetValue(key, out join))
+ {
+ join = new NhJoinClause(_nameGenerator.GetNewName(), expression.Type, expression);
+ _joins.Add(key, join);
+ }
+
+ QuerySourceReferenceExpression newExpr = new QuerySourceReferenceExpression(join);
+
+ if (!_expressionMap.ContainsKey(expression))
+ _expressionMap.Add(expression, newExpr);
+
+ return newExpr;
+ }
+
+ protected void MakeInnerIfJoined(string memberExpressionKey)
+ {
+ // memberExpressionKey is not joined if it occurs only at tails of expressions, e.g.
+ // a.B == null, a.B != null, a.B == c.D etc.
+ if (_joins.ContainsKey(memberExpressionKey))
+ {
+ _joins[memberExpressionKey].MakeInner();
+ }
+ }
+ }
+}
Modified: trunk/nhibernate/src/NHibernate/Linq/Visitors/QueryModelVisitor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/QueryModelVisitor.cs 2011-04-14 21:27:16 UTC (rev 5704)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/QueryModelVisitor.cs 2011-04-15 04:10:51 UTC (rev 5705)
@@ -41,8 +41,8 @@
// Flatten pointless subqueries
QueryReferenceExpressionFlattener.ReWrite(queryModel);
- // Add left joins for references
- AddLeftJoinsReWriter.ReWrite(queryModel, parameters.SessionFactory);
+ // Add joins for references
+ AddJoinsReWriter.ReWrite(queryModel, parameters.SessionFactory);
// Move OrderBy clauses to end
MoveOrderByToEndRewriter.ReWrite(queryModel);
@@ -202,12 +202,20 @@
public override void VisitAdditionalFromClause(AdditionalFromClause fromClause, QueryModel queryModel, int index)
{
- if (fromClause is LeftJoinClause)
+ if (fromClause is NhJoinClause)
{
- // It's a left join
- _hqlTree.AddFromClause(_hqlTree.TreeBuilder.LeftJoin(
- HqlGeneratorExpressionTreeVisitor.Visit(fromClause.FromExpression, VisitorParameters).AsExpression(),
- _hqlTree.TreeBuilder.Alias(fromClause.ItemName)));
+ if (((NhJoinClause)fromClause).IsInner)
+ {
+ _hqlTree.AddFromClause(_hqlTree.TreeBuilder.Join(
+ HqlGeneratorExpressionTreeVisitor.Visit(fromClause.FromExpression, VisitorParameters).AsExpression(),
+ _hqlTree.TreeBuilder.Alias(fromClause.ItemName)));
+ }
+ else
+ {
+ _hqlTree.AddFromClause(_hqlTree.TreeBuilder.LeftJoin(
+ HqlGeneratorExpressionTreeVisitor.Visit(fromClause.FromExpression, VisitorParameters).AsExpression(),
+ _hqlTree.TreeBuilder.Alias(fromClause.ItemName)));
+ }
}
else if (fromClause.FromExpression is MemberExpression)
{
Added: trunk/nhibernate/src/NHibernate/Linq/Visitors/SelectAndOrderByJoinDetector.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/SelectAndOrderByJoinDetector.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/SelectAndOrderByJoinDetector.cs 2011-04-15 04:10:51 UTC (rev 5705)
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using NHibernate.Linq.ReWriters;
+using Remotion.Linq.Clauses.Expressions;
+
+namespace NHibernate.Linq.Visitors
+{
+ public class SelectAndOrderByJoinDetector : AbstractJoinDetector
+ {
+ internal SelectAndOrderByJoinDetector(NameGenerator nameGenerator, IIsEntityDecider isEntityDecider, Dictionary<string, NhJoinClause> joins, Dictionary<MemberExpression, QuerySourceReferenceExpression> expressionMap)
+ : base(nameGenerator, isEntityDecider, joins, expressionMap)
+ {
+ }
+
+ protected override Expression VisitMemberExpression(MemberExpression expression)
+ {
+ if (expression.Type.IsNonPrimitive() && _isEntityDecider.IsEntity(expression.Type)) {
+ return AddJoin(expression);
+ }
+
+ return base.VisitMemberExpression(expression);
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs 2011-04-15 04:10:51 UTC (rev 5705)
@@ -0,0 +1,340 @@
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using NHibernate.Linq.ReWriters;
+using Remotion.Linq.Clauses.Expressions;
+using Remotion.Linq.Utilities;
+
+namespace NHibernate.Linq.Visitors
+{
+ /// <summary>
+ /// The WhereJoinDetector creates the joins for the where clause, including
+ /// optimizations for inner joins. The algorithms are explained in a text
+ /// attached to JIRA entry NH-2583.
+ /// </summary>
+ internal class WhereJoinDetector : AbstractJoinDetector
+ {
+ // Possible results of a condition when emptily outer joined.
+ private const int T = 1;
+ private const int N = 2;
+ private const int TN = T | N;
+ private const int F = 4;
+ private const int TF = T | F;
+ private const int NF = N | F;
+ private const int TNF = T | N | F;
+
+ // Composition rules for possible results when emptily outer joined
+ // for &&, ||, !.
+ private static readonly int[,] AND = new int[8, 8];
+ private static readonly int[,] OR = new int[8, 8];
+ private static readonly int[] NOT = new int[8];
+
+ /// <summary>
+ /// Setup of <see cref="AND"/>, <see cref="OR"/>, <see cref="NOT"/>.
+ /// </summary>
+ static WhereJoinDetector()
+ {
+ // Setup of simple values according to SQL 3-valued logic.
+ NOT[T] = F;
+ NOT[N] = N;
+ NOT[F] = T;
+
+ foreach (var p in new[] { T, N, F })
+ {
+ OR[p, p] = AND[p, p] = p;
+ AND[p, F] = AND[F, p] = F;
+ OR[p, T] = OR[T, p] = T;
+ }
+ AND[T, N] = AND[N, T] = N;
+ OR[F, N] = OR[N, F] = N;
+
+ // Setup of compound values. Idea: Split each
+ // compound value to simple values, compute results
+ // for simple values and or them together.
+ var allValues = new[] { T, N, TN, F, TF, NF, TNF };
+
+ // How compound values are split up into simple values.
+ var split = new int[8][];
+ split[T] = new[] { T };
+ split[N] = new[] { N };
+ split[TN] = new[] { T, N };
+ split[F] = new[] { F };
+ split[TF] = new[] { T, F };
+ split[NF] = new[] { N, F };
+ split[TNF] = new[] { T, N, F };
+
+ foreach (var p in allValues)
+ {
+ int[] splitP = split[p];
+ // We only need to compute NOT for compound values.
+ if (splitP.Length > 1)
+ {
+ int notResult = 0;
+ foreach (var p0 in splitP)
+ {
+ notResult |= NOT[p0];
+ }
+ NOT[p] = notResult;
+ }
+ foreach (var q in allValues)
+ {
+ int[] splitQ = split[q];
+ // We must compute AND and OR if both values are compound,
+ // *but also* if one is compound and the other is simple
+ // (e.g. T and TNF).
+ if (splitP.Length > 1 || splitQ.Length > 1)
+ {
+ int andResult = 0;
+ int orResult = 0;
+ foreach (var p0 in splitP)
+ {
+ foreach (var q0 in splitQ)
+ {
+ andResult |= AND[p0, q0];
+ orResult |= OR[p0, q0];
+ }
+ }
+ AND[p, q] = andResult;
+ OR[p, q] = orResult;
+ }
+ }
+ }
+ }
+
+ // The following is used for all *condition* traversal (but not *expressions* that are not conditions).
+ // This is the "mapping" described in the text at NH-2583.
+ private Dictionary<string, int> _memberExpressionMapping = new Dictionary<string, int>();
+
+ // The following two are used for member expressions traversal.
+ private HashSet<string> _collectedPathMemberExpressionsInExpression = new HashSet<string>();
+ private int _memberExpressionDepth = 0;
+
+ internal
+ WhereJoinDetector(NameGenerator nameGenerator, IIsEntityDecider isEntityDecider, Dictionary<string, NhJoinClause> joins, Dictionary<MemberExpression, QuerySourceReferenceExpression> expressionMap)
+ : base(nameGenerator, isEntityDecider, joins, expressionMap)
+ {
+ }
+
+ protected override Expression VisitBinaryExpression(BinaryExpression expression)
+ {
+ ArgumentUtility.CheckNotNull("expression", expression);
+
+ Expression baseResult = expression;
+ if (expression.NodeType == ExpressionType.AndAlso && expression.Type == typeof(bool))
+ {
+ // Case (a) from the text at NH-2583.
+ var newLeft = VisitExpression(expression.Left);
+
+ var leftMapping = _memberExpressionMapping;
+
+ var newRight = VisitExpression(expression.Right);
+
+ var rightMapping = _memberExpressionMapping;
+
+ _memberExpressionMapping = BinaryMapping(leftMapping, rightMapping, AND);
+
+ // The following is copy-pasted from Relinq's visitor, as I had to split the code above.
+ var newConversion = (LambdaExpression)VisitExpression(expression.Conversion);
+ if (newLeft != expression.Left || newRight != expression.Right || newConversion != expression.Conversion)
+ baseResult = Expression.MakeBinary(expression.NodeType, newLeft, newRight, expression.IsLiftedToNull, expression.Method, newConversion);
+ }
+ else if (expression.NodeType == ExpressionType.OrElse && expression.Type == typeof(bool))
+ {
+ // Case (b)
+ var newLeft = VisitExpression(expression.Left);
+
+ var leftMapping = _memberExpressionMapping;
+
+ var newRight = VisitExpression(expression.Right);
+
+ var rightMapping = _memberExpressionMapping;
+
+ _memberExpressionMapping = BinaryMapping(leftMapping, rightMapping, OR);
+
+ // Again, the following is copy-pasted from Relinq's visitor, as I had to split the code above.
+ var newConversion = (LambdaExpression)VisitExpression(expression.Conversion);
+ if (newLeft != expression.Left || newRight != expression.Right || newConversion != expression.Conversion)
+ baseResult = Expression.MakeBinary(expression.NodeType, newLeft, newRight, expression.IsLiftedToNull, expression.Method, newConversion);
+ }
+ else if (expression.Type == typeof(bool)
+ && (expression.NodeType == ExpressionType.Equal && !IsNullConstantExpression(expression.Right) && !IsNullConstantExpression(expression.Left)
+ || expression.NodeType == ExpressionType.NotEqual && !IsNullConstantExpression(expression.Right) && !IsNullConstantExpression(expression.Left)
+ || expression.NodeType == ExpressionType.LessThan
+ || expression.NodeType == ExpressionType.LessThanOrEqual
+ || expression.NodeType == ExpressionType.GreaterThan
+ || expression.NodeType == ExpressionType.GreaterThanOrEqual))
+ {
+ // Cases (e), (f).2, (g).2
+ _collectedPathMemberExpressionsInExpression = new HashSet<string>();
+
+ baseResult = base.VisitBinaryExpression(expression);
+
+ _memberExpressionMapping = FixedMapping(_collectedPathMemberExpressionsInExpression, N);
+ }
+ else if (expression.Type == typeof(bool)
+ && expression.NodeType == ExpressionType.NotEqual)
+ {
+ // Case (h)
+ _collectedPathMemberExpressionsInExpression = new HashSet<string>();
+
+ baseResult = base.VisitBinaryExpression(expression);
+
+ _memberExpressionMapping = FixedMapping(_collectedPathMemberExpressionsInExpression, F);
+ }
+ else if (expression.Type == typeof(bool)
+ && expression.NodeType == ExpressionType.Equal)
+ {
+ // Case (i)
+ _collectedPathMemberExpressionsInExpression = new HashSet<string>();
+
+ baseResult = base.VisitBinaryExpression(expression);
+
+ _memberExpressionMapping = FixedMapping(_collectedPathMemberExpressionsInExpression, T);
+ }
+ else // +, * etc.
+ {
+ // Case (j)
+ _collectedPathMemberExpressionsInExpression = new HashSet<string>();
+
+ baseResult = base.VisitBinaryExpression(expression);
+
+ _memberExpressionMapping = FixedMapping(_collectedPathMemberExpressionsInExpression, TNF);
+ }
+ return baseResult;
+ }
+
+ private static Dictionary<string, int> FixedMapping(IEnumerable<string> collectedPathMemberExpressionsInExpression, int value)
+ {
+ var memberExpressionMapping = new Dictionary<string, int>();
+ foreach (var me in collectedPathMemberExpressionsInExpression)
+ {
+ memberExpressionMapping.Add(me, value);
+ }
+ return memberExpressionMapping;
+ }
+
+ private static Dictionary<string, int> BinaryMapping(Dictionary<string, int> leftMapping, Dictionary<string, int> rightMapping, int[,] op)
+ {
+ var result = new Dictionary<string, int>();
+ // Compute mapping for all member expressions in leftMapping. If the member expression is missing
+ // in rightMapping, use TNF as a "pessimistic approximation" instead (inside the ?: operator). See
+ // the text for an explanation of this.
+ foreach (var lhs in leftMapping)
+ {
+ result.Add(lhs.Key, op[lhs.Value, rightMapping.ContainsKey(lhs.Key) ? rightMapping[lhs.Key] : TNF]);
+ }
+ // Compute mapping for all member expressions *only* in rightMapping (we did the common ones above).
+ // Again, use TNF as pessimistic approximation to result of left subcondition.
+ foreach (var rhs in rightMapping)
+ {
+ if (!leftMapping.ContainsKey(rhs.Key))
+ {
+ result[rhs.Key] = op[rhs.Value, TNF];
+ }
+ }
+ return result;
+ }
+
+ private static bool IsNullConstantExpression(Expression expression)
+ {
+ if (expression is ConstantExpression)
+ {
+ var constant = (ConstantExpression)expression;
+ return constant.Value == null;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ protected override Expression VisitUnaryExpression(UnaryExpression expression)
+ {
+ ArgumentUtility.CheckNotNull("expression", expression);
+
+ Expression baseResult;
+ if (expression.NodeType == ExpressionType.Not && expression.Type == typeof(bool))
+ {
+ // Case (c) from text at NH-2583.
+ baseResult = VisitExpression(expression.Operand);
+
+ var opMapping = _memberExpressionMapping;
+ _memberExpressionMapping = new Dictionary<string, int>();
+
+ foreach (var m in opMapping)
+ {
+ _memberExpressionMapping.Add(m.Key, NOT[m.Value]);
+ }
+ }
+ else
+ {
+ baseResult = base.VisitUnaryExpression(expression);
+ }
+ return baseResult;
+ }
+
+ //protected override Expression VisitConditionalExpression(ConditionalExpression expression)
+ //{
+ // ArgumentUtility.CheckNotNull("expression", expression);
+
+ // VisitExpression(expression.Test);
+ // // If the ?: returns bool, it is (most probably ...) a condition which may require outer joins.
+ // // TODO: Check check whether HQL accepts ?: conditions; if not, should be rewritten it as (a && b || !a && c).
+ // if (expression.Type == typeof(bool))
+ // {
+ // ...
+ // }
+ // return expression;
+ //}
+
+ protected override Expression VisitMemberExpression(MemberExpression expression)
+ {
+ ArgumentUtility.CheckNotNull("expression", expression);
+
+ Expression newExpression;
+ try
+ {
+ _memberExpressionDepth++;
+ newExpression = base.VisitExpression(expression.Expression);
+ }
+ finally
+ {
+ _memberExpressionDepth--;
+ }
+ bool isEntity = _isEntityDecider.IsEntity(expression.Type);
+
+ if (isEntity)
+ {
+ // See (h) why we do not check for _memberExpressionDepth here!
+ _collectedPathMemberExpressionsInExpression.Add(ExpressionKeyVisitor.Visit(expression, null));
+ }
+
+ if (_memberExpressionDepth > 0 && isEntity)
+ {
+ return AddJoin(expression);
+ }
+ else
+ {
+ if (newExpression != expression.Expression)
+ return Expression.MakeMemberAccess(newExpression, expression.Member);
+ return expression;
+ }
+ }
+
+ internal static void Find(Expression expression, NameGenerator nameGenerator, IIsEntityDecider isEntityDecider, Dictionary<string, NhJoinClause> joins, Dictionary<MemberExpression, QuerySourceReferenceExpression> expressionMap)
+ {
+ WhereJoinDetector f = new WhereJoinDetector(nameGenerator, isEntityDecider, joins, expressionMap);
+
+ f.VisitExpression(expression);
+
+ foreach (var mapping in f._memberExpressionMapping)
+ {
+ // If outer join can never produce true, we can safely inner join.
+ if ((mapping.Value & T) == 0)
+ {
+ f.MakeInnerIfJoined(mapping.Key);
+ }
+ }
+ }
+
+ }
+}
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-14 21:27:16 UTC (rev 5704)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-15 04:10:51 UTC (rev 5705)
@@ -266,12 +266,17 @@
<Compile Include="ISessionFactory.cs" />
<Compile Include="ITransaction.cs" />
<Compile Include="LazyInitializationException.cs" />
+ <Compile Include="Linq\Clauses\NhJoinClause.cs" />
<Compile Include="Linq\Functions\DictionaryGenerator.cs" />
+ <Compile Include="Linq\ReWriters\AddJoinsReWriter.cs" />
<Compile Include="Linq\ReWriters\MoveOrderByToEndRewriter.cs" />
<Compile Include="Linq\ReWriters\ResultOperatorRewriter.cs" />
<Compile Include="Linq\ReWriters\ResultOperatorRewriterResult.cs" />
+ <Compile Include="Linq\Visitors\AbstractJoinDetector.cs" />
<Compile Include="Linq\Visitors\ExpressionTreeVisitor.cs" />
<Compile Include="Linq\Visitors\ResultOperatorProcessors\ProcessAggregateFromSeed.cs" />
+ <Compile Include="Linq\Visitors\SelectAndOrderByJoinDetector.cs" />
+ <Compile Include="Linq\Visitors\WhereJoinDetector.cs" />
<Compile Include="Loader\Loader.cs" />
<Compile Include="Loader\OuterJoinLoader.cs" />
<Compile Include="LockMode.cs" />
@@ -892,7 +897,6 @@
<Compile Include="Linq\Expressions\NhMinExpression.cs" />
<Compile Include="Linq\Expressions\NhSumExpression.cs" />
<Compile Include="Impl\ExpressionQueryImpl.cs" />
- <Compile Include="Linq\ReWriters\AddLeftJoinsReWriter.cs" />
<Compile Include="Linq\Visitors\IHqlExpressionVisitor.cs" />
<Compile Include="Linq\GroupJoin\IsAggregatingResults.cs" />
<Compile Include="Linq\GroupJoin\GroupJoinAggregateDetectionVisitor.cs" />
@@ -908,7 +912,6 @@
<Compile I...
[truncated message content] |
|
From: <pa...@us...> - 2011-04-15 23:55:20
|
Revision: 5707
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5707&view=rev
Author: patearl
Date: 2011-04-15 23:55:13 +0000 (Fri, 15 Apr 2011)
Log Message:
-----------
Linq: More changes related to NH-2583.
(Also includes a trivial compilation fix to an earlier commit)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetectorDesignNotes.txt
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate/Linq/Clauses/LeftJoinClause.cs
trunk/nhibernate/src/NHibernate/Linq/ReWriters/AddLeftJoinsReWriter.cs
trunk/nhibernate/src/NHibernate/Linq/Visitors/LeftJoinDetector.cs
Deleted: trunk/nhibernate/src/NHibernate/Linq/Clauses/LeftJoinClause.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Clauses/LeftJoinClause.cs 2011-04-15 18:42:11 UTC (rev 5706)
+++ trunk/nhibernate/src/NHibernate/Linq/Clauses/LeftJoinClause.cs 2011-04-15 23:55:13 UTC (rev 5707)
@@ -1,12 +0,0 @@
-using System.Linq.Expressions;
-using Remotion.Linq.Clauses;
-
-namespace NHibernate.Linq.Visitors
-{
- public class LeftJoinClause : AdditionalFromClause
- {
- public LeftJoinClause(string itemName, System.Type itemType, Expression fromExpression) : base(itemName, itemType, fromExpression)
- {
- }
- }
-}
\ No newline at end of file
Deleted: trunk/nhibernate/src/NHibernate/Linq/ReWriters/AddLeftJoinsReWriter.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/ReWriters/AddLeftJoinsReWriter.cs 2011-04-15 18:42:11 UTC (rev 5706)
+++ trunk/nhibernate/src/NHibernate/Linq/ReWriters/AddLeftJoinsReWriter.cs 2011-04-15 23:55:13 UTC (rev 5707)
@@ -1,95 +0,0 @@
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using NHibernate.Linq.Visitors;
-using Remotion.Linq;
-using Remotion.Linq.Clauses;
-
-namespace NHibernate.Linq.ReWriters
-{
- public class AddLeftJoinsReWriter : QueryModelVisitorBase
- {
- private readonly ISessionFactory _sessionFactory;
-
- private AddLeftJoinsReWriter(ISessionFactory sessionFactory)
- {
- _sessionFactory = sessionFactory;
- }
-
- public static void ReWrite(QueryModel queryModel, ISessionFactory sessionFactory)
- {
- var rewriter = new AddLeftJoinsReWriter(sessionFactory);
-
- rewriter.VisitQueryModel(queryModel);
- }
-
- public override void VisitSelectClause(SelectClause selectClause, QueryModel queryModel)
- {
- selectClause.Selector = JoinReplacer(queryModel, selectClause.Selector);
- }
-
- public override void VisitOrderByClause(OrderByClause orderByClause, QueryModel queryModel, int index)
- {
- foreach (Ordering ordering in orderByClause.Orderings)
- {
- ordering.Expression = JoinReplacer(queryModel, ordering.Expression);
- }
- }
-
- private Expression JoinReplacer(QueryModel queryModel, Expression expression)
- {
- var joins = LeftJoinDetector.Detect(expression, new NameGenerator(queryModel), _sessionFactory);
-
- Expression result = expression;
-
- if (joins.Joins.Count > 0)
- {
- result = joins.Selector;
-
- queryModel.TransformExpressions(e => ExpressionSwapper.Swap(e, joins.ExpressionMap));
-
- foreach (var join in joins.Joins)
- {
- queryModel.BodyClauses.Add(join);
- }
- }
-
- return result;
- }
- }
-
- public class ExpressionSwapper : NhExpressionTreeVisitor
- {
- private readonly Dictionary<Expression, Expression> _expressionMap;
-
- private ExpressionSwapper(Dictionary<Expression, Expression> expressionMap)
- {
- _expressionMap = expressionMap;
- }
-
- public static Expression Swap(Expression expression, Dictionary<Expression, Expression> expressionMap)
- {
- var swapper = new ExpressionSwapper(expressionMap);
-
- return swapper.VisitExpression(expression);
- }
-
- public override Expression VisitExpression(Expression expression)
- {
- if (expression == null)
- {
- return null;
- }
-
- Expression replacement;
-
- if (_expressionMap.TryGetValue(expression, out replacement))
- {
- return replacement;
- }
- else
- {
- return base.VisitExpression(expression);
- }
- }
- }
-}
\ No newline at end of file
Deleted: trunk/nhibernate/src/NHibernate/Linq/Visitors/LeftJoinDetector.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/LeftJoinDetector.cs 2011-04-15 18:42:11 UTC (rev 5706)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/LeftJoinDetector.cs 2011-04-15 23:55:13 UTC (rev 5707)
@@ -1,75 +0,0 @@
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using Remotion.Linq.Clauses.Expressions;
-
-namespace NHibernate.Linq.Visitors
-{
- public class LeftJoinDetector : NhExpressionTreeVisitor
- {
- private readonly NameGenerator _nameGenerator;
- private readonly ISessionFactory _sessionFactory;
- private readonly Dictionary<string, LeftJoinClause> _joins = new Dictionary<string, LeftJoinClause>();
- private readonly Dictionary<Expression, Expression> _expressionMap = new Dictionary<Expression, Expression>();
-
- private LeftJoinDetector(NameGenerator nameGenerator, ISessionFactory sessionFactory)
- {
- _nameGenerator = nameGenerator;
- _sessionFactory = sessionFactory;
- }
-
- public static Results Detect(Expression selector, NameGenerator nameGenerator, ISessionFactory sessionFactory)
- {
- var detector = new LeftJoinDetector(nameGenerator, sessionFactory);
-
- var newSelector = detector.VisitExpression(selector);
-
- return new Results(newSelector, detector._joins.Values, detector._expressionMap);
- }
-
- protected override Expression VisitMemberExpression(MemberExpression expression)
- {
- if (expression.Type.IsNonPrimitive() && IsEntity(expression.Type))
- {
- var newExpr = AddJoin(expression);
- if (!_expressionMap.ContainsKey(expression) || !_expressionMap[expression].Equals(newExpr)) // Second clause is sanity check.
- _expressionMap.Add(expression, newExpr);
- return newExpr;
- }
-
- return base.VisitMemberExpression(expression);
- }
-
- private bool IsEntity(System.Type type)
- {
- return _sessionFactory.GetClassMetadata(type) != null;
- }
-
- private Expression AddJoin(MemberExpression expression)
- {
- string key = ExpressionKeyVisitor.Visit(expression, null);
- LeftJoinClause join;
-
- if (!_joins.TryGetValue(key, out join))
- {
- join = new LeftJoinClause(_nameGenerator.GetNewName(), expression.Type, expression);
- _joins.Add(key, join);
- }
-
- return new QuerySourceReferenceExpression(join);
- }
-
- public class Results
- {
- public Expression Selector { get; private set; }
- public ICollection<LeftJoinClause> Joins { get; private set; }
- public Dictionary<Expression, Expression> ExpressionMap { get; private set; }
-
- public Results(Expression selector, ICollection<LeftJoinClause> joins, Dictionary<Expression, Expression> expressionMap)
- {
- Selector = selector;
- Joins = joins;
- ExpressionMap = expressionMap;
- }
- }
- }
-}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs 2011-04-15 18:42:11 UTC (rev 5706)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs 2011-04-15 23:55:13 UTC (rev 5707)
@@ -8,8 +8,8 @@
{
/// <summary>
/// The WhereJoinDetector creates the joins for the where clause, including
- /// optimizations for inner joins. The algorithms are explained in a text
- /// attached to JIRA entry NH-2583.
+ /// optimizations for inner joins. The algorithms are explained in
+ /// the accompanying text file.
/// </summary>
internal class WhereJoinDetector : AbstractJoinDetector
{
Added: trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetectorDesignNotes.txt
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetectorDesignNotes.txt (rev 0)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetectorDesignNotes.txt 2011-04-15 23:55:13 UTC (rev 5707)
@@ -0,0 +1,309 @@
+[Commiter's Notes: As with the code, this design document was contributed by Harald Mueller.
+ By default in Linq, a member expression such as a.B.C is converted into left outer joins so if we have something like a => (a.B.C == 1 || a.D.E == 2) we don't lose records due to the join where B or D is null.
+ This document describes how we optimize to inner joins when outer joins are not required, such as in the simple case of a => a.B.C == 1.
+ There was significant discussion on the developers mailing list regarding this topic. See also NH-2583.]
+
+Optimization of outer joins to inner joins for (||-4) semantics
+===============================================================
+
+It is interesting - and for some databases an advantage - to replace outer joins with inner joins if the outer joins are not necessary. "Not necessary" here means that the result must not be different whether using outer joins or inner joins. The question, obviously, is: For which joinable member expressions can we replace an outer join with an inner join without creating wrong results?
+
+It took me a few hours to find this out. Here is the result.
+
+A record (object) will be in the result if the evaluation of the condition in 3-value SQL logic will return true; it will not be in the result if the result is either logical-null or false. The difference between outer joining and inner joining is that with the latter, objects are missing from the set on which the condition is checked. Thus, inner joins "emulates" a result that is logical-null or false. And therefore, we can replace an outer join with an inner join only if the resulting condition was not true on the outer join in the first place when there was an "empty outer join" - i.e., the outer join had to add nulls because there was no joinable record.
+
+By the way, I will in the following call the nulls added by "dangling outer joins" "oj-nulls". They have to be distinguished from the two other sorts of nulls in SQL:
+* "value-null" - a NULL in a column of a table
+* "logical-null" - a NULL resulting from the evaluation of certain conditions on certain values (in SQL, at least one of these values must be a value-null or oj-null).
+In contrast to value-nulls, oj-nulls have the peculiar property that they can exist even for non-nullable columns.
+
+If we look at the evaluation tree of a condition, we can assign to each node and for each joinable member expression one of the following small sets:
+
+ t definitely makes the node true when the member expression is emptily outer-joined (i.e., joining it creates oj-nulls for all the simple properties)
+ n definitely makes the node logical-null when emptily outer-joined
+ f definitely makes the node false when emptily outer-joined
+ tn maybe makes it true, maybe logical-null when emptily outer-joined
+ tf maybe makes it true, maybe false when emptily outer-joined
+ nf maybe makes it logical-null, maybe false when emptily outer-joined
+ tnf maybe makes it true, maybe logical-null, maybe false when emptily outer-joined
+
+(An eighth set, the empty one, could only be assigned to a contradiction. We ignore such conditions in most of the following discussion).
+
+When we know these values at the top condition, we can then safely use inner joins for all member expressions for which the value does not contain t.
+The reasoning is as follows: If for some result record, the empty outer join of a joinable member expression has made the top where condition logical-null or false, this record will be dropped from the result set - this is just the definition of how a query handles logical-null and false results. But an inner join cannot "do more harm" - it will also just drop the record from the result. Therefore, we can safely replace outer joins to such joinable member expressions with inner joins.
+
+In the following, we assemble the rules for computing the member expressions mappings introduced above. After a few examples, we look at the rules, and then more examples.
+
+(Remark: I use C# notation in the following, with the following semantics:
+* Generally, the semantics for condition evaluation is 3-valued SQL semantics with condition results of true, logical-null, or false
+* == null has the semantics of "is null"
+* != null the semantics of "is not null"
+* the final result contains objects where the condition evaluation yields true, but not logical-null or false - this is the standard mapping of 3-valued-semantics to 2-valued-semantics).
+
+As a first example, the condition
+
+ x.A.B == 4
+
+is logical-null when emptily outer-joining x.A, but never true or false. Thus, we have { x.A -> n }. Inner joining x.A (which drops records that are emptily joined) therefore yields the same 2-valued-logic result.
+
+On the other hand, the condition
+
+ x.A.B == null && x.E == null
+
+can be made true or false by emptily outer-joining x.A, but never logical-null (resaon: The right side can only be true or false; and the left side also; so the complete condition is either true or false - depending on x.E's value). So, { x.A -> tf }, and therefore we cannot inner join x.A (there is a t in the mapping!). By direct reasoning, we see that inner joining x.A will drop all the non-joinable records, hence inner and outer joining are different for records where x.E is null, and will yield a different 2-valued-logic result.
+
+Finally, the condition
+
+ x.A.B == null || x.E == null
+
+is always true when emptily outer-joining x.A, so { x.A -> t }. Hence, the result is always different from inner joining, where the empty join drops such records from the result.
+
+How can we compute the mapping from member expressions to possible values? First, we note that we can compute this mapping with different "preciseness". For example, one correct way would be to just collect all joinable member expressions into a set M, and then set { mE -> tnf } for all member expressions mE in M. Obviously, this prevents any inner joins. On the other hand, we can in principle quite precisely check condition like the following - the question is whether this is worth the effort:
+
+ x.A.B == null x.A -> ...
+ !(x.A.B != null) x.A -> ...
+ (x.A.B ?? 4) == 4 x.A -> ...
+ !((x.A.B ?? 4) != 4) x.A -> ...
+ (x.A.B ?? x.E) == 4 x.A -> ...
+ (x.A.B ?? x.C.D) == 4 x.A -> ..., x.C -> ...
+
+In the following, I'll first give the rules for the 4 logical operators &&, ||, !, and ?!; then I'll give practical rules (I think) for common simple conditions; finally, I'll look at some more complex simple conditions.
+
+(a) && operator:
+
+ && t n f tn tf nf tnf -
+ t t n f tn tf nf tnf tnf
+ n n f n nf nf nf nf
+ f f f f f f f
+ tn tn tnf nf tnf tnf
+ tf tf nf tnf tnf
+ nf nf nf nf
+ tnf tnf tnf
+ - -
+
+The single letters are easy: They follow the 3-valued SQL logic. E.g., if emptily joining a member expression will definitely return true for condition A and logical-null for condition B, it will definitely return (true && logical-null) = logical-null for A && B.
+For the multiple values, we have to compute the union of the values in the small sets. For example, tn && tf is { t && t, t && f, n && t, n && f } = { t,f,n,f } = tnf.
+If the member expression is missing on one side, we must assume any value for that side. After all, the condition on the other side could e.g. be 0 == 0, 0 == null, or 0 == 1. Therefore, the result is the same as if we would get tnf from the other side. See examples (ex.4) and (ex.5) below for some more thoughts on this.
+The values below the diagonal are symmetric to the upper ones.
+
+(b) || operator:
+
+ || t n f tn tf nf tnf -
+ t t t t t t t t t
+ n n n tn tn n tn tn
+ f f tn tf nf tnf tnf
+ tn tn tn tn tn tn
+ tf tf tnf tnf tnf
+ nf nf tnf tnf
+ tnf tnf tnf
+ - -
+
+The resoning is similar to &&.
+Again, the values below the diagonal are symmetric to the upper ones.
+
+(c) ! operator:
+
+ ! t n f tn tf nf tnf
+ f n t nf tf tn tnf
+
+The resoning is similar to &&.
+
+(d) Logical ?: operator:
+
+A ? B : C is equivalent to A && B || !A && C. From this, one can compute the mappings (I would need a three-dimensional "cube matrix" for their presentation, which is hard in text ... ok, a tree also would work ...).
+
+Now let us look at simple conditions. The following are *possible* member expression mappings. As said above, one can also assign the values more crudely - e.g., always assign tnf to all member expressions. However, the assignments below are reasonable precise - i.e., they assign the minimal sets for practical values (if I did not make a mistake).
+
+(e) mE*.P <op> <constant(s)> (where <constant(s)> are not value-nulls)
+
+mE* here is a symbol for a "nested sequence of member expressions" mE1, mE2, ..., .P is the final property. E.g. in
+
+ a.B.C.D.E == 4
+
+the member expressions are mE1=a.B, mE2=a.B.C, and mE3=a.B.C.D; the final property is E. In this case, we get { mE -> n } for all member expressions mE. Reason: Emptily outer joining any member expression will yield oj-null for P; but oj-null <op> <constant> is always logical-null.
+
+(f) mE*.P [<op>s <constant>s] == me'*.Q [<op>s <constant>s]
+
+The result depends on the definition of ==: We can either use the Linq definition where null == null is true (which requires an SQL translation of ... = ... OR ... IS NULL AND ... IS NULL); or the SQL definition where null == null is logical-null.
+
+In the first case, we reason as follows:
+
+ - When one side (e.g. the left one) does empty outer-joining and yields oj-null for P, but the right side has non-oj-null values, the SQL
+ oj-null = value OR oj-null IS NULL AND value IS NULL
+ evaluates as logical-null OR true AND false, which is logical-null OR true, which is true.
+ - When both sides do empty outer-joining, we get
+ oj-null = oj-null OR oj-null IS NULL AND oj-null IS NULL
+ which is logical-null OR true AND true, which is true.
+
+So, empty outer joining will always yield true, and hence we get { mE -> t } for all member expressions mE.
+
+For the SQL definition of equality, we get the following:
+
+ - When one side (e.g. the left one) does empty outer-joining and yields oj-null for P, but the right side has non-oj-null values, the SQL
+ oj-null = value
+ evaluates as logical-null.
+ - When both sides do empty outer-joining, we get
+ oj-null = oj-null
+ which is logical-null.
+
+So, empty outer joining will always yield logical-null, and hence we get { mE -> n } for all member expressions mE.
+
+(g) mE*.P [<op>s <constant>s] != me'*.Q [<op>s <constant>s]
+
+Again, the result depends on the definition of ==: We can either use the Linq definition where null != null is false (which requires an SQL translation of ... <> ... OR ... IS NULL AND ... IS NOT NULL OR ... IS NOT NULL AND ... IS NULL); or the SQL definition where null != null is logical-null.
+
+In the first case, we reason as follows:
+
+ - When one side (e.g. the left one) does empty outer-joining and yields oj-null for P, but the right side has non-oj-null values, the SQL
+ oj-null <> value OR oj-null IS NULL AND value IS NOT NULL OR oj-null IS NOT NULL AND value IS NULL
+ evaluates as logical-null OR true AND true OR false AND false, which is true.
+ - When both sides do empty outer-joining, we get
+ oj-null <> oj-null OR oj-null IS NULL AND oj-null IS NOT NULL OR oj-null IS NOT NULL AND oj-null IS NULL
+ which is logical-null OR false OR false, which is logical-null.
+
+So, empty outer joining will yield true or logical-null, and hence we get { mE -> tn } for all member expressions mE.
+
+For the SQL definition of equality, we get the following:
+
+ - When one side (e.g. the left one) does empty outer-joining and yields oj-null for P, but the right side has non-oj-null values, the SQL
+ oj-null <> value
+ evaluates as logical-null.
+ - When both sides do empty outer-joining, we get
+ oj-null <> oj-null
+ which is also logical-null.
+
+So, empty outer joining will always yield logical-null, and hence we get { mE -> n } for all member expressions mE.
+
+(h) mE*.P != null
+
+Here is a first attempt: Empty outer joining can only yield false, hence we get { mE -> f } for all member expressions mE.
+
+There is a small problem with this definition: If P itself is a pointer to a mapped entity, we would *not* record that P is guaranteed to point to a valid object. This hurts in the following query:
+
+ x.A != null && x.A.B != 4
+
+According to (e), the right side will create the mapping { x.A -> n }. The left side does not have a joinable member expression (x.A is not joined! it is just evaluated on x's table), so the mapping is { }. According to (a), we get for the whole condition { x.A -> nf }. Actually, we know that the result should be { x.A -> f }: An empty outer join of x.A will yield "false" for the left hand side, and hence the complete condition will then always be false - never logical-null. The error is of course that we ignore the knowledge about x.A being a mapped entity. This does not disturb the inner join possibility here (the result does not contain t), and I cannot think of a case where it would - but it's wrong or at least imprecise nevertheless.
+A better definition would be:
+* If mE*.P does not reference an entity, then { mE -> f } for all member expressions mE.
+* Otherwise, also include { mE*.P -> f } in the result.
+
+(i) mE*.P == null
+
+Empty outer joining can only yield true, hence we get { mE -> t } for all member expressions mE. Example (ex.4) below hints at an idea that would make this mapping more precise (with questionable practical value).
+As above, we can add { mE*.P -> t } if mE*.P references an entity.
+
+(j) Other complex simple condition, e.g. (x.A.B ?? x.C.D) <op> <constant(s)>
+
+Here, I opt for the simple assignment { mE -> tnf } for all member expressions mE. It is probably possible to do better by analyzing coalesce operators (??).
+
+Now, we should do a few examples.
+
+(ex.1) a.B.C == 2
+
+ a.B.C == 2 { a.B -> n } (e)
+
+ In this simple case, we can actually inner join a.B. This is also true for conditions like a.B.C > 2 or a.B.C <= 2.
+
+(ex.2) Show that the typical "in-to-|| translation" will yield inner joins:
+
+ a.B.C == 1 || a.B.C == 2
+
+ a.B.C == 1 { a.B -> n } (e)
+ a.B.C == 2 { a.B -> n } (e)
+ a.B.C == 1 || a.B.C == 2 { a.B -> n } (b)
+
+ As a.B's mapping does not contain a t, we can inner join it.
+
+(ex.3) a.B.C == null
+
+ a.B.C == null { a.B -> t } (g)
+
+ Even in this simple case, we cannot inner join a.B!
+
+(ex.4) a.B == null || a.B.C == 1
+
+ a.B == null { a.B -> t } (i)
+ a.B.C == 2 { a.B -> n } (e)
+ a.B == null || a.B.C == 2 { a.B -> t } (b)
+
+ Also in this case, we cannot inner join a.B. The reason is that emptily outer-joining a.B can make the left hand side true (which it actually does). One could argue that we could derive a sharper bound by somehow looking at the meaning of a.B == null: Actually, we can be sure that this condition can only true when emptily outer-joining a.B, and not "true or logical-null or false" as the formal derivation assumes for a missing joinable member expression. Yet, in this example, we would not get a different final result (and I did not think about cases where the more precise reasoning could yield more inner joins).
+
+(ex.5)
+ a.E == null || a.B.C == 1 // a.E is an integer property
+
+ a.E == null { }
+ a.B.C == 2 { a.B -> n } (e)
+ a.B == null || a.B.C == 2 { a.B -> tn } (b)
+
+ We could compute the result somewhat more precisely: a.E == null can only be true or false, but not logical-null. In such cases, we could tighten the result by also assigning a set of possible values to each node, independent of empty outer joins. With the knowledge that a.E can only map to tf, we would use this set in the || computation, instead of the general pessimistic tnf. Especially when having contradictions (like false or 0 == 1) or tautologies (like true or 0 == 0) in the tree, this would make the result more precise. An interesting example would be a.B.C != a.B.C with SQL equality semantics: It can return only logical-null or false, which could - if this expression occurs - reduce some results containing t and hence allow inner joins. However, all these examples seem artificial: In usual applications, neither contradictions nor tautologies nor a.B.C != a.B.C will occur often enough in queries to justify the additional complexity in the algorithms.
+
+(ex.6)
+ a.B != null && a.B.C == 1
+
+ a.B != null { a.B -> f } (h)
+ a.B.C == 1 { a.B -> n } (e)
+ a.B != null && a.B.C == 1 { a.B -> f } (a)
+
+ Thus, we can inner join a.B here.
+
+(ex.7)
+ a.B.C == a.D.E || a.B.C == a.D.E + 1
+
+ a.B.C == a.D.E { a.B -> n, a.D -> n } (f)
+ a.B.C == a.D.E + 1 { a.B -> n, a.D -> n } (f)
+ ...complete condition... { a.B -> n, a.D -> n } (b)
+
+ So we can inner join both a.B and a.D in this case!
+
+(ex.8)
+
+ a.B.C == 1 || a.D.E == 2
+
+ a.B.C == 1 { a.B -> n } (e)
+ a.D.E == 2 { a.D -> n } (e)
+ ...complete condition... { a.B -> tnf, a.D -> tnf } (b)
+
+ We can*not* inner join a.B and a.D in this case.
+
+(ex.9)
+
+ a.B.C == 1 && a.D.E == 2
+
+ a.B.C == 1 { a.B -> n } (e)
+ a.D.E == 1 { a.D -> n } (e)
+ ...complete condition... { a.B -> nf, a.D -> nf } (a)
+
+ Just by replacing || with && in the previous example, we can inner join both a.B and a.D.
+
+
+The above rules guarantee that the inner joins yield exactly the same results as full outer joining. This, fortunately, has the consequence that the following *cannot* happen:
+
+ A query with conditon C yields a different result than condition C || F, where F is always false.
+
+Why did I fear that this could happen? In previous rules I had invented, the *operators* in the condition decided whether a joinable member expression was outer joined or inner joined. Especially, the || and ! operators essentially required outer joining for member expressions used in their sub-conditions. But with such a machinery, it could happen that some member expression
+
+* is *inner* joined for C alone (if there is no || or !)
+* is *outer* joined for C || F (as there is now an || operator).
+
+But this could give us maybe different results if not done perfectly. Actually, there are examples where F is definitely always false, but we still get different joinings for C and C || F with the rules above. Here are two - a simple and a not so simple one:
+
+(ex.10)
+ C is the condition x.A.B == 1.
+ F is the condition 0 == 1.
+
+(ex.11)
+ C is the condition x.A.B == 1.
+ F is the condition x.C.D * x.C.D < Math.Abs(x.C.D) - 1.
+
+Elementary mathematics shows that F is always false in (ex.11) (for real numbers). But according to the rules above, we get in both (ex.10) and (ex.11)
+
+ for C alone: { x.A -> n }
+
+ for C || F:
+ C { x.A -> n } (f)
+ F { x.C -> tnf } (j) // Actually, { } for (ex.10); which is treated like { x.C -> tnf } for ||.
+ C || F { x.A -> tn, x.C -> tnf } (b), (b)
+
+Therefore, we can inner join x.A for C alone, but not for C || F. Still, the arguments above show us that we can "carelessly" replace the inner joins with outer joins and still get the same results! So I sleep well with the rules above (I just have to implement them).
+
+As a final brain-teaser: What intelligence would NHib.Linq have to have to be able to create an inner join to x.A also for C || F in (ex.10) and (ex.11)?
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-15 18:42:11 UTC (rev 5706)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-15 23:55:13 UTC (rev 5707)
@@ -273,7 +273,6 @@
<Compile Include="Linq\ReWriters\ResultOperatorRewriter.cs" />
<Compile Include="Linq\ReWriters\ResultOperatorRewriterResult.cs" />
<Compile ...
[truncated message content] |
|
From: <fab...@us...> - 2011-04-16 18:05:05
|
Revision: 5708
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5708&view=rev
Author: fabiomaulo
Date: 2011-04-16 18:04:59 +0000 (Sat, 16 Apr 2011)
Log Message:
-----------
Conformist subclass registration fix
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/SubclassMappingRegistration.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs 2011-04-15 23:55:13 UTC (rev 5707)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs 2011-04-16 18:04:59 UTC (rev 5708)
@@ -4,7 +4,7 @@
namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl
{
- public class SubclassCustomizer<TEntity> : PropertyContainerCustomizer<TEntity>, ISubclassMapper<TEntity> where TEntity : class
+ public class SubclassCustomizer<TEntity> : PropertyContainerCustomizer<TEntity>, ISubclassMapper<TEntity>, IConformistHoldersProvider where TEntity : class
{
private Dictionary<string, IJoinMapper<TEntity>> joinCustomizers;
@@ -123,5 +123,19 @@
}
#endregion
+
+ #region IConformistHoldersProvider Members
+
+ ICustomizersHolder IConformistHoldersProvider.CustomizersHolder
+ {
+ get { return CustomizersHolder; }
+ }
+
+ IModelExplicitDeclarationsHolder IConformistHoldersProvider.ExplicitDeclarationsHolder
+ {
+ get { return ExplicitDeclarationsHolder; }
+ }
+
+ #endregion
}
}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/SubclassMappingRegistration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/SubclassMappingRegistration.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/SubclassMappingRegistration.cs 2011-04-16 18:04:59 UTC (rev 5708)
@@ -0,0 +1,74 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NUnit.Framework;
+using NHibernate.Mapping.ByCode;
+using NHibernate.Mapping.ByCode.Conformist;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.ExpliticMappingTests.ConformistMappingRegistrationTests
+{
+ public class SubclassMappingRegistration
+ {
+ public class MyClass
+ {
+ public int Id { get; set; }
+ public string Something { get; set; }
+ }
+ public class Inherited: MyClass
+ {
+ public string SomethingElse { get; set; }
+ }
+
+ private class MyClassMap: ClassMapping<MyClass>
+ {
+ public MyClassMap()
+ {
+ Id(x => x.Id, map =>
+ {
+ map.Column("MyClassId");
+ map.Generator(Generators.HighLow);
+ });
+ Property(x => x.Something, map => map.Length(150));
+ }
+ }
+ private class InheritedMap : SubclassMapping<Inherited>
+ {
+ public InheritedMap()
+ {
+ Property(x => x.SomethingElse, map => map.Length(15));
+ }
+ }
+
+ [Test]
+ public void WhenRegisterClassMappingThenMapTheClass()
+ {
+ var mapper = new ModelMapper();
+ mapper.AddMapping<MyClassMap>();
+ mapper.AddMapping<InheritedMap>();
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(Inherited) });
+
+ ModelIsWellFormed(hbmMapping);
+ }
+
+ [Test]
+ public void WhenRegisterClassMappingThroughTypeThenMapTheClass()
+ {
+ var mapper = new ModelMapper();
+ mapper.AddMapping(typeof(MyClassMap));
+ mapper.AddMapping(typeof(InheritedMap));
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(Inherited) });
+
+ ModelIsWellFormed(hbmMapping);
+ }
+
+ private void ModelIsWellFormed(HbmMapping hbmMapping)
+ {
+ var hbmClass = hbmMapping.SubClasses.Single();
+ hbmClass.Should().Not.Be.Null();
+ hbmClass.extends.Should().Contain("MyClass");
+ var hbmProperty = hbmClass.Properties.OfType<HbmProperty>().Single();
+ hbmProperty.name.Should().Be("SomethingElse");
+ hbmProperty.length.Should().Be("15");
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-15 23:55:13 UTC (rev 5707)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-16 18:04:59 UTC (rev 5708)
@@ -530,6 +530,7 @@
<Compile Include="MappingByCode\ExplicitlyDeclaredModelTests\UnionSubclassMappingStrategyTests.cs" />
<Compile Include="MappingByCode\ExplicitlyDeclaredModelTests\UnionSubclassSequenceRegistrationTests.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\ModelMapperAddMappingByTypeTests.cs" />
+ <Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\SubclassMappingRegistration.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\IdBagMappingTest.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\MappingOfPrivateMembersOnRootEntity.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\NaturalIdTests.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-16 18:09:14
|
Revision: 5709
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5709&view=rev
Author: fabiomaulo
Date: 2011-04-16 18:09:08 +0000 (Sat, 16 Apr 2011)
Log Message:
-----------
Conformist joined-subclass registration fix
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/JoinedSubclassMappingRegistration.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs 2011-04-16 18:04:59 UTC (rev 5708)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs 2011-04-16 18:09:08 UTC (rev 5709)
@@ -3,7 +3,7 @@
namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl
{
- public class JoinedSubclassCustomizer<TEntity> : PropertyContainerCustomizer<TEntity>, IJoinedSubclassMapper<TEntity> where TEntity : class
+ public class JoinedSubclassCustomizer<TEntity> : PropertyContainerCustomizer<TEntity>, IJoinedSubclassMapper<TEntity>, IConformistHoldersProvider where TEntity : class
{
private readonly IKeyMapper<TEntity> keyMapper;
@@ -125,5 +125,19 @@
}
#endregion
+
+ #region IConformistHoldersProvider Members
+
+ ICustomizersHolder IConformistHoldersProvider.CustomizersHolder
+ {
+ get { return CustomizersHolder; }
+ }
+
+ IModelExplicitDeclarationsHolder IConformistHoldersProvider.ExplicitDeclarationsHolder
+ {
+ get { return ExplicitDeclarationsHolder; }
+ }
+
+ #endregion
}
}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/JoinedSubclassMappingRegistration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/JoinedSubclassMappingRegistration.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/JoinedSubclassMappingRegistration.cs 2011-04-16 18:09:08 UTC (rev 5709)
@@ -0,0 +1,74 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NUnit.Framework;
+using NHibernate.Mapping.ByCode;
+using NHibernate.Mapping.ByCode.Conformist;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.ExpliticMappingTests.ConformistMappingRegistrationTests
+{
+ public class JoinedSubclassMappingRegistration
+ {
+ public class MyClass
+ {
+ public int Id { get; set; }
+ public string Something { get; set; }
+ }
+ public class Inherited : MyClass
+ {
+ public string SomethingElse { get; set; }
+ }
+
+ private class MyClassMap : ClassMapping<MyClass>
+ {
+ public MyClassMap()
+ {
+ Id(x => x.Id, map =>
+ {
+ map.Column("MyClassId");
+ map.Generator(Generators.HighLow);
+ });
+ Property(x => x.Something, map => map.Length(150));
+ }
+ }
+ private class InheritedMap : JoinedSubclassMapping<Inherited>
+ {
+ public InheritedMap()
+ {
+ Property(x => x.SomethingElse, map => map.Length(15));
+ }
+ }
+
+ [Test]
+ public void WhenRegisterClassMappingThenMapTheClass()
+ {
+ var mapper = new ModelMapper();
+ mapper.AddMapping<MyClassMap>();
+ mapper.AddMapping<InheritedMap>();
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(Inherited) });
+
+ ModelIsWellFormed(hbmMapping);
+ }
+
+ [Test]
+ public void WhenRegisterClassMappingThroughTypeThenMapTheClass()
+ {
+ var mapper = new ModelMapper();
+ mapper.AddMapping(typeof(MyClassMap));
+ mapper.AddMapping(typeof(InheritedMap));
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(Inherited) });
+
+ ModelIsWellFormed(hbmMapping);
+ }
+
+ private void ModelIsWellFormed(HbmMapping hbmMapping)
+ {
+ var hbmClass = hbmMapping.JoinedSubclasses.Single();
+ hbmClass.Should().Not.Be.Null();
+ hbmClass.extends.Should().Contain("MyClass");
+ var hbmProperty = hbmClass.Properties.OfType<HbmProperty>().Single();
+ hbmProperty.name.Should().Be("SomethingElse");
+ hbmProperty.length.Should().Be("15");
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-16 18:04:59 UTC (rev 5708)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-16 18:09:08 UTC (rev 5709)
@@ -529,6 +529,7 @@
<Compile Include="MappingByCode\ExplicitlyDeclaredModelTests\SubclassSequenceRegistrationTests.cs" />
<Compile Include="MappingByCode\ExplicitlyDeclaredModelTests\UnionSubclassMappingStrategyTests.cs" />
<Compile Include="MappingByCode\ExplicitlyDeclaredModelTests\UnionSubclassSequenceRegistrationTests.cs" />
+ <Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\JoinedSubclassMappingRegistration.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\ModelMapperAddMappingByTypeTests.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\SubclassMappingRegistration.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\IdBagMappingTest.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-16 18:12:50
|
Revision: 5710
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5710&view=rev
Author: fabiomaulo
Date: 2011-04-16 18:12:44 +0000 (Sat, 16 Apr 2011)
Log Message:
-----------
Conformist union-subclass registration fix
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/UnionSubclassCustomizer.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/UnionSubclassMappingRegistrationTest.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/UnionSubclassCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/UnionSubclassCustomizer.cs 2011-04-16 18:09:08 UTC (rev 5709)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/UnionSubclassCustomizer.cs 2011-04-16 18:12:44 UTC (rev 5710)
@@ -3,7 +3,7 @@
namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl
{
- public class UnionSubclassCustomizer<TEntity> : PropertyContainerCustomizer<TEntity>, IUnionSubclassMapper<TEntity> where TEntity : class
+ public class UnionSubclassCustomizer<TEntity> : PropertyContainerCustomizer<TEntity>, IUnionSubclassMapper<TEntity>, IConformistHoldersProvider where TEntity : class
{
public UnionSubclassCustomizer(IModelExplicitDeclarationsHolder explicitDeclarationsHolder, ICustomizersHolder customizersHolder)
: base(explicitDeclarationsHolder, customizersHolder, null)
@@ -111,5 +111,19 @@
}
#endregion
+
+ #region IConformistHoldersProvider Members
+
+ ICustomizersHolder IConformistHoldersProvider.CustomizersHolder
+ {
+ get { return CustomizersHolder; }
+ }
+
+ IModelExplicitDeclarationsHolder IConformistHoldersProvider.ExplicitDeclarationsHolder
+ {
+ get { return ExplicitDeclarationsHolder; }
+ }
+
+ #endregion
}
}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/UnionSubclassMappingRegistrationTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/UnionSubclassMappingRegistrationTest.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/UnionSubclassMappingRegistrationTest.cs 2011-04-16 18:12:44 UTC (rev 5710)
@@ -0,0 +1,74 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NUnit.Framework;
+using NHibernate.Mapping.ByCode;
+using NHibernate.Mapping.ByCode.Conformist;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.ExpliticMappingTests.ConformistMappingRegistrationTests
+{
+ public class UnionSubclassMappingRegistrationTest
+ {
+ public class MyClass
+ {
+ public int Id { get; set; }
+ public string Something { get; set; }
+ }
+ public class Inherited : MyClass
+ {
+ public string SomethingElse { get; set; }
+ }
+
+ private class MyClassMap : ClassMapping<MyClass>
+ {
+ public MyClassMap()
+ {
+ Id(x => x.Id, map =>
+ {
+ map.Column("MyClassId");
+ map.Generator(Generators.HighLow);
+ });
+ Property(x => x.Something, map => map.Length(150));
+ }
+ }
+ private class InheritedMap : UnionSubclassMapping<Inherited>
+ {
+ public InheritedMap()
+ {
+ Property(x => x.SomethingElse, map => map.Length(15));
+ }
+ }
+
+ [Test]
+ public void WhenRegisterClassMappingThenMapTheClass()
+ {
+ var mapper = new ModelMapper();
+ mapper.AddMapping<MyClassMap>();
+ mapper.AddMapping<InheritedMap>();
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(Inherited) });
+
+ ModelIsWellFormed(hbmMapping);
+ }
+
+ [Test]
+ public void WhenRegisterClassMappingThroughTypeThenMapTheClass()
+ {
+ var mapper = new ModelMapper();
+ mapper.AddMapping(typeof(MyClassMap));
+ mapper.AddMapping(typeof(InheritedMap));
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(Inherited) });
+
+ ModelIsWellFormed(hbmMapping);
+ }
+
+ private void ModelIsWellFormed(HbmMapping hbmMapping)
+ {
+ var hbmClass = hbmMapping.UnionSubclasses.Single();
+ hbmClass.Should().Not.Be.Null();
+ hbmClass.extends.Should().Contain("MyClass");
+ var hbmProperty = hbmClass.Properties.OfType<HbmProperty>().Single();
+ hbmProperty.name.Should().Be("SomethingElse");
+ hbmProperty.length.Should().Be("15");
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-16 18:09:08 UTC (rev 5709)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-16 18:12:44 UTC (rev 5710)
@@ -532,6 +532,7 @@
<Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\JoinedSubclassMappingRegistration.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\ModelMapperAddMappingByTypeTests.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\SubclassMappingRegistration.cs" />
+ <Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\UnionSubclassMappingRegistrationTest.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\IdBagMappingTest.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\MappingOfPrivateMembersOnRootEntity.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\NaturalIdTests.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-16 18:26:36
|
Revision: 5711
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5711&view=rev
Author: fabiomaulo
Date: 2011-04-16 18:26:30 +0000 (Sat, 16 Apr 2011)
Log Message:
-----------
Conformist component registration fix
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ComponentMappingRegistrationTest.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs 2011-04-16 18:12:44 UTC (rev 5710)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs 2011-04-16 18:26:30 UTC (rev 5711)
@@ -4,7 +4,7 @@
namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl
{
- public class ComponentCustomizer<TComponent> : PropertyContainerCustomizer<TComponent>, IComponentMapper<TComponent>
+ public class ComponentCustomizer<TComponent> : PropertyContainerCustomizer<TComponent>, IComponentMapper<TComponent>, IConformistHoldersProvider
where TComponent : class
{
public ComponentCustomizer(IModelExplicitDeclarationsHolder explicitDeclarationsHolder, ICustomizersHolder customizersHolder)
@@ -96,5 +96,19 @@
CustomizersHolder.AddCustomizer(PropertyPath, classCustomizer);
}
}
+
+ #region IConformistHoldersProvider Members
+
+ ICustomizersHolder IConformistHoldersProvider.CustomizersHolder
+ {
+ get { return CustomizersHolder; }
+ }
+
+ IModelExplicitDeclarationsHolder IConformistHoldersProvider.ExplicitDeclarationsHolder
+ {
+ get { return ExplicitDeclarationsHolder; }
+ }
+
+ #endregion
}
}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ComponentMappingRegistrationTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ComponentMappingRegistrationTest.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ComponentMappingRegistrationTest.cs 2011-04-16 18:26:30 UTC (rev 5711)
@@ -0,0 +1,80 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NHibernate.Mapping.ByCode.Conformist;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.ExpliticMappingTests.ConformistMappingRegistrationTests
+{
+ public class ComponentMappingRegistrationTest
+ {
+ public class MyClass
+ {
+ public int Id { get; set; }
+ public Name Name { get; set; }
+ }
+
+ public class Name
+ {
+ public string First { get; set; }
+ public string Last { get; set; }
+ }
+ private class MyClassMap : ClassMapping<MyClass>
+ {
+ public MyClassMap()
+ {
+ Id(x => x.Id, map =>
+ {
+ map.Column("MyClassId");
+ map.Generator(Generators.HighLow);
+ });
+ Component(x => x.Name, z => { });
+ }
+ }
+ private class NameMap : ComponentMapping<Name>
+ {
+ public NameMap()
+ {
+ Property(x => x.First, map => map.Length(20));
+ Property(x => x.Last, map => map.Length(30));
+ }
+ }
+
+ [Test]
+ public void WhenRegisterClassMappingThenMapTheClass()
+ {
+ var mapper = new ModelMapper();
+ mapper.AddMapping<MyClassMap>();
+ mapper.AddMapping<NameMap>();
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+
+ ModelIsWellFormed(hbmMapping);
+ }
+
+ [Test]
+ public void WhenRegisterClassMappingThroughTypeThenMapTheClass()
+ {
+ var mapper = new ModelMapper();
+ mapper.AddMapping(typeof(MyClassMap));
+ mapper.AddMapping(typeof(NameMap));
+ var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+
+ ModelIsWellFormed(hbmMapping);
+ }
+
+ private void ModelIsWellFormed(HbmMapping hbmMapping)
+ {
+ var hbmClass = hbmMapping.RootClasses.Single();
+ hbmClass.Properties.Should().Have.Count.EqualTo(1);
+ var hbmComponent = hbmClass.Properties.OfType<HbmComponent>().Single();
+ hbmComponent.name.Should().Be("Name");
+ hbmComponent.Properties.Should().Have.Count.EqualTo(2);
+ var hbmp1 = hbmComponent.Properties.OfType<HbmProperty>().Single(x => x.name == "First");
+ var hbmp2 = hbmComponent.Properties.OfType<HbmProperty>().Single(x => x.name == "Last");
+
+ hbmp1.length.Should().Be("20");
+ hbmp2.length.Should().Be("30");
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-16 18:12:44 UTC (rev 5710)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-16 18:26:30 UTC (rev 5711)
@@ -529,6 +529,7 @@
<Compile Include="MappingByCode\ExplicitlyDeclaredModelTests\SubclassSequenceRegistrationTests.cs" />
<Compile Include="MappingByCode\ExplicitlyDeclaredModelTests\UnionSubclassMappingStrategyTests.cs" />
<Compile Include="MappingByCode\ExplicitlyDeclaredModelTests\UnionSubclassSequenceRegistrationTests.cs" />
+ <Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\ComponentMappingRegistrationTest.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\JoinedSubclassMappingRegistration.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\ModelMapperAddMappingByTypeTests.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\ConformistMappingRegistrationTests\SubclassMappingRegistration.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-16 21:27:53
|
Revision: 5712
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5712&view=rev
Author: fabiomaulo
Date: 2011-04-16 21:27:47 +0000 (Sat, 16 Apr 2011)
Log Message:
-----------
Minor (simplified API)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ComponentMappingRegistrationTest.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs 2011-04-16 18:26:30 UTC (rev 5711)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs 2011-04-16 21:27:47 UTC (rev 5712)
@@ -27,6 +27,7 @@
void Component<TComponent>(Expression<Func<TContainer, TComponent>> property,
Action<IComponentMapper<TComponent>> mapping) where TComponent : class;
+ void Component<TComponent>(Expression<Func<TContainer, TComponent>> property) where TComponent : class;
void ManyToOne<TProperty>(Expression<Func<TContainer, TProperty>> property, Action<IManyToOneMapper> mapping) where TProperty : class;
void ManyToOne<TProperty>(Expression<Func<TContainer, TProperty>> property) where TProperty : class;
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs 2011-04-16 18:26:30 UTC (rev 5711)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs 2011-04-16 21:27:47 UTC (rev 5712)
@@ -64,6 +64,10 @@
{
RegisterComponentMapping(property, mapping);
}
+ public void Component<TComponent>(Expression<Func<TEntity, TComponent>> property) where TComponent : class
+ {
+ RegisterComponentMapping(property, x => { });
+ }
protected virtual void RegisterComponentMapping<TComponent>(Expression<Func<TEntity, TComponent>> property, Action<IComponentMapper<TComponent>> mapping)
where TComponent : class
Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ComponentMappingRegistrationTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ComponentMappingRegistrationTest.cs 2011-04-16 18:26:30 UTC (rev 5711)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ConformistMappingRegistrationTests/ComponentMappingRegistrationTest.cs 2011-04-16 21:27:47 UTC (rev 5712)
@@ -29,7 +29,7 @@
map.Column("MyClassId");
map.Generator(Generators.HighLow);
});
- Component(x => x.Name, z => { });
+ Component(x => x.Name);
}
}
private class NameMap : ComponentMapping<Name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2011-04-17 22:28:51
|
Revision: 5716
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5716&view=rev
Author: patearl
Date: 2011-04-17 22:28:45 +0000 (Sun, 17 Apr 2011)
Log Message:
-----------
Linq: Member join test improvements and a bug fix. (NH-2583 again)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/AbstractMassTestingFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/ManualTestFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingNotAndDeMorganFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOneOrTreeFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOrderByFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingSelectFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingThreeOrTreesSideBySideFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingTwoOrTreesSideBySideFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/SelfJoinTestFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs 2011-04-17 12:03:53 UTC (rev 5715)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/WhereJoinDetector.cs 2011-04-17 22:28:45 UTC (rev 5716)
@@ -320,6 +320,22 @@
}
}
+ protected override Expression VisitConstantExpression(ConstantExpression expression)
+ {
+ if (expression.Type == typeof(bool))
+ {
+ if ((bool)expression.Value)
+ {
+ _memberExpressionMapping = FixedMapping(new string[0], T);
+ }
+ else
+ {
+ _memberExpressionMapping = FixedMapping(new string[0], F);
+ }
+ }
+ return expression;
+ }
+
internal static void Find(Expression expression, NameGenerator nameGenerator, IIsEntityDecider isEntityDecider, Dictionary<string, NhJoinClause> joins, Dictionary<MemberExpression, QuerySourceReferenceExpression> expressionMap)
{
WhereJoinDetector f = new WhereJoinDetector(nameGenerator, isEntityDecider, joins, expressionMap);
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/AbstractMassTestingFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/AbstractMassTestingFixture.cs 2011-04-17 12:03:53 UTC (rev 5715)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/AbstractMassTestingFixture.cs 2011-04-17 22:28:45 UTC (rev 5716)
@@ -87,7 +87,7 @@
}
- protected void RunTest<T1, T2, T3, T4, T5, T6, T7>(Expression<Func<MyBO, bool>> condition, SetterTuple<T1, T2, T3, T4, T5, T6, T7> setters)
+ protected int RunTest<T1, T2, T3, T4, T5, T6, T7>(Expression<Func<MyBO, bool>> condition, SetterTuple<T1, T2, T3, T4, T5, T6, T7> setters)
{
if (condition == null)
{
@@ -119,7 +119,7 @@
{
using (session.BeginTransaction())
{
- TestAndAssert(condition, session, expectedIds);
+ return TestAndAssert(condition, session, expectedIds);
}
}
@@ -141,7 +141,7 @@
}
}
- protected abstract void TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds);
+ protected abstract int TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds);
protected static SetterTuple<T1, T2, T3, T4, T5, T6, T7> Setters<T1, T2, T3, T4, T5, T6, T7>(Action<MyBO, ISession, T1> set1,
Action<MyBO, ISession, T2> set2,
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/ManualTestFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/ManualTestFixture.cs 2011-04-17 12:03:53 UTC (rev 5715)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/ManualTestFixture.cs 2011-04-17 22:28:45 UTC (rev 5716)
@@ -13,7 +13,6 @@
/// This setup is used in most tests in here - but not all; and we might want to
/// twist it for special tests. Therefore, the OnSetUp mechanism is not used.
/// </summary>
- [Test]
private void StandardSetUp()
{
using (var session = OpenSession())
@@ -49,6 +48,7 @@
}
}
+ [Test]
public void OrWithTrueShouldBeEqualToTrue()
{
StandardSetUp();
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingNotAndDeMorganFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingNotAndDeMorganFixture.cs 2011-04-17 12:03:53 UTC (rev 5715)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingNotAndDeMorganFixture.cs 2011-04-17 22:28:45 UTC (rev 5716)
@@ -9,38 +9,41 @@
{
public class MassTestingNotAndDeMorganFixture : AbstractMassTestingFixture
{
- protected override void TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
+ protected override int TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
{
var result = session.Query<MyBO>().Where(condition);
AreEqual(expectedIds, result.Select(bo => bo.Id).ToArray());
+ return expectedIds.Count();
}
[Test]
- public void Test_NotUnequalIsNotTheSameAsEqual()
+ public void Test_NotUnequalIsTheSameAsEqual()
{
- RunTest(x => !(x.BO1.I1 != 1),
- Setters<TBO1_I>(MyBO.SetBO1_I1));
- // ... is the same as ...
- RunTest(x => !(x.BO1.I1 != 1),
- Setters<TBO1_I>(MyBO.SetBO1_I1));
- // ... is NOT the same as ...
- RunTest(x => x.BO1.I1 == 1,
- Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
- // The latter returns fewer results! - namely NOT the ones where BO1 is null.
+ int r1 = RunTest(x => !(x.BO1.I1 != 1),
+ Setters<TBO1_I>(MyBO.SetBO1_I1));
+ int r2 = RunTest(x => x.BO1.I1 == 1,
+ Setters<TBO1_I>(MyBO.SetBO1_I1));
+ Assert.AreEqual(r1, r2);
+ Assert.Greater(r1, 0);
+
+ r1 = RunTest(x => !(x.BO1.I1 != 1),
+ Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
+ r2 = RunTest(x => x.BO1.I1 == 1,
+ Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
+ Assert.AreEqual(r1, r2);
+ Assert.Greater(r1, 0);
}
[Test]
- public void Test_NotEqualIsNotTheSameAsNotequal()
+ public void Test_NotEqualIsTheSameAsNotequal()
{
- RunTest(x => !(x.BO1.I1 == 1),
- Setters<TBO1_I>(MyBO.SetBO1_I1));
+ int r1 = RunTest(x => !(x.BO1.I1 == 1),
+ Setters<TBO1_I>(MyBO.SetBO1_I1));
// ... is the same as ...
- RunTest(x => !(x.BO1.I1 == 1),
- Setters<TBO1_I>(MyBO.SetBO1_I1));
- // ... is NOT the same as ...
- RunTest(x => x.BO1.I1 != 1,
- Setters<TBO1_I>(MyBO.SetBO1_I1));
- // As before, the latter returns fewer results! - namely NOT the ones where BO1 is null.
+ int r2 = RunTest(x => x.BO1.I1 != 1,
+ Setters<TBO1_I>(MyBO.SetBO1_I1));
+ Assert.AreEqual(r1, r2);
+ Assert.Greater(r1, 0);
}
[Test]
@@ -64,22 +67,25 @@
[Test]
public void Test_DeMorganNotOr()
{
- RunTest(x => !(x.BO1.I1 != 1 || x.BO2.J1 != 1),
- Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
- RunTest(x => !(x.BO1.I1 != 1 || x.BO2.J1 != 1),
- Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
- RunTest(x => !(x.BO1.I1 != 1) && !(x.BO2.J1 != 1),
- Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
- // ... is NOT the same as ...
- RunTest(x => x.BO1.I1 == 1 && x.BO2.J1 == 1,
- Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
+ int r1 = RunTest(x => !(x.BO1.I1 != 1 || x.BO2.J1 != 1),
+ Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
+ int r2 = RunTest(x => !(x.BO1.I1 != 1) && !(x.BO2.J1 != 1),
+ Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
+ int r3 = RunTest(x => x.BO1.I1 == 1 && x.BO2.J1 == 1,
+ Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
+ Assert.AreEqual(r1, r2);
+ Assert.AreEqual(r2, r3);
+ Assert.Greater(r1, 0);
}
[Test]
public void Test_NotNotCanBeEliminated()
{
- RunTest(x => !(!(x.BO1.I1 != 1 && x.BO2.J1 != 1)),
- Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
+ int r1 = RunTest(x => !(!(x.BO1.I1 != 1 && x.BO2.J1 != 1)),
+ Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
+ int r2 = RunTest(x => x.BO1.I1 != 1 && x.BO2.J1 != 1,
+ Setters<TBO1_I, TBO2_J>(MyBO.SetBO1_I1, MyBO.SetBO2_J1));
+ Assert.AreEqual(r1, r2);
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOneOrTreeFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOneOrTreeFixture.cs 2011-04-17 12:03:53 UTC (rev 5715)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOneOrTreeFixture.cs 2011-04-17 22:28:45 UTC (rev 5716)
@@ -9,10 +9,11 @@
{
public class MassTestingOneOrTreeFixture : AbstractMassTestingFixture
{
- protected override void TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
+ protected override int TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
{
var result = session.Query<MyBO>().Where(condition);
AreEqual(expectedIds, result.Select(bo => bo.Id).ToArray());
+ return expectedIds.Count();
}
// Condition pattern: (A && B) && (C || D)
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOrderByFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOrderByFixture.cs 2011-04-17 12:03:53 UTC (rev 5715)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOrderByFixture.cs 2011-04-17 22:28:45 UTC (rev 5716)
@@ -9,13 +9,15 @@
{
public class MassTestingOrderByFixture : AbstractMassTestingFixture
{
- protected override void TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
+ protected override int TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
{
IQueryable<MyBO> result = session.Query<MyBO>().Where(condition).OrderByDescending(bo => bo.BO1.I1 ?? bo.BO1.Id);
var forceDBRun = result.ToList();
AreEqual(expectedIds, forceDBRun.Select(bo => bo.Id).ToArray());
+
+ return expectedIds.Count();
}
// Condition pattern: (A && B) && (C || D) ORDER BY F
@@ -66,7 +68,7 @@
Setters<TK, TK, TBO1_I, TK>(MyBO.SetK1, MyBO.SetK2, MyBO.SetBO1_I1, MyBO.SetK3));
}
- [Test, Ignore("RED!")] // TODO: Analyze and repair!
+ [Test]
public void Test_xyP_in_C_F____xy_OJ()
{
RunTest(x => (x.K1 == 1 && x.K1 == 1) && (x.BO1.Id > 0 && x.K2 == 1 || x.K3 == 1),
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingSelectFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingSelectFixture.cs 2011-04-17 12:03:53 UTC (rev 5715)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingSelectFixture.cs 2011-04-17 22:28:45 UTC (rev 5716)
@@ -9,7 +9,7 @@
{
public class MassTestingSelectFixture : AbstractMassTestingFixture
{
- protected override void TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
+ protected override int TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
{
IQueryable<int?> result = session.Query<MyBO>().Where(condition).Select(bo => (int?) bo.BO1.Id);
@@ -19,6 +19,9 @@
var expectedBO1Ids = session.Query<MyBO>().Where(bo => expectedIds.Contains(bo.Id)).Select(bo => bo.BO1 == null ? 0 : bo.BO1.Id).ToList();
AreEqual(expectedBO1Ids, resultNullTo0.ToArray());
+
+ // Unused result.
+ return -1;
}
// Condition pattern: (A && B) && (C || D) SELECT E
@@ -69,7 +72,7 @@
Setters<TK, TK, TBO1_I, TK>(MyBO.SetK1, MyBO.SetK2, MyBO.SetBO1_I1, MyBO.SetK3));
}
- [Test, Ignore("RED!")] // TODO: Analyze and repair!
+ [Test]
public void Test_xyP_in_C_E____xy_OJ()
{
RunTest(x => (x.K1 == 1 && x.K1 == 1) && (x.BO1.Id > 0 && x.K2 == 1 || x.K3 == 1),
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingThreeOrTreesSideBySideFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingThreeOrTreesSideBySideFixture.cs 2011-04-17 12:03:53 UTC (rev 5715)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingThreeOrTreesSideBySideFixture.cs 2011-04-17 22:28:45 UTC (rev 5716)
@@ -11,14 +11,17 @@
{
protected void RunTest<T1, T2, T3, T4, T5, T6, T7>(Expression<Func<MyBO, bool>> c1, Expression<Func<MyBO, bool>> c2, SetterTuple<T1, T2, T3, T4, T5, T6, T7> setters)
{
- RunTest(c1, setters);
- RunTest(c2, setters);
+ int r1 = RunTest(c1, setters);
+ int r2 = RunTest(c2, setters);
+ Assert.AreEqual(r1, r2);
+ Assert.Greater(r1, 0);
}
- protected override void TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
+ protected override int TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
{
var result = session.Query<MyBO>().Where(condition);
AreEqual(expectedIds, result.Select(bo => bo.Id).ToArray());
+ return expectedIds.Count();
}
// Condition pattern: (A || B) || (C || D), A || (B || (C || D))
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingTwoOrTreesSideBySideFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingTwoOrTreesSideBySideFixture.cs 2011-04-17 12:03:53 UTC (rev 5715)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingTwoOrTreesSideBySideFixture.cs 2011-04-17 22:28:45 UTC (rev 5716)
@@ -9,10 +9,11 @@
{
public class MassTestingTwoOrTreesSideBySideFixture : AbstractMassTestingFixture
{
- protected override void TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
+ protected override int TestAndAssert(Expression<Func<MyBO, bool>> condition, ISession session, IEnumerable<int> expectedIds)
{
var result = session.Query<MyBO>().Where(condition);
AreEqual(expectedIds, result.Select(bo => bo.Id).ToArray());
+ return expectedIds.Count();
}
// Condition pattern: (A || B) && (C || D)
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/SelfJoinTestFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/SelfJoinTestFixture.cs 2011-04-17 12:03:53 UTC (rev 5715)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2583/SelfJoinTestFixture.cs 2011-04-17 22:28:45 UTC (rev 5716)
@@ -54,7 +54,8 @@
where bo.LeftSon.LeftSon.K1 == null
|| bo.RightSon.RightSon.K1 == null
select bo).ToList().Select(bo => bo.Name);
- //Assert.That(() => result.ToList(), Is.EquivalentTo(new[] { "1", "2", "3", ...and many more... }));
+ Assert.That(!result.Contains("1"));
+ Assert.That(result.Count(), Is.EqualTo(18));
}
}
@@ -67,7 +68,8 @@
where bo.LeftSon.K1 == null
|| bo.RightSon.K1 == null
select bo).ToList().Select(bo => bo.Name);
- //Assert.That(() => result.ToList(), Is.EquivalentTo(new[] { "1", "1L", "1R", "2", "2L", "2R", "3", "3L", "4", ...and many more... }));
+ Assert.That(!result.Contains("1"));
+ Assert.That(result.Count(), Is.EqualTo(18));
}
}
@@ -78,11 +80,11 @@
using (var tx = session.BeginTransaction())
{
{
- var bLeftLeft = new MyBO { Id = 111, Name = "1LL", K2 = 1 };
+ var bLeftLeft = new MyBO { Id = 111, Name = "1LL", K2 = 1, K1 = 1 };
var bLeftRight = new MyBO { Id = 112, Name = "1LR", K2 = 1 };
- var bLeft = new MyBO { Id = 11, Name = "1L", LeftSon = bLeftLeft, RightSon = bLeftRight };
- var bRightRight = new MyBO { Id = 122, Name = "1RR", K2 = 1 };
- var bRight = new MyBO { Id = 12, Name = "1R", RightSon = bRightRight };
+ var bLeft = new MyBO { Id = 11, Name = "1L", LeftSon = bLeftLeft, RightSon = bLeftRight, K1 = 1 };
+ var bRightRight = new MyBO { Id = 122, Name = "1RR", K2 = 1, K1 = 1 };
+ var bRight = new MyBO { Id = 12, Name = "1R", RightSon = bRightRight, K1 = 1 };
var bRoot = new MyBO { Id = 1, Name = "1", LeftSon = bLeft, RightSon = bRight };
session.Save(bLeftLeft);
session.Save(bLeftRight);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-19 17:50:32
|
Revision: 5720
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5720&view=rev
Author: fabiomaulo
Date: 2011-04-19 17:50:26 +0000 (Tue, 19 Apr 2011)
Log Message:
-----------
Fixed nested components with parent
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/BagOfNestedComponentsWithParentTest.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/NestedComponetsTests.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-19 17:36:06 UTC (rev 5719)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-19 17:50:26 UTC (rev 5720)
@@ -1030,14 +1030,23 @@
{
propertiesContainer.Component(member, componentMapper =>
{
- InvokeBeforeMapComponent(memberPath, componentMapper);
+ InvokeBeforeMapComponent(memberPath, componentMapper); // <<== perhaps is better after find the parent
System.Type componentType = propertyType;
IEnumerable<MemberInfo> persistentProperties =
membersProvider.GetComponentMembers(componentType).Where(p => modelInspector.IsPersistentProperty(p));
- MemberInfo parentReferenceProperty = persistentProperties.FirstOrDefault(pp => pp.GetPropertyOrFieldType() == propertiesContainerType);
-
- customizerHolder.InvokeCustomizers(componentType, componentMapper);
+ MemberInfo parentReferenceProperty = modelInspector.IsComponent(propertiesContainerType)
+ ? persistentProperties.FirstOrDefault(pp => pp.GetPropertyOrFieldType() == propertiesContainerType)
+ : null;
+ if (parentReferenceProperty != null)
+ {
+ componentMapper.Parent(parentReferenceProperty,
+ componentParentMapper =>
+ {
+ /* TODO */
+ });
+ }
+ customizerHolder.InvokeCustomizers(componentType, componentMapper);
ForEachMemberPath(member, memberPath, pp => customizerHolder.InvokeCustomizers(pp, componentMapper));
InvokeAfterMapComponent(memberPath, componentMapper);
@@ -1225,7 +1234,10 @@
relation.Component(x =>
{
IEnumerable<MemberInfo> persistentProperties = GetPersistentProperties(componentType);
- MemberInfo parentReferenceProperty = persistentProperties.FirstOrDefault(pp => pp.GetPropertyOrFieldType() == ownerType);
+
+ MemberInfo parentReferenceProperty = domainInspector.IsComponent(ownerType)
+ ? persistentProperties.FirstOrDefault(pp => pp.GetPropertyOrFieldType() == ownerType)
+ : null;
if (parentReferenceProperty != null)
{
x.Parent(parentReferenceProperty,
@@ -1281,6 +1293,7 @@
System.Type componentPropertyType = propertyType;
IEnumerable<MemberInfo> componentProperties = GetPersistentProperties(componentPropertyType);
+
MemberInfo parentReferenceProperty = componentProperties.FirstOrDefault(pp => pp.GetPropertyOrFieldType() == componentOwnerType);
if (parentReferenceProperty != null)
{
Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/BagOfNestedComponentsWithParentTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/BagOfNestedComponentsWithParentTest.cs 2011-04-19 17:36:06 UTC (rev 5719)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/BagOfNestedComponentsWithParentTest.cs 2011-04-19 17:50:26 UTC (rev 5720)
@@ -105,10 +105,14 @@
collection.ElementRelationship.Should().Be.OfType<HbmCompositeElement>();
var elementRelation = (HbmCompositeElement)collection.ElementRelationship;
elementRelation.Class.Should().Contain("Address");
- elementRelation.Properties.Should().Have.Count.EqualTo(2);
- elementRelation.Properties.Select(p => p.Name).Should().Have.SameValuesAs("Street", "Number");
- elementRelation.Parent.Should().Not.Be.Null();
- elementRelation.Parent.name.Should().Be.EqualTo("Owner");
+
+ // This test was modified because when the "owner" is an entity it can be mapped as many-to-one or as parent and without an explicit
+ // definition of the property representing the bidiretional-relation we can't know is the mapping element (many-to-one or parent)
+ elementRelation.Properties.Should().Have.Count.EqualTo(3);
+ elementRelation.Properties.Select(p => p.Name).Should().Have.SameValuesAs("Street", "Number", "Owner");
+ //elementRelation.Parent.Should().Not.Be.Null();
+ //elementRelation.Parent.name.Should().Be.EqualTo("Owner");
+
// Nested
var propertyNestedRelation = elementRelation.Properties.FirstOrDefault(p => p.Name == "Number");
propertyNestedRelation.Should().Not.Be.Null().And.Be.OfType<HbmNestedCompositeElement>();
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/NestedComponetsTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/NestedComponetsTests.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ExpliticMappingTests/NestedComponetsTests.cs 2011-04-19 17:50:26 UTC (rev 5720)
@@ -0,0 +1,155 @@
+using System.Collections.Generic;
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.ExpliticMappingTests
+{
+ public class NestedComponetsTests
+ {
+ private class MyClass
+ {
+ public int Id { get; set; }
+ public MyCompo Compo { get; set; }
+ public IEnumerable<MyCompo> Compos { get; set; }
+ }
+
+ private class MyCompo
+ {
+ public MyClass AManyToOne { get; set; }
+ public MyNestedCompo NestedCompo { get; set; }
+ }
+
+ private class MyNestedCompo
+ {
+ public MyCompo Owner { get; set; }
+ public string Something { get; set; }
+ }
+
+ private HbmMapping GetMappingWithManyToOneInCompo()
+ {
+ var mapper = new ModelMapper();
+ mapper.Class<MyClass>(x =>
+ {
+ x.Id(c => c.Id);
+ x.Component(c => c.Compo);
+ x.Bag(c => c.Compos, cm => { });
+ });
+ mapper.Component<MyCompo>(x =>
+ {
+ x.ManyToOne(c => c.AManyToOne);
+ x.Component(c => c.NestedCompo);
+ });
+ mapper.Component<MyNestedCompo>(x =>
+ {
+ x.Component(c => c.Owner);
+ x.Property(c => c.Something);
+ });
+ return mapper.CompileMappingForAllExplicitAddedEntities();
+ }
+
+ private HbmMapping GetMappingWithParentInCompo()
+ {
+ var mapper = new ModelMapper();
+ mapper.Class<MyClass>(x =>
+ {
+ x.Id(c => c.Id);
+ x.Component(c => c.Compo);
+ x.Bag(c => c.Compos, cm => { });
+ });
+ mapper.Component<MyCompo>(x =>
+ {
+ x.Parent(c => c.AManyToOne);
+ x.Component(c => c.NestedCompo);
+ });
+ mapper.Component<MyNestedCompo>(x =>
+ {
+ x.Component(c => c.Owner);
+ x.Property(c => c.Something);
+ });
+ return mapper.CompileMappingForAllExplicitAddedEntities();
+ }
+
+ [Test]
+ public void WhenMapComoponetWithNestBidirectionalComponentThenMapParent()
+ {
+ HbmMapping mapping = GetMappingWithManyToOneInCompo();
+
+ var hbmClass = mapping.RootClasses[0];
+ var hbmMyCompo = hbmClass.Properties.OfType<HbmComponent>().Single();
+ var hbmMyNestedCompo = hbmMyCompo.Properties.OfType<HbmComponent>().Single();
+
+ hbmMyNestedCompo.Properties.Should().Have.Count.EqualTo(1);
+ hbmMyNestedCompo.Parent.Should().Not.Be.Null();
+ hbmMyNestedCompo.Parent.name.Should().Be("Owner");
+ }
+
+ [Test]
+ public void WhenCollectionOfComoponetsWithNestBidirectionalComponentThenMapParent()
+ {
+ HbmMapping mapping = GetMappingWithManyToOneInCompo();
+
+ var hbmClass = mapping.RootClasses[0];
+ var hbmBag = hbmClass.Properties.OfType<HbmBag>().Single();
+
+ var hbmMyCompo = (HbmCompositeElement)hbmBag.ElementRelationship;
+ var hbmMyNestedCompo = hbmMyCompo.Properties.OfType<HbmNestedCompositeElement>().Single();
+
+ hbmMyNestedCompo.Properties.Should().Have.Count.EqualTo(1);
+ hbmMyNestedCompo.Parent.Should().Not.Be.Null();
+ hbmMyNestedCompo.Parent.name.Should().Be("Owner");
+ }
+
+ [Test]
+ public void WhenMapComoponetWithManyToOneThenMapManyToOne()
+ {
+ HbmMapping mapping = GetMappingWithManyToOneInCompo();
+
+ var hbmClass = mapping.RootClasses[0];
+ var hbmMyCompo = hbmClass.Properties.OfType<HbmComponent>().Single();
+ hbmMyCompo.Properties.OfType<HbmManyToOne>().Should().Have.Count.EqualTo(1);
+ hbmMyCompo.Parent.Should().Be.Null();
+ }
+
+ [Test]
+ public void WhenCollectionOfComoponetsWithManyToOneThenMapManyToOne()
+ {
+ HbmMapping mapping = GetMappingWithManyToOneInCompo();
+
+ var hbmClass = mapping.RootClasses[0];
+ var hbmBag = hbmClass.Properties.OfType<HbmBag>().Single();
+
+ var hbmMyCompo = (HbmCompositeElement)hbmBag.ElementRelationship;
+ hbmMyCompo.Properties.OfType<HbmManyToOne>().Should().Have.Count.EqualTo(1);
+ hbmMyCompo.Parent.Should().Be.Null();
+ }
+
+ [Test]
+ public void WhenMapComoponetWithParentThenMapParent()
+ {
+ HbmMapping mapping = GetMappingWithParentInCompo();
+
+ var hbmClass = mapping.RootClasses[0];
+ var hbmMyCompo = hbmClass.Properties.OfType<HbmComponent>().Single();
+ hbmMyCompo.Properties.OfType<HbmManyToOne>().Should().Be.Empty();
+ hbmMyCompo.Parent.Should().Not.Be.Null();
+ hbmMyCompo.Parent.name.Should().Be("AManyToOne");
+ }
+
+ [Test]
+ public void WhenCollectionOfComoponetsWithParentThenMapParent()
+ {
+ HbmMapping mapping = GetMappingWithParentInCompo();
+
+ var hbmClass = mapping.RootClasses[0];
+ var hbmBag = hbmClass.Properties.OfType<HbmBag>().Single();
+
+ var hbmMyCompo = (HbmCompositeElement)hbmBag.ElementRelationship;
+ hbmMyCompo.Properties.OfType<HbmManyToOne>().Should().Be.Empty();
+ hbmMyCompo.Parent.Should().Not.Be.Null();
+ hbmMyCompo.Parent.name.Should().Be("AManyToOne");
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-19 17:36:06 UTC (rev 5719)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-19 17:50:26 UTC (rev 5720)
@@ -537,6 +537,7 @@
<Compile Include="MappingByCode\ExpliticMappingTests\IdBagMappingTest.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\MappingOfPrivateMembersOnRootEntity.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\NaturalIdTests.cs" />
+ <Compile Include="MappingByCode\ExpliticMappingTests\NestedComponetsTests.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\PoidTests.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\RootClassPropertiesSplitsTests.cs" />
<Compile Include="MappingByCode\ExpliticMappingTests\SubclassPropertiesSplitsTests.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-19 18:56:15
|
Revision: 5722
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5722&view=rev
Author: fabiomaulo
Date: 2011-04-19 18:56:09 +0000 (Tue, 19 Apr 2011)
Log Message:
-----------
Apply accessor on component-parent
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/ComponetsParentAccessorTests.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs 2011-04-19 18:04:58 UTC (rev 5721)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs 2011-04-19 18:56:09 UTC (rev 5722)
@@ -22,6 +22,9 @@
BeforeMapProperty += MemberNoSetterToField;
BeforeMapProperty += MemberReadOnlyAccessor;
+ BeforeMapComponent += ComponentParentToFieldAccessor;
+ BeforeMapComponent += ComponentParentNoSetterToField;
+
BeforeMapBag += MemberToFieldAccessor;
BeforeMapSet += MemberToFieldAccessor;
BeforeMapMap += MemberToFieldAccessor;
@@ -46,6 +49,32 @@
BeforeMapAny += MemberReadOnlyAccessor;
}
+ protected virtual void ComponentParentToFieldAccessor(IModelInspector modelinspector, PropertyPath member, IComponentAttributesMapper componentMapper)
+ {
+ System.Type componentType = member.LocalMember.GetPropertyOrFieldType();
+ IEnumerable<MemberInfo> persistentProperties =
+ MembersProvider.GetComponentMembers(componentType).Where(p => ModelInspector.IsPersistentProperty(p));
+
+ MemberInfo parentReferenceProperty = GetComponentParentReferenceProperty(persistentProperties, member.LocalMember.ReflectedType);
+ if (parentReferenceProperty != null && MatchPropertyToField(parentReferenceProperty))
+ {
+ componentMapper.Parent(parentReferenceProperty, cp=> cp.Access(Accessor.Field));
+ }
+ }
+
+ protected virtual void ComponentParentNoSetterToField(IModelInspector modelinspector, PropertyPath member, IComponentAttributesMapper componentMapper)
+ {
+ System.Type componentType = member.LocalMember.GetPropertyOrFieldType();
+ IEnumerable<MemberInfo> persistentProperties =
+ MembersProvider.GetComponentMembers(componentType).Where(p => ModelInspector.IsPersistentProperty(p));
+
+ MemberInfo parentReferenceProperty = GetComponentParentReferenceProperty(persistentProperties, member.LocalMember.ReflectedType);
+ if (parentReferenceProperty != null && MatchNoSetterProperty(parentReferenceProperty))
+ {
+ componentMapper.Parent(parentReferenceProperty, cp => cp.Access(Accessor.NoSetter));
+ }
+ }
+
protected virtual void MemberReadOnlyAccessor(IModelInspector modelInspector, PropertyPath member, IAccessorPropertyMapper propertyCustomizer)
{
if (MatchReadOnlyProperty(member.LocalMember))
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-19 18:04:58 UTC (rev 5721)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-19 18:56:09 UTC (rev 5722)
@@ -1038,11 +1038,7 @@
MemberInfo parentReferenceProperty = GetComponentParentReferenceProperty(persistentProperties, propertiesContainerType);
if (parentReferenceProperty != null)
{
- componentMapper.Parent(parentReferenceProperty,
- componentParentMapper =>
- {
- /* TODO */
- });
+ componentMapper.Parent(parentReferenceProperty);
}
customizerHolder.InvokeCustomizers(componentType, componentMapper);
ForEachMemberPath(member, memberPath, pp => customizerHolder.InvokeCustomizers(pp, componentMapper));
@@ -1243,12 +1239,7 @@
MemberInfo parentReferenceProperty = modelMapper.GetComponentParentReferenceProperty(persistentProperties, ownerType);
if (parentReferenceProperty != null)
{
- x.Parent(parentReferenceProperty,
- componentParentMapper =>
- {
- /* TODO */
- }
- );
+ x.Parent(parentReferenceProperty);
}
customizersHolder.InvokeCustomizers(componentType, x);
@@ -1300,10 +1291,7 @@
MemberInfo parentReferenceProperty = modelMapper.GetComponentParentReferenceProperty(componentProperties, componentOwnerType);
if (parentReferenceProperty != null)
{
- x.Parent(parentReferenceProperty, componentParentMapper =>
- {
- /* TODO */
- });
+ x.Parent(parentReferenceProperty);
}
customizersHolder.InvokeCustomizers(componentPropertyType, x);
modelMapper.ForEachMemberPath(member, propertyPath, pp => customizersHolder.InvokeCustomizers(pp, x));
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/ComponetsParentAccessorTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/ComponetsParentAccessorTests.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/ComponetsParentAccessorTests.cs 2011-04-19 18:56:09 UTC (rev 5722)
@@ -0,0 +1,111 @@
+using System.Collections.Generic;
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.ConventionModelMapperTests
+{
+ public class ComponetsParentAccessorTests
+ {
+ private class MyClass
+ {
+ public int Id { get; set; }
+ public MyCompo Compo { get; set; }
+ public IEnumerable<MyCompo> Compos { get; set; }
+ }
+
+ private class MyCompo
+ {
+ private MyClass parent;
+ public MyClass Parent
+ {
+ get { return parent; }
+ }
+
+ public MyNestedCompo NestedCompo { get; set; }
+ }
+
+ private class MyNestedCompo
+ {
+ private MyCompo owner;
+ public MyCompo Owner
+ {
+ get { return owner; }
+ }
+
+ public string Something { get; set; }
+ }
+
+ private HbmMapping GetMappingWithParentInCompo()
+ {
+ var mapper = new ConventionModelMapper();
+ mapper.Class<MyClass>(x =>
+ {
+ x.Id(c => c.Id);
+ x.Component(c => c.Compo);
+ x.Bag(c => c.Compos, cm => { });
+ });
+ mapper.Component<MyCompo>(x =>
+ {
+ x.Parent(c => c.Parent);
+ x.Component(c => c.NestedCompo);
+ });
+ mapper.Component<MyNestedCompo>(x =>
+ {
+ x.Component(c => c.Owner);
+ x.Property(c => c.Something);
+ });
+ return mapper.CompileMappingForAllExplicitAddedEntities();
+ }
+
+ [Test]
+ public void WhenMapComoponetWithNestBidirectionalComponentThenMapParentAccessor()
+ {
+ HbmMapping mapping = GetMappingWithParentInCompo();
+
+ var hbmClass = mapping.RootClasses[0];
+ var hbmMyCompo = hbmClass.Properties.OfType<HbmComponent>().Single();
+ var hbmMyNestedCompo = hbmMyCompo.Properties.OfType<HbmComponent>().Single();
+
+ hbmMyNestedCompo.Parent.access.Should().Contain("camelcase");
+ }
+
+ [Test]
+ public void WhenCollectionOfComoponetsWithNestBidirectionalComponentThenMapParentAccessor()
+ {
+ HbmMapping mapping = GetMappingWithParentInCompo();
+
+ var hbmClass = mapping.RootClasses[0];
+ var hbmBag = hbmClass.Properties.OfType<HbmBag>().Single();
+
+ var hbmMyCompo = (HbmCompositeElement)hbmBag.ElementRelationship;
+ var hbmMyNestedCompo = hbmMyCompo.Properties.OfType<HbmNestedCompositeElement>().Single();
+
+ hbmMyNestedCompo.Parent.access.Should().Contain("camelcase");
+ }
+
+ [Test, Ignore("No fixed yet. When the parent is an entity it should be managed explicitly as explicitly is managed the relation (Parent instead many-to-one)")]
+ public void WhenMapComoponetWithParentThenMapParentAccessor()
+ {
+ HbmMapping mapping = GetMappingWithParentInCompo();
+
+ var hbmClass = mapping.RootClasses[0];
+ var hbmMyCompo = hbmClass.Properties.OfType<HbmComponent>().Single();
+ hbmMyCompo.Parent.access.Should().Contain("camelcase");
+ }
+
+ [Test, Ignore("No fixed yet. When the parent is an entity it should be managed explicitly as explicitly is managed the relation (Parent instead many-to-one)")]
+ public void WhenCollectionOfComoponetsWithParentThenMapParentAccessor()
+ {
+ HbmMapping mapping = GetMappingWithParentInCompo();
+
+ var hbmClass = mapping.RootClasses[0];
+ var hbmBag = hbmClass.Properties.OfType<HbmBag>().Single();
+
+ var hbmMyCompo = (HbmCompositeElement)hbmBag.ElementRelationship;
+ hbmMyCompo.Parent.access.Should().Contain("camelcase");
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-19 18:04:58 UTC (rev 5721)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-19 18:56:09 UTC (rev 5722)
@@ -511,6 +511,7 @@
<Compile Include="Linq\ByMethod\SumTests.cs" />
<Compile Include="Logging\Log4NetLoggerTest.cs" />
<Compile Include="Logging\LoggerProviderTest.cs" />
+ <Compile Include="MappingByCode\ConventionModelMapperTests\ComponetsParentAccessorTests.cs" />
<Compile Include="MappingByCode\ConventionModelMapperTests\PropertyToFieldAccessorTest.cs" />
<Compile Include="MappingByCode\ConventionModelMapperTests\SafePoidTests.cs" />
<Compile Include="MappingByCode\ConventionModelMapperTests\VersionOnBaseClassIntegrationTest.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-20 12:12:29
|
Revision: 5723
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5723&view=rev
Author: fabiomaulo
Date: 2011-04-20 12:12:23 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
Apply accessor on component property
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/ComponetsAccessorTests.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs 2011-04-19 18:56:09 UTC (rev 5722)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs 2011-04-20 12:12:23 UTC (rev 5723)
@@ -22,6 +22,9 @@
BeforeMapProperty += MemberNoSetterToField;
BeforeMapProperty += MemberReadOnlyAccessor;
+ BeforeMapComponent += MemberToFieldAccessor;
+ BeforeMapComponent += MemberNoSetterToField;
+ BeforeMapComponent += MemberReadOnlyAccessor;
BeforeMapComponent += ComponentParentToFieldAccessor;
BeforeMapComponent += ComponentParentNoSetterToField;
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/ComponetsAccessorTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/ComponetsAccessorTests.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/ComponetsAccessorTests.cs 2011-04-20 12:12:23 UTC (rev 5723)
@@ -0,0 +1,51 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.ConventionModelMapperTests
+{
+ public class ComponetsAccessorTests
+ {
+ private class MyClass
+ {
+ public int Id { get; set; }
+ private MyCompo compo;
+ public MyCompo Compo
+ {
+ get { return compo; }
+ }
+ }
+
+ private class MyCompo
+ {
+ public string Something { get; set; }
+ }
+ private HbmMapping GetMappingWithParentInCompo()
+ {
+ var mapper = new ConventionModelMapper();
+ mapper.Class<MyClass>(x =>
+ {
+ x.Id(c => c.Id);
+ x.Component(c => c.Compo);
+ });
+ mapper.Component<MyCompo>(x =>
+ {
+ x.Property(c => c.Something);
+ });
+ return mapper.CompileMappingForAllExplicitAddedEntities();
+ }
+
+ [Test]
+ public void WhenMapComoponetWithNestBidirectionalComponentThenMapParentAccessor()
+ {
+ HbmMapping mapping = GetMappingWithParentInCompo();
+
+ var hbmClass = mapping.RootClasses[0];
+ var hbmMyCompo = hbmClass.Properties.OfType<HbmComponent>().Single();
+
+ hbmMyCompo.Access.Should().Contain("camelcase");
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-19 18:56:09 UTC (rev 5722)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-20 12:12:23 UTC (rev 5723)
@@ -511,6 +511,7 @@
<Compile Include="Linq\ByMethod\SumTests.cs" />
<Compile Include="Logging\Log4NetLoggerTest.cs" />
<Compile Include="Logging\LoggerProviderTest.cs" />
+ <Compile Include="MappingByCode\ConventionModelMapperTests\ComponetsAccessorTests.cs" />
<Compile Include="MappingByCode\ConventionModelMapperTests\ComponetsParentAccessorTests.cs" />
<Compile Include="MappingByCode\ConventionModelMapperTests\PropertyToFieldAccessorTest.cs" />
<Compile Include="MappingByCode\ConventionModelMapperTests\SafePoidTests.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-20 16:17:32
|
Revision: 5724
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5724&view=rev
Author: fabiomaulo
Date: 2011-04-20 16:17:26 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
API to map dynamic-component (only API not implemented)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AbstractBasePropertyContainerMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IDynamicComponentAttributesMapper.cs
Added: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IDynamicComponentAttributesMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IDynamicComponentAttributesMapper.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IDynamicComponentAttributesMapper.cs 2011-04-20 16:17:26 UTC (rev 5724)
@@ -0,0 +1,19 @@
+namespace NHibernate.Mapping.ByCode
+{
+ public interface IDynamicComponentAttributesMapper : IEntityPropertyMapper
+ {
+ void Update(bool consideredInUpdateQuery);
+ void Insert(bool consideredInInsertQuery);
+ }
+
+ public interface IDynamicComponentMapper : IDynamicComponentAttributesMapper, IPropertyContainerMapper { }
+
+ public interface IDynamicComponentAttributesMapper<TComponent> : IEntityPropertyMapper
+ {
+ void Update(bool consideredInUpdateQuery);
+ void Insert(bool consideredInInsertQuery);
+ }
+
+ public interface IDynamicComponentMapper<TComponent> : IDynamicComponentAttributesMapper<TComponent>, IPropertyContainerMapper<TComponent> where TComponent : class { }
+
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs 2011-04-20 12:12:23 UTC (rev 5723)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs 2011-04-20 16:17:26 UTC (rev 5724)
@@ -1,4 +1,5 @@
using System;
+using System.Collections;
using System.Linq.Expressions;
using System.Reflection;
@@ -9,6 +10,7 @@
void Property(MemberInfo property, Action<IPropertyMapper> mapping);
void Component(MemberInfo property, Action<IComponentMapper> mapping);
+ void Component(MemberInfo property, Action<IDynamicComponentMapper> mapping);
void ManyToOne(MemberInfo property, Action<IManyToOneMapper> mapping);
void Any(MemberInfo property, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping);
@@ -29,6 +31,10 @@
Action<IComponentMapper<TComponent>> mapping) where TComponent : class;
void Component<TComponent>(Expression<Func<TContainer, TComponent>> property) where TComponent : class;
+ void Component<TComponent>(Expression<Func<TContainer, IDictionary>> property,
+ TComponent dynamicComponentTemplate,
+ Action<IDynamicComponentMapper<TComponent>> mapping) where TComponent : class;
+
void ManyToOne<TProperty>(Expression<Func<TContainer, TProperty>> property, Action<IManyToOneMapper> mapping) where TProperty : class;
void ManyToOne<TProperty>(Expression<Func<TContainer, TProperty>> property) where TProperty : class;
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AbstractBasePropertyContainerMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AbstractBasePropertyContainerMapper.cs 2011-04-20 12:12:23 UTC (rev 5723)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AbstractBasePropertyContainerMapper.cs 2011-04-20 16:17:26 UTC (rev 5724)
@@ -53,6 +53,11 @@
AddProperty(hbm);
}
+ public virtual void Component(MemberInfo property, Action<IDynamicComponentMapper> mapping)
+ {
+ throw new NotImplementedException();
+ }
+
public virtual void ManyToOne(MemberInfo property, Action<IManyToOneMapper> mapping)
{
var hbm = new HbmManyToOne {name = property.Name};
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs 2011-04-20 12:12:23 UTC (rev 5723)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs 2011-04-20 16:17:26 UTC (rev 5724)
@@ -1,4 +1,5 @@
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Reflection;
@@ -78,6 +79,13 @@
mapping(new ComponentCustomizer<TComponent>(explicitDeclarationsHolder, CustomizersHolder, new PropertyPath(PropertyPath, memberOf)));
}
+ public void Component<TComponent>(Expression<Func<TEntity, IDictionary>> property,
+ TComponent dynamicComponentTemplate,
+ Action<IDynamicComponentMapper<TComponent>> mapping) where TComponent : class
+ {
+ throw new NotImplementedException();
+ }
+
public void ManyToOne<TProperty>(Expression<Func<TEntity, TProperty>> property, Action<IManyToOneMapper> mapping)
where TProperty : class
{
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-20 12:12:23 UTC (rev 5723)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-20 16:17:26 UTC (rev 5724)
@@ -294,6 +294,7 @@
<Compile Include="Mapping\ByCode\Conformist\JoinedSubclassMapping.cs" />
<Compile Include="Mapping\ByCode\Conformist\SubclassMapping.cs" />
<Compile Include="Mapping\ByCode\Conformist\UnionSubclassMapping.cs" />
+ <Compile Include="Mapping\ByCode\IDynamicComponentAttributesMapper.cs" />
<Compile Include="Mapping\ByCode\PropertyToField.cs" />
<Compile Include="Mapping\ByCode\SimpleModelInspector.cs" />
<Compile Include="Mapping\ByCode\ExplicitlyDeclaredModel.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-20 19:28:36
|
Revision: 5725
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5725&view=rev
Author: fabiomaulo
Date: 2011-04-20 19:28:30 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
Starting DynamicComponentMapper
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/
trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs
Added: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs 2011-04-20 19:28:30 UTC (rev 5725)
@@ -0,0 +1,103 @@
+using System;
+using System.Reflection;
+using NHibernate.Cfg.MappingSchema;
+
+namespace NHibernate.Mapping.ByCode.Impl
+{
+ public class DynamicComponentMapper : IDynamicComponentMapper
+ {
+ private readonly HbmDynamicComponent component;
+ private readonly IAccessorPropertyMapper accessorPropertyMapper;
+
+ public DynamicComponentMapper(HbmDynamicComponent component, MemberInfo declaringTypeMember, HbmMapping mapDoc)
+ {
+ this.component = component;
+ accessorPropertyMapper = new AccessorPropertyMapper(declaringTypeMember.DeclaringType, declaringTypeMember.Name, x => component.access = x);
+ }
+
+ protected void AddProperty(object property)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void Access(Accessor accessor)
+ {
+ accessorPropertyMapper.Access(accessor);
+ }
+
+ public void Access(System.Type accessorType)
+ {
+ accessorPropertyMapper.Access(accessorType);
+ }
+
+ public void OptimisticLock(bool takeInConsiderationForOptimisticLock)
+ {
+ component.optimisticlock = takeInConsiderationForOptimisticLock;
+ }
+
+ public void Update(bool consideredInUpdateQuery)
+ {
+ component.update = consideredInUpdateQuery;
+ }
+
+ public void Insert(bool consideredInInsertQuery)
+ {
+ component.insert = consideredInInsertQuery;
+ }
+
+ public void Set(MemberInfo property, Action<ISetPropertiesMapper> collectionMapping, Action<ICollectionElementRelation> mapping)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void Bag(MemberInfo property, Action<IBagPropertiesMapper> collectionMapping, Action<ICollectionElementRelation> mapping)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void List(MemberInfo property, Action<IListPropertiesMapper> collectionMapping, Action<ICollectionElementRelation> mapping)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void Map(MemberInfo property, Action<IMapPropertiesMapper> collectionMapping, Action<IMapKeyRelation> keyMapping, Action<ICollectionElementRelation> mapping)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void IdBag(MemberInfo property, Action<IIdBagPropertiesMapper> collectionMapping, Action<ICollectionElementRelation> mapping)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void Property(MemberInfo property, Action<IPropertyMapper> mapping)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void Component(MemberInfo property, Action<IComponentMapper> mapping)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void Component(MemberInfo property, Action<IDynamicComponentMapper> mapping)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void ManyToOne(MemberInfo property, Action<IManyToOneMapper> mapping)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void Any(MemberInfo property, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void OneToOne(MemberInfo property, Action<IOneToOneMapper> mapping)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-20 16:17:26 UTC (rev 5724)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-20 19:28:30 UTC (rev 5725)
@@ -295,6 +295,7 @@
<Compile Include="Mapping\ByCode\Conformist\SubclassMapping.cs" />
<Compile Include="Mapping\ByCode\Conformist\UnionSubclassMapping.cs" />
<Compile Include="Mapping\ByCode\IDynamicComponentAttributesMapper.cs" />
+ <Compile Include="Mapping\ByCode\Impl\DynamicComponentMapper.cs" />
<Compile Include="Mapping\ByCode\PropertyToField.cs" />
<Compile Include="Mapping\ByCode\SimpleModelInspector.cs" />
<Compile Include="Mapping\ByCode\ExplicitlyDeclaredModel.cs" />
Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs 2011-04-20 19:28:30 UTC (rev 5725)
@@ -0,0 +1,66 @@
+using System.Collections;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NHibernate.Mapping.ByCode.Impl;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.MappersTests.DynamicComponentMapperTests
+{
+ public class DynCompAttributesSettingTest
+ {
+ private class Person
+ {
+ public int Id { get; set; }
+ private IDictionary info;
+ public IDictionary Info
+ {
+ get { return info; }
+ }
+ }
+
+ [Test]
+ public void CanSetAccessor()
+ {
+ var mapdoc = new HbmMapping();
+ var component = new HbmDynamicComponent();
+ var mapper = new DynamicComponentMapper(component, For<Person>.Property(p => p.Info), mapdoc);
+
+ mapper.Access(Accessor.Field);
+ component.access.Should().Be("field.camelcase");
+ }
+
+ [Test]
+ public void CanSetUpdate()
+ {
+ var mapdoc = new HbmMapping();
+ var component = new HbmDynamicComponent();
+ var mapper = new DynamicComponentMapper(component, For<Person>.Property(p => p.Info), mapdoc);
+
+ mapper.Update(false);
+ component.update.Should().Be.False();
+ }
+
+ [Test]
+ public void CanSetInsert()
+ {
+ var mapdoc = new HbmMapping();
+ var component = new HbmDynamicComponent();
+ var mapper = new DynamicComponentMapper(component, For<Person>.Property(p => p.Info), mapdoc);
+
+ mapper.Insert(false);
+ component.insert.Should().Be.False();
+ }
+
+ [Test]
+ public void CanSetOptimisticLock()
+ {
+ var mapdoc = new HbmMapping();
+ var component = new HbmDynamicComponent();
+ var mapper = new DynamicComponentMapper(component, For<Person>.Property(p => p.Info), mapdoc);
+
+ mapper.OptimisticLock(false);
+ component.OptimisticLock.Should().Be.False();
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-20 16:17:26 UTC (rev 5724)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-20 19:28:30 UTC (rev 5725)
@@ -550,6 +550,7 @@
<Compile Include="MappingByCode\MappersTests\ClassMapperTests\SetPersisterTests.cs" />
<Compile Include="MappingByCode\MappersTests\ClassMapperTests\TablesSincronizationTests.cs" />
<Compile Include="MappingByCode\MappersTests\CollectionIdMapperTests.cs" />
+ <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\DynCompAttributesSettingTest.cs" />
<Compile Include="MappingByCode\MappersTests\FakeUserCollectionType.cs" />
<Compile Include="MappingByCode\MappersTests\IdBagMapperTest.cs" />
<Compile Include="MappingByCode\MappersTests\JoinedSubclassMapperTests\SetPersisterTests.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-20 20:31:28
|
Revision: 5726
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5726&view=rev
Author: fabiomaulo
Date: 2011-04-20 20:31:21 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
Add property to dyn-comp
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs 2011-04-20 19:28:30 UTC (rev 5725)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs 2011-04-20 20:31:21 UTC (rev 5726)
@@ -1,4 +1,5 @@
using System;
+using System.Linq;
using System.Reflection;
using NHibernate.Cfg.MappingSchema;
@@ -7,17 +8,24 @@
public class DynamicComponentMapper : IDynamicComponentMapper
{
private readonly HbmDynamicComponent component;
+ private readonly HbmMapping mapDoc;
private readonly IAccessorPropertyMapper accessorPropertyMapper;
public DynamicComponentMapper(HbmDynamicComponent component, MemberInfo declaringTypeMember, HbmMapping mapDoc)
{
this.component = component;
+ this.mapDoc = mapDoc;
accessorPropertyMapper = new AccessorPropertyMapper(declaringTypeMember.DeclaringType, declaringTypeMember.Name, x => component.access = x);
}
- protected void AddProperty(object property)
+ private void AddProperty(object property)
{
- throw new NotImplementedException();
+ if (property == null)
+ {
+ throw new ArgumentNullException("property");
+ }
+ var toAdd = new[] { property };
+ component.Items = component.Items == null ? toAdd : component.Items.Concat(toAdd).ToArray();
}
public void Access(Accessor accessor)
@@ -72,7 +80,9 @@
public void Property(MemberInfo property, Action<IPropertyMapper> mapping)
{
- throw new NotImplementedException();
+ var hbmProperty = new HbmProperty { name = property.Name };
+ mapping(new PropertyMapper(property, hbmProperty));
+ AddProperty(hbmProperty);
}
public void Component(MemberInfo property, Action<IComponentMapper> mapping)
Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs 2011-04-20 19:28:30 UTC (rev 5725)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs 2011-04-20 20:31:21 UTC (rev 5726)
@@ -1,4 +1,5 @@
using System.Collections;
+using System.Linq;
using NHibernate.Cfg.MappingSchema;
using NHibernate.Mapping.ByCode;
using NHibernate.Mapping.ByCode.Impl;
@@ -62,5 +63,18 @@
mapper.OptimisticLock(false);
component.OptimisticLock.Should().Be.False();
}
+
+ [Test]
+ public void CanAddSimpleProperty()
+ {
+ var mapdoc = new HbmMapping();
+ var component = new HbmDynamicComponent();
+ var mapper = new DynamicComponentMapper(component, For<Person>.Property(p => p.Info), mapdoc);
+ var dynObject = new { Pizza = 5 };
+ mapper.Property(dynObject.GetType().GetProperty("Pizza"), x => { });
+
+ component.Properties.Single().Should().Be.OfType<HbmProperty>().And.ValueOf.Name.Should().Be.EqualTo("Pizza");
+ }
+
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-20 21:27:39
|
Revision: 5728
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5728&view=rev
Author: fabiomaulo
Date: 2011-04-20 21:27:33 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
Refactoring (+ fix wrong test)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AbstractBasePropertyContainerMapper.cs
trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/AbstractPropertyContainerMapperTest.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AbstractBasePropertyContainerMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AbstractBasePropertyContainerMapper.cs 2011-04-20 20:50:46 UTC (rev 5727)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AbstractBasePropertyContainerMapper.cs 2011-04-20 21:27:33 UTC (rev 5728)
@@ -37,7 +37,7 @@
public virtual void Property(MemberInfo property, Action<IPropertyMapper> mapping)
{
- if (!property.DeclaringType.IsAssignableFrom(container))
+ if (!IsMemberSupportedByMappedContainer(property))
{
throw new ArgumentOutOfRangeException("property", "Can't add a property of another graph");
}
@@ -46,28 +46,49 @@
AddProperty(hbmProperty);
}
+ protected virtual bool IsMemberSupportedByMappedContainer(MemberInfo property)
+ {
+ return property.DeclaringType.IsAssignableFrom(container);
+ }
+
public virtual void Component(MemberInfo property, Action<IComponentMapper> mapping)
{
- var hbm = new HbmComponent {name = property.Name};
+ if (!IsMemberSupportedByMappedContainer(property))
+ {
+ throw new ArgumentOutOfRangeException("property", "Can't add a property of another graph");
+ }
+ var hbm = new HbmComponent { name = property.Name };
mapping(new ComponentMapper(hbm, property.GetPropertyOrFieldType(), property, MapDoc));
AddProperty(hbm);
}
public virtual void Component(MemberInfo property, Action<IDynamicComponentMapper> mapping)
{
+ if (!IsMemberSupportedByMappedContainer(property))
+ {
+ throw new ArgumentOutOfRangeException("property", "Can't add a property of another graph");
+ }
throw new NotImplementedException();
}
public virtual void ManyToOne(MemberInfo property, Action<IManyToOneMapper> mapping)
{
- var hbm = new HbmManyToOne {name = property.Name};
+ if (!IsMemberSupportedByMappedContainer(property))
+ {
+ throw new ArgumentOutOfRangeException("property", "Can't add a property of another graph");
+ }
+ var hbm = new HbmManyToOne { name = property.Name };
mapping(new ManyToOneMapper(property, hbm, MapDoc));
AddProperty(hbm);
}
public void Any(MemberInfo property, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping)
{
- var hbm = new HbmAny {name = property.Name};
+ if (!IsMemberSupportedByMappedContainer(property))
+ {
+ throw new ArgumentOutOfRangeException("property", "Can't add a property of another graph");
+ }
+ var hbm = new HbmAny { name = property.Name };
mapping(new AnyMapper(property, idTypeOfMetaType, hbm, MapDoc));
AddProperty(hbm);
}
Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/AbstractPropertyContainerMapperTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/AbstractPropertyContainerMapperTest.cs 2011-04-20 20:50:46 UTC (rev 5727)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/AbstractPropertyContainerMapperTest.cs 2011-04-20 21:27:33 UTC (rev 5728)
@@ -88,7 +88,7 @@
public void CallAnyMapper()
{
var properties = new List<object>();
- var map = new StubPropertyContainerMapper<EntitySimple>(properties);
+ var map = new StubPropertyContainerMapper<MyClass>(properties);
var called = false;
map.Any(typeof(MyClass).GetProperty("Reference"), typeof(int), x => called = true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X