nhibernate-commit

[Nhibernate-commit] SF.net SVN: nhibernate:[4902] trunk/nhibernate/src/NHibernate/Cfg/ XmlHbmBinding/PropertiesBinder.cs

[<fab...@us...>]

Revision: 4902
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4902&view=rev
Author:   fabiomaulo
Date:     2010-01-06 00:09:14 +0000 (Wed, 06 Jan 2010)

Log Message:
-----------
Refactoring (DRY)

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs

Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs	2010-01-05 22:56:37 UTC (rev 4901)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs	2010-01-06 00:09:14 UTC (rev 4902)
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Mapping;
 using System;
@@ -173,16 +172,7 @@
 				if (property != null)
 				{
 					modifier(property);
-					if (log.IsDebugEnabled)
-					{
-						string msg = "Mapped property: " + property.Name;
-						string columns = string.Join(",", property.Value.ColumnIterator.Select(c => c.Text).ToArray());
-						if (columns.Length > 0)
-							msg += " -> " + columns;
-						if (property.Type != null)
-							msg += ", type: " + property.Type.Name;
-						log.Debug(msg);
-					}
+					property.LogMapped(log);
 					addToModelAction(property);
 				}
 			}			


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[5012] trunk/nhibernate/src/NHibernate/Cfg/ XmlHbmBinding/PropertiesBinder.cs

[<fab...@us...>]

Revision: 5012
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5012&view=rev
Author:   fabiomaulo
Date:     2010-07-19 14:46:08 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
- Minor (moved assignment for UnwrapProxy in many-to-one)
- Added assignment for UnwrapProxy in one-to-one)

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs

Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs	2010-07-19 14:32:15 UTC (rev 5011)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs	2010-07-19 14:46:08 UTC (rev 5012)
@@ -107,7 +107,6 @@
 					var value = new ManyToOne(table);
 					BindManyToOne(manyToOneMapping, value, propertyName, true);
 					property = CreateProperty(entityPropertyMapping, className, value, inheritedMetas);
-					property.UnwrapProxy = manyToOneMapping.Lazy == HbmLaziness.NoProxy;
 					BindManyToOneProperty(manyToOneMapping, property);
 				}
 				else if ((componentMapping = entityPropertyMapping as HbmComponent) != null)
@@ -304,6 +303,7 @@
 		private void BindOneToOneProperty(HbmOneToOne oneToOneMapping, Property property)
 		{
 			property.Cascade = oneToOneMapping.cascade ?? mappings.DefaultCascade;
+			property.UnwrapProxy = oneToOneMapping.Lazy == HbmLaziness.NoProxy;
 			var toOne = property.Value as ToOne;
 			if (toOne != null)
 			{
@@ -329,6 +329,7 @@
 		private void BindManyToOneProperty(HbmManyToOne manyToOneMapping, Property property)
 		{
 			property.Cascade = manyToOneMapping.cascade ?? mappings.DefaultCascade;
+			property.UnwrapProxy = manyToOneMapping.Lazy == HbmLaziness.NoProxy;
 			property.IsUpdateable = manyToOneMapping.update;
 			property.IsInsertable = manyToOneMapping.insert;
 			var toOne = property.Value as ToOne;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[5041] trunk/nhibernate/src/NHibernate/Cfg/ XmlHbmBinding/PropertiesBinder.cs

[<fab...@us...>]

Revision: 5041
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5041&view=rev
Author:   fabiomaulo
Date:     2010-07-22 13:34:19 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
Missed 'unique' specification on component mapping

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs

Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs	2010-07-22 12:05:41 UTC (rev 5040)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs	2010-07-22 13:34:19 UTC (rev 5041)
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Mapping;
 using System;
@@ -117,7 +118,7 @@
 					System.Type reflectedClass = mappedClass == null ? null : GetPropertyType(componentMapping.Class, mappedClass, propertyName, componentMapping.Access);
 					BindComponent(componentMapping, value, reflectedClass, entityName, subpath, componetDefaultNullable, inheritedMetas);
 					property = CreateProperty(entityPropertyMapping, className, value, inheritedMetas);
-					BindComponentProperty(componentMapping, property);
+					BindComponentProperty(componentMapping, property, value);
 				}
 				else if ((oneToOneMapping = entityPropertyMapping as HbmOneToOne) != null)
 				{
@@ -134,7 +135,7 @@
 					System.Type reflectedClass = mappedClass == null ? null : GetPropertyType(dynamicComponentMapping.Class, mappedClass, propertyName, dynamicComponentMapping.Access);
 					BindComponent(dynamicComponentMapping, value, reflectedClass, entityName, subpath, componetDefaultNullable, inheritedMetas);
 					property = CreateProperty(entityPropertyMapping, className, value, inheritedMetas);
-					BindComponentProperty(dynamicComponentMapping, property);
+					BindComponentProperty(dynamicComponentMapping, property, value);
 				}
 				else if ((anyMapping = entityPropertyMapping as HbmAny) != null)
 				{
@@ -314,16 +315,24 @@
 			}
 		}
 
-		private void BindComponentProperty(HbmDynamicComponent dynamicComponentMapping, Property property)
+		private void BindComponentProperty(HbmDynamicComponent dynamicComponentMapping, Property property, Component model)
 		{
 			property.IsUpdateable = dynamicComponentMapping.update;
 			property.IsInsertable = dynamicComponentMapping.insert;
+			if (dynamicComponentMapping.unique)
+			{
+				model.Owner.Table.CreateUniqueKey(model.ColumnIterator.OfType<Column>().ToList());
+			}
 		}
 
-		private void BindComponentProperty(HbmComponent componentMapping, Property property)
+		private void BindComponentProperty(HbmComponent componentMapping, Property property, Component model)
 		{
 			property.IsUpdateable = componentMapping.update;
 			property.IsInsertable = componentMapping.insert;
+			if (componentMapping.unique)
+			{
+				model.Owner.Table.CreateUniqueKey(model.ColumnIterator.OfType<Column>().ToList());
+			}
 		}
 
 		private void BindManyToOneProperty(HbmManyToOne manyToOneMapping, Property property)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.