[Nhibernate-commit] SF.net SVN: nhibernate:[5018] trunk/nhibernate/src/NHibernate/Cfg/ MappingSchema

[<jul...@us...>]

Revision: 5018
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5018&view=rev
Author:   julian-maughan
Date:     2010-07-20 13:54:08 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
Forgot meta regeneration fixing NH-2117.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs
    trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs

Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs	2010-07-20 00:54:39 UTC (rev 5017)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs	2010-07-20 13:54:08 UTC (rev 5018)
@@ -649,11 +649,14 @@
         public HbmMeta[] meta;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("column", typeof(HbmColumn))]
-        [System.Xml.Serialization.XmlElementAttribute("formula", typeof(HbmFormula))]
-        public object[] Items;
+        [System.Xml.Serialization.XmlElementAttribute("column")]
+        public HbmColumn[] column;
         
         /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("formula")]
+        public HbmFormula[] formula;
+        
+        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public string name;
         
@@ -670,8 +673,8 @@
         public string entityname;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string column;
+        [System.Xml.Serialization.XmlAttributeAttribute("column")]
+        public string column1;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute("not-null")]
@@ -738,8 +741,8 @@
         public string propertyref;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string formula;
+        [System.Xml.Serialization.XmlAttributeAttribute("formula")]
+        public string formula1;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]

Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs	2010-07-20 00:54:39 UTC (rev 5017)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs	2010-07-20 13:54:08 UTC (rev 5018)
@@ -43,14 +43,14 @@
 
 		public IEnumerable<HbmColumn> Columns
 		{
-			get { return Items != null ? Items.OfType<HbmColumn>() : AsColumns(); }
+			get { return column != null ? column.OfType<HbmColumn>() : AsColumns(); }
 		}
 
 		#endregion
 
 		private IEnumerable<HbmColumn> AsColumns()
 		{
-			if (string.IsNullOrEmpty(column))
+			if (string.IsNullOrEmpty(column1))
 			{
 				yield break;
 			}
@@ -58,7 +58,7 @@
 			{
 				yield return new HbmColumn
 				{
-					name = column,
+					name = column1,
 					notnull = notnull,
 					notnullSpecified = notnullSpecified,
 					unique = unique,
@@ -73,18 +73,18 @@
 
 		public IEnumerable<HbmFormula> Formulas
 		{
-			get { return Items != null ? Items.OfType<HbmFormula>() : AsFormulas(); }
+			get { return formula != null ? formula.OfType<HbmFormula>() : AsFormulas(); }
 		}
 
 		private IEnumerable<HbmFormula> AsFormulas()
 		{
-			if (string.IsNullOrEmpty(formula))
+			if (string.IsNullOrEmpty(formula1))
 			{
 				yield break;
 			}
 			else
 			{
-				yield return new HbmFormula { Text = new[] { formula } };
+				yield return new HbmFormula { Text = new[] { formula1 } };
 			}
 		}
 


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