Menu
▾
▴
nhibernate-commit
|
[Nhibernate-commit] SF.net SVN: nhibernate:[5018]
trunk/nhibernate/src/NHibernate/Cfg/ MappingSchema
From: <jul...@us...> - 2010-07-20 13:54:14
|
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.
|
|
[Nhibernate-commit] SF.net SVN: nhibernate:[5170]
trunk/nhibernate/src/NHibernate/Cfg/ MappingSchema
From: <fab...@us...> - 2010-08-31 16:14:19
|
Revision: 5170
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5170&view=rev
Author: fabiomaulo
Date: 2010-08-31 16:14:12 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
Fix NH-2270 (thanks to Timur Krist?\195?\179f and David Pfeffer)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmAny.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCollectionId.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeElement.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeIndex.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeMapKey.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmDiscriminator.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmDynamicComponent.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmElement.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmId.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndex.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndexManyToAny.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndexManyToMany.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKey.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKeyManyToOne.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKeyProperty.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmListIndex.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToAny.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToMany.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapKey.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapKeyManyToMany.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNaturalId.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNestedCompositeElement.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmOneToOne.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmProperty.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmTimestamp.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmVersion.cs
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmAny.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmAny.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmAny.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -40,6 +41,7 @@
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return column ?? AsColumns(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -162,6 +163,7 @@
get { return null; }
}
+ [XmlIgnore]
public IEnumerable<HbmFilter> Filters
{
get { yield break; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -163,6 +164,7 @@
get { return genericSpecified ? generic: (bool?) null; }
}
+ [XmlIgnore]
public IEnumerable<HbmFilter> Filters
{
get { return filter ?? new HbmFilter[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -26,21 +27,25 @@
get { return Item1 as HbmTimestamp; }
}
+ [XmlIgnore]
public IEnumerable<HbmJoin> Joins
{
get { return Items1 != null ? Items1.OfType<HbmJoin>(): new HbmJoin[0]; }
}
+ [XmlIgnore]
public IEnumerable<HbmSubclass> Subclasses
{
get { return Items1 != null ? Items1.OfType<HbmSubclass>() : new HbmSubclass[0]; }
}
+ [XmlIgnore]
public IEnumerable<HbmJoinedSubclass> JoinedSubclasses
{
get { return Items1 != null ? Items1.OfType<HbmJoinedSubclass>() : new HbmJoinedSubclass[0]; }
}
+ [XmlIgnore]
public IEnumerable<HbmUnionSubclass> UnionSubclasses
{
get { return Items1 != null ? Items1.OfType<HbmUnionSubclass>() : new HbmUnionSubclass[0]; }
@@ -155,6 +160,7 @@
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>(): new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCollectionId.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCollectionId.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCollectionId.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -6,6 +7,7 @@
{
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return column ?? AsColumns(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -47,6 +48,7 @@
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeElement.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeElement.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeElement.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -41,6 +42,7 @@
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeIndex.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeIndex.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeIndex.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -8,6 +9,7 @@
{
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeMapKey.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeMapKey.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmCompositeMapKey.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -8,6 +9,7 @@
{
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmDiscriminator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmDiscriminator.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmDiscriminator.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -6,6 +7,7 @@
{
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get
@@ -35,6 +37,7 @@
#region Implementation of IFormulasMapping
+ [XmlIgnore]
public IEnumerable<HbmFormula> Formulas
{
get
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmDynamicComponent.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmDynamicComponent.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmDynamicComponent.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -47,6 +48,7 @@
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmElement.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmElement.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmElement.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -8,6 +9,7 @@
{
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return Items != null ? Items.OfType<HbmColumn>() : AsColumns(); }
@@ -40,6 +42,7 @@
#region Implementation of IFormulasMapping
+ [XmlIgnore]
public IEnumerable<HbmFormula> Formulas
{
get { return Items != null ? Items.OfType<HbmFormula>() : AsFormulas(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmId.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmId.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmId.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -7,6 +8,7 @@
{
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return column ?? AsColumns(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -162,6 +163,7 @@
get { return genericSpecified ? generic : (bool?)null; }
}
+ [XmlIgnore]
public IEnumerable<HbmFilter> Filters
{
get { return filter ?? new HbmFilter[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndex.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndex.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndex.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -7,6 +8,7 @@
{
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return column ?? AsColumns(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndexManyToAny.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndexManyToAny.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndexManyToAny.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -7,6 +8,7 @@
{
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return column ?? AsColumns(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndexManyToMany.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndexManyToMany.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIndexManyToMany.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -6,6 +7,7 @@
{
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return column ?? AsColumns(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -32,6 +33,7 @@
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,10 +1,12 @@
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
public partial class HbmJoinedSubclass : AbstractDecoratable, IEntityMapping
{
+ [XmlIgnore]
public IEnumerable<HbmJoinedSubclass> JoinedSubclasses
{
get { return joinedsubclass1 ?? new HbmJoinedSubclass[0]; }
@@ -113,6 +115,7 @@
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKey.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKey.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKey.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -6,6 +7,7 @@
{
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return column ?? AsColumns(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKeyManyToOne.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKeyManyToOne.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKeyManyToOne.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -8,6 +9,7 @@
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return column ?? AsColumns(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKeyProperty.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKeyProperty.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmKeyProperty.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -8,6 +9,7 @@
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return column ?? AsColumns(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -176,6 +177,7 @@
get { return genericSpecified ? generic : (bool?)null; }
}
+ [XmlIgnore]
public IEnumerable<HbmFilter> Filters
{
get { return filter ?? new HbmFilter[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmListIndex.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmListIndex.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmListIndex.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,9 +1,11 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
public partial class HbmListIndex: IColumnsMapping
{
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToAny.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToAny.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToAny.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -8,6 +9,7 @@
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return column ?? AsColumns(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToMany.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToMany.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToMany.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -8,6 +9,7 @@
{
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return Items != null ? Items.OfType<HbmColumn>() : AsColumns(); }
@@ -34,6 +36,7 @@
#region Implementation of IFormulasMapping
+ [XmlIgnore]
public IEnumerable<HbmFormula> Formulas
{
get { return Items != null ? Items.OfType<HbmFormula>() : AsFormulas(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -41,6 +42,7 @@
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return Items != null ? Items.OfType<HbmColumn>() : AsColumns(); }
@@ -71,6 +73,7 @@
#region Implementation of IFormulasMapping
+ [XmlIgnore]
public IEnumerable<HbmFormula> Formulas
{
get { return Items != null ? Items.OfType<HbmFormula>() : AsFormulas(); }
@@ -112,6 +115,7 @@
/// <summary>
/// Columns and Formulas, in declared order
/// </summary>
+ [XmlIgnore]
public IEnumerable<object> ColumnsAndFormulas
{
// when Items is empty the column attribute AND formula attribute will be used
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -162,6 +163,7 @@
get { return genericSpecified ? generic : (bool?)null; }
}
+ [XmlIgnore]
public IEnumerable<HbmFilter> Filters
{
get { return filter ?? new HbmFilter[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapKey.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapKey.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapKey.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -9,6 +10,7 @@
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return Items != null ? Items.OfType<HbmColumn>() : AsColumns(); }
@@ -34,6 +36,7 @@
#region Implementation of IFormulasMapping
+ [XmlIgnore]
public IEnumerable<HbmFormula> Formulas
{
get { return Items != null ? Items.OfType<HbmFormula>() : AsFormulas(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapKeyManyToMany.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapKeyManyToMany.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapKeyManyToMany.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -9,6 +10,7 @@
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return Items != null ? Items.OfType<HbmColumn>() : AsColumns(); }
@@ -33,6 +35,7 @@
#region Implementation of IFormulasMapping
+ [XmlIgnore]
public IEnumerable<HbmFormula> Formulas
{
get { return Items != null ? Items.OfType<HbmFormula>() : AsFormulas(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNaturalId.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNaturalId.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNaturalId.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -8,6 +9,7 @@
{
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNestedCompositeElement.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNestedCompositeElement.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNestedCompositeElement.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -7,6 +8,7 @@
{
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmOneToOne.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmOneToOne.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmOneToOne.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -34,6 +35,7 @@
#region Implementation of IFormulasMapping
+ [XmlIgnore]
public IEnumerable<HbmFormula> Formulas
{
get { return formula ?? AsFormulas(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -162,6 +163,7 @@
get { return null; }
}
+ [XmlIgnore]
public IEnumerable<HbmFilter> Filters
{
get { yield break; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmProperty.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmProperty.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmProperty.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -41,6 +42,7 @@
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return Items != null ? Items.OfType<HbmColumn>() : AsColumns(); }
@@ -74,6 +76,7 @@
#region Implementation of IFormulasMapping
+ [XmlIgnore]
public IEnumerable<HbmFormula> Formulas
{
get { return Items != null ? Items.OfType<HbmFormula>() : AsFormulas(); }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -163,6 +164,7 @@
get { return genericSpecified ? generic : (bool?)null; }
}
+ [XmlIgnore]
public IEnumerable<HbmFilter> Filters
{
get { return filter ?? new HbmFilter[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,15 +1,18 @@
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
public partial class HbmSubclass : AbstractDecoratable, IEntityMapping, IEntityDiscriminableMapping
{
+ [XmlIgnore]
public IEnumerable<HbmJoin> Joins
{
get { return join ?? new HbmJoin[0]; }
}
+ [XmlIgnore]
public IEnumerable<HbmSubclass> Subclasses
{
get { return subclass1 ?? new HbmSubclass[0]; }
@@ -128,6 +131,7 @@
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmTimestamp.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmTimestamp.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmTimestamp.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -12,6 +13,7 @@
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,10 +1,12 @@
using System.Collections.Generic;
using System.Linq;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
public partial class HbmUnionSubclass : AbstractDecoratable, IEntityMapping
{
+ [XmlIgnore]
public IEnumerable<HbmUnionSubclass> UnionSubclasses
{
get { return unionsubclass1 ?? new HbmUnionSubclass[0]; }
@@ -114,6 +116,7 @@
#region Implementation of IPropertiesContainerMapping
+ [XmlIgnore]
public IEnumerable<IEntityPropertyMapping> Properties
{
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmVersion.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmVersion.cs 2010-08-29 17:17:39 UTC (rev 5169)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmVersion.cs 2010-08-31 16:14:12 UTC (rev 5170)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Xml.Serialization;
namespace NHibernate.Cfg.MappingSchema
{
@@ -11,6 +12,7 @@
#region Implementation of IColumnsMapping
+ [XmlIgnore]
public IEnumerable<HbmColumn> Columns
{
get { return column ?? AsColumns(); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
[Nhibernate-commit] SF.net SVN: nhibernate:[5539]
trunk/nhibernate/src/NHibernate/Cfg/ MappingSchema
From: <fab...@us...> - 2011-03-26 15:45:55
|
Revision: 5539
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5539&view=rev
Author: fabiomaulo
Date: 2011-03-26 15:45:48 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
Starting NH-2602
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBase.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionSqlsMapping.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntitySqlsMapping.cs
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Xml.Serialization;
@@ -74,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertyMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -75,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertiesMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBase.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBase.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBase.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -24,13 +24,7 @@
protected static string JoinString(string[] text)
{
- if (text != null)
- {
- string result = string.Join(System.Environment.NewLine, text).Trim();
- return result.Length == 0 ? null : result;
- }
- else
- return null;
+ return text.JoinString();
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -156,6 +156,14 @@
get { return sqldelete; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of IPropertiesContainerMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -72,5 +72,15 @@
throw new ArgumentOutOfRangeException("cacheMode");
}
}
+
+ public static string JoinString(this string[] source)
+ {
+ if (source != null)
+ {
+ string result = string.Join(System.Environment.NewLine, source).Trim();
+ return result.Length == 0 ? null : result;
+ }
+ return null;
+ }
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Xml.Serialization;
@@ -74,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertiesMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -31,6 +31,14 @@
#endregion
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#region Implementation of IPropertiesContainerMapping
[XmlIgnore]
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
@@ -111,6 +112,14 @@
get { return sqldelete; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of IPropertiesContainerMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Xml.Serialization;
@@ -74,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of IIndexedCollection
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Xml.Serialization;
@@ -74,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertiesMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Xml.Serialization;
@@ -74,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertyMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -75,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertiesMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
@@ -127,6 +128,11 @@
get { return sqldelete; }
}
+ public string Subselect
+ {
+ get { return null; }
+ }
+
#endregion
#region Implementation of IPropertiesContainerMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
@@ -112,6 +113,14 @@
get { return sqldelete; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of IPropertiesContainerMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionSqlsMapping.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionSqlsMapping.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionSqlsMapping.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -7,5 +7,6 @@
HbmCustomSQL SqlUpdate { get; }
HbmCustomSQL SqlDelete { get; }
HbmCustomSQL SqlDeleteAll { get; }
+ string Subselect { get; }
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntitySqlsMapping.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntitySqlsMapping.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntitySqlsMapping.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -6,5 +6,6 @@
HbmCustomSQL SqlInsert { get; }
HbmCustomSQL SqlUpdate { get; }
HbmCustomSQL SqlDelete { get; }
+ string Subselect { get; }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X