Skip to content

Commit e65c8b0

Browse files
fabiomaulofabiomaulo
committed
Fix NH-2270 (thanks to Timur Kristóf and David Pfeffer)
SVN: trunk@5170
1 parent 8b2f45a commit e65c8b0

40 files changed

+96
-0
lines changed

‎src/NHibernate/Cfg/MappingSchema/HbmAny.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Xml.Serialization;
34

45
namespace NHibernate.Cfg.MappingSchema
56
{
@@ -40,6 +41,7 @@ protected override HbmMeta[] Metadatas
4041

4142
#region Implementation of IColumnsMapping
4243

44+
[XmlIgnore]
4345
public IEnumerable<HbmColumn> Columns
4446
{
4547
get { return column ?? AsColumns(); }

‎src/NHibernate/Cfg/MappingSchema/HbmArray.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections.Generic;
2+
using System.Xml.Serialization;
23

34
namespace NHibernate.Cfg.MappingSchema
45
{
@@ -162,6 +163,7 @@ public bool? Generic
162163
get { return null; }
163164
}
164165

166+
[XmlIgnore]
165167
public IEnumerable<HbmFilter> Filters
166168
{
167169
get { yield break; }

‎src/NHibernate/Cfg/MappingSchema/HbmBag.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Xml.Serialization;
34

45
namespace NHibernate.Cfg.MappingSchema
56
{
@@ -163,6 +164,7 @@ public bool? Generic
163164
get { return genericSpecified ? generic: (bool?) null; }
164165
}
165166

167+
[XmlIgnore]
166168
public IEnumerable<HbmFilter> Filters
167169
{
168170
get { return filter ?? new HbmFilter[0]; }

‎src/NHibernate/Cfg/MappingSchema/HbmClass.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Xml.Serialization;
45

56
namespace NHibernate.Cfg.MappingSchema
67
{
@@ -26,21 +27,25 @@ public HbmTimestamp Timestamp
2627
get { return Item1 as HbmTimestamp; }
2728
}
2829

30+
[XmlIgnore]
2931
public IEnumerable<HbmJoin> Joins
3032
{
3133
get { return Items1 != null ? Items1.OfType<HbmJoin>(): new HbmJoin[0]; }
3234
}
3335

36+
[XmlIgnore]
3437
public IEnumerable<HbmSubclass> Subclasses
3538
{
3639
get { return Items1 != null ? Items1.OfType<HbmSubclass>() : new HbmSubclass[0]; }
3740
}
3841

42+
[XmlIgnore]
3943
public IEnumerable<HbmJoinedSubclass> JoinedSubclasses
4044
{
4145
get { return Items1 != null ? Items1.OfType<HbmJoinedSubclass>() : new HbmJoinedSubclass[0]; }
4246
}
4347

48+
[XmlIgnore]
4449
public IEnumerable<HbmUnionSubclass> UnionSubclasses
4550
{
4651
get { return Items1 != null ? Items1.OfType<HbmUnionSubclass>() : new HbmUnionSubclass[0]; }
@@ -155,6 +160,7 @@ public HbmCustomSQL SqlDelete
155160

156161
#region Implementation of IPropertiesContainerMapping
157162

163+
[XmlIgnore]
158164
public IEnumerable<IEntityPropertyMapping> Properties
159165
{
160166
get { return Items != null ? Items.Cast<IEntityPropertyMapping>(): new IEntityPropertyMapping[0]; }

‎src/NHibernate/Cfg/MappingSchema/HbmCollectionId.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using System.Collections.Generic;
2+
using System.Xml.Serialization;
23

34
namespace NHibernate.Cfg.MappingSchema
45
{
56
public partial class HbmCollectionId : IColumnsMapping, ITypeMapping
67
{
78
#region Implementation of IColumnsMapping
89

10+
[XmlIgnore]
911
public IEnumerable<HbmColumn> Columns
1012
{
1113
get { return column ?? AsColumns(); }

‎src/NHibernate/Cfg/MappingSchema/HbmComponent.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Xml.Serialization;
45

56
namespace NHibernate.Cfg.MappingSchema
67
{
@@ -47,6 +48,7 @@ public bool OptimisticLock
4748

4849
#region Implementation of IPropertiesContainerMapping
4950

51+
[XmlIgnore]
5052
public IEnumerable<IEntityPropertyMapping> Properties
5153
{
5254
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }

‎src/NHibernate/Cfg/MappingSchema/HbmCompositeElement.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Xml.Serialization;
45

56
namespace NHibernate.Cfg.MappingSchema
67
{
@@ -41,6 +42,7 @@ protected override HbmMeta[] Metadatas
4142

4243
#region Implementation of IPropertiesContainerMapping
4344

45+
[XmlIgnore]
4446
public IEnumerable<IEntityPropertyMapping> Properties
4547
{
4648
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }

‎src/NHibernate/Cfg/MappingSchema/HbmCompositeIndex.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Xml.Serialization;
45

56
namespace NHibernate.Cfg.MappingSchema
67
{
78
public partial class HbmCompositeIndex: IComponentMapping
89
{
910
#region Implementation of IPropertiesContainerMapping
1011

12+
[XmlIgnore]
1113
public IEnumerable<IEntityPropertyMapping> Properties
1214
{
1315
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }

‎src/NHibernate/Cfg/MappingSchema/HbmCompositeMapKey.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Xml.Serialization;
45

56
namespace NHibernate.Cfg.MappingSchema
67
{
78
public partial class HbmCompositeMapKey: IComponentMapping
89
{
910
#region Implementation of IPropertiesContainerMapping
1011

12+
[XmlIgnore]
1113
public IEnumerable<IEntityPropertyMapping> Properties
1214
{
1315
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }

‎src/NHibernate/Cfg/MappingSchema/HbmDiscriminator.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using System.Collections.Generic;
2+
using System.Xml.Serialization;
23

34
namespace NHibernate.Cfg.MappingSchema
45
{
56
public partial class HbmDiscriminator: IColumnsMapping, IFormulasMapping
67
{
78
#region Implementation of IColumnsMapping
89

10+
[XmlIgnore]
911
public IEnumerable<HbmColumn> Columns
1012
{
1113
get
@@ -35,6 +37,7 @@ public IEnumerable<HbmColumn> Columns
3537

3638
#region Implementation of IFormulasMapping
3739

40+
[XmlIgnore]
3841
public IEnumerable<HbmFormula> Formulas
3942
{
4043
get

‎src/NHibernate/Cfg/MappingSchema/HbmDynamicComponent.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Xml.Serialization;
45

56
namespace NHibernate.Cfg.MappingSchema
67
{
@@ -47,6 +48,7 @@ public bool OptimisticLock
4748

4849
#region Implementation of IPropertiesContainerMapping
4950

51+
[XmlIgnore]
5052
public IEnumerable<IEntityPropertyMapping> Properties
5153
{
5254
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }

‎src/NHibernate/Cfg/MappingSchema/HbmElement.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Xml.Serialization;
45

56
namespace NHibernate.Cfg.MappingSchema
67
{
78
public partial class HbmElement: IColumnsMapping, IFormulasMapping, ITypeMapping
89
{
910
#region Implementation of IColumnsMapping
1011

12+
[XmlIgnore]
1113
public IEnumerable<HbmColumn> Columns
1214
{
1315
get { return Items != null ? Items.OfType<HbmColumn>() : AsColumns(); }
@@ -40,6 +42,7 @@ private IEnumerable<HbmColumn> AsColumns()
4042

4143
#region Implementation of IFormulasMapping
4244

45+
[XmlIgnore]
4346
public IEnumerable<HbmFormula> Formulas
4447
{
4548
get { return Items != null ? Items.OfType<HbmFormula>() : AsFormulas(); }

‎src/NHibernate/Cfg/MappingSchema/HbmId.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Xml.Serialization;
34

45
namespace NHibernate.Cfg.MappingSchema
56
{
67
public partial class HbmId: AbstractDecoratable, IColumnsMapping, ITypeMapping
78
{
89
#region Implementation of IColumnsMapping
910

11+
[XmlIgnore]
1012
public IEnumerable<HbmColumn> Columns
1113
{
1214
get { return column ?? AsColumns(); }

‎src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections.Generic;
2+
using System.Xml.Serialization;
23

34
namespace NHibernate.Cfg.MappingSchema
45
{
@@ -162,6 +163,7 @@ public bool? Generic
162163
get { return genericSpecified ? generic : (bool?)null; }
163164
}
164165

166+
[XmlIgnore]
165167
public IEnumerable<HbmFilter> Filters
166168
{
167169
get { return filter ?? new HbmFilter[0]; }

‎src/NHibernate/Cfg/MappingSchema/HbmIndex.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Xml.Serialization;
34

45
namespace NHibernate.Cfg.MappingSchema
56
{
67
public partial class HbmIndex: IColumnsMapping, ITypeMapping
78
{
89
#region Implementation of IColumnsMapping
910

11+
[XmlIgnore]
1012
public IEnumerable<HbmColumn> Columns
1113
{
1214
get { return column ?? AsColumns(); }

‎src/NHibernate/Cfg/MappingSchema/HbmIndexManyToAny.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Xml.Serialization;
34

45
namespace NHibernate.Cfg.MappingSchema
56
{
67
public partial class HbmIndexManyToAny: IColumnsMapping, IAnyMapping
78
{
89
#region Implementation of IColumnsMapping
910

11+
[XmlIgnore]
1012
public IEnumerable<HbmColumn> Columns
1113
{
1214
get { return column ?? AsColumns(); }

‎src/NHibernate/Cfg/MappingSchema/HbmIndexManyToMany.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using System.Collections.Generic;
2+
using System.Xml.Serialization;
23

34
namespace NHibernate.Cfg.MappingSchema
45
{
56
public partial class HbmIndexManyToMany: IColumnsMapping, IRelationship
67
{
78
#region Implementation of IColumnsMapping
89

10+
[XmlIgnore]
911
public IEnumerable<HbmColumn> Columns
1012
{
1113
get { return column ?? AsColumns(); }

‎src/NHibernate/Cfg/MappingSchema/HbmJoin.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Xml.Serialization;
45

56
namespace NHibernate.Cfg.MappingSchema
67
{
@@ -32,6 +33,7 @@ public HbmCustomSQL SqlDelete
3233

3334
#region Implementation of IPropertiesContainerMapping
3435

36+
[XmlIgnore]
3537
public IEnumerable<IEntityPropertyMapping> Properties
3638
{
3739
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }

‎src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
using System.Collections.Generic;
22
using System.Linq;
3+
using System.Xml.Serialization;
34

45
namespace NHibernate.Cfg.MappingSchema
56
{
67
public partial class HbmJoinedSubclass : AbstractDecoratable, IEntityMapping
78
{
9+
[XmlIgnore]
810
public IEnumerable<HbmJoinedSubclass> JoinedSubclasses
911
{
1012
get { return joinedsubclass1 ?? new HbmJoinedSubclass[0]; }
@@ -113,6 +115,7 @@ public HbmCustomSQL SqlDelete
113115

114116
#region Implementation of IPropertiesContainerMapping
115117

118+
[XmlIgnore]
116119
public IEnumerable<IEntityPropertyMapping> Properties
117120
{
118121
get { return Items != null ? Items.Cast<IEntityPropertyMapping>() : new IEntityPropertyMapping[0]; }

‎src/NHibernate/Cfg/MappingSchema/HbmKey.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using System.Collections.Generic;
2+
using System.Xml.Serialization;
23

34
namespace NHibernate.Cfg.MappingSchema
45
{
56
public partial class HbmKey: IColumnsMapping
67
{
78
#region Implementation of IColumnsMapping
89

10+
[XmlIgnore]
911
public IEnumerable<HbmColumn> Columns
1012
{
1113
get { return column ?? AsColumns(); }

‎src/NHibernate/Cfg/MappingSchema/HbmKeyManyToOne.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Xml.Serialization;
34

45
namespace NHibernate.Cfg.MappingSchema
56
{
@@ -8,6 +9,7 @@ public partial class HbmKeyManyToOne : AbstractDecoratable, IColumnsMapping, IRe
89

910
#region Implementation of IColumnsMapping
1011

12+
[XmlIgnore]
1113
public IEnumerable<HbmColumn> Columns
1214
{
1315
get { return column ?? AsColumns(); }

‎src/NHibernate/Cfg/MappingSchema/HbmKeyProperty.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Xml.Serialization;
34

45
namespace NHibernate.Cfg.MappingSchema
56
{
@@ -8,6 +9,7 @@ public partial class HbmKeyProperty : AbstractDecoratable, IColumnsMapping, ITyp
89

910
#region Implementation of IColumnsMapping
1011

12+
[XmlIgnore]
1113
public IEnumerable<HbmColumn> Columns
1214
{
1315
get { return column ?? AsColumns(); }

‎src/NHibernate/Cfg/MappingSchema/HbmList.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections.Generic;
2+
using System.Xml.Serialization;
23

34
namespace NHibernate.Cfg.MappingSchema
45
{
@@ -176,6 +177,7 @@ public bool? Generic
176177
get { return genericSpecified ? generic : (bool?)null; }
177178
}
178179

180+
[XmlIgnore]
179181
public IEnumerable<HbmFilter> Filters
180182
{
181183
get { return filter ?? new HbmFilter[0]; }

0 commit comments

Comments
 (0)