Skip to content

Commit cc2b3cc

Browse files
fabiomaulofabiomaulo
committed
Removed cascade-style enum from mapping.xsd
SVN: trunk@3384
1 parent 79891ac commit cc2b3cc

File tree

4 files changed

+23
-103
lines changed

4 files changed

+23
-103
lines changed

‎src/NHibernate.Test/Generatedkeys/Identity/IdentityGeneratedKeysTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace NHibernate.Test.Generatedkeys.Identity
66
{
7-
//[TestFixture] commentend because de mapping not support actual xsd
7+
[TestFixture]
88
public class IdentityGeneratedKeysTest : TestCase
99
{
1010
protected override IList Mappings

‎src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs

+14-77
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ public partial class HbmMapping {
334334

335335
/// <remarks/>
336336
[System.Xml.Serialization.XmlAttributeAttribute("default-cascade")]
337-
[System.ComponentModel.DefaultValueAttribute(HbmCascadeStyle.None)]
338-
public HbmCascadeStyle defaultcascade;
337+
[System.ComponentModel.DefaultValueAttribute("none")]
338+
public string defaultcascade;
339339

340340
/// <remarks/>
341341
[System.Xml.Serialization.XmlAttributeAttribute("default-access")]
@@ -361,7 +361,7 @@ public partial class HbmMapping {
361361
public bool defaultlazy;
362362

363363
public HbmMapping() {
364-
this.defaultcascade = HbmCascadeStyle.None;
364+
this.defaultcascade = "none";
365365
this.defaultaccess = "property";
366366
this.autoimport = true;
367367
this.defaultlazy = true;
@@ -1110,8 +1110,8 @@ public partial class HbmAny {
11101110

11111111
/// <remarks/>
11121112
[System.Xml.Serialization.XmlAttributeAttribute()]
1113-
[System.ComponentModel.DefaultValueAttribute(HbmCascadeStyle.None)]
1114-
public HbmCascadeStyle cascade;
1113+
[System.ComponentModel.DefaultValueAttribute("none")]
1114+
public string cascade;
11151115

11161116
/// <remarks/>
11171117
[System.Xml.Serialization.XmlAttributeAttribute()]
@@ -1122,7 +1122,7 @@ public partial class HbmAny {
11221122
public string uniquekey;
11231123

11241124
public HbmAny() {
1125-
this.cascade = HbmCascadeStyle.None;
1125+
this.cascade = "none";
11261126
}
11271127
}
11281128

@@ -1144,37 +1144,6 @@ public partial class HbmMetaValue {
11441144
public string @class;
11451145
}
11461146

1147-
/// <remarks/>
1148-
[System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
1149-
[System.SerializableAttribute()]
1150-
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
1151-
public enum HbmCascadeStyle {
1152-
1153-
/// <remarks/>
1154-
[System.Xml.Serialization.XmlEnumAttribute("all")]
1155-
All,
1156-
1157-
/// <remarks/>
1158-
[System.Xml.Serialization.XmlEnumAttribute("all-delete-orphan")]
1159-
AllDeleteOrphan,
1160-
1161-
/// <remarks/>
1162-
[System.Xml.Serialization.XmlEnumAttribute("none")]
1163-
None,
1164-
1165-
/// <remarks/>
1166-
[System.Xml.Serialization.XmlEnumAttribute("save-update")]
1167-
SaveUpdate,
1168-
1169-
/// <remarks/>
1170-
[System.Xml.Serialization.XmlEnumAttribute("delete")]
1171-
Delete,
1172-
1173-
/// <remarks/>
1174-
[System.Xml.Serialization.XmlEnumAttribute("delete-orphan")]
1175-
DeleteOrphan,
1176-
}
1177-
11781147
/// <remarks/>
11791148
[System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
11801149
[System.SerializableAttribute()]
@@ -1234,11 +1203,7 @@ public partial class HbmArray {
12341203

12351204
/// <remarks/>
12361205
[System.Xml.Serialization.XmlAttributeAttribute()]
1237-
public HbmCascadeStyle cascade;
1238-
1239-
/// <remarks/>
1240-
[System.Xml.Serialization.XmlIgnoreAttribute()]
1241-
public bool cascadeSpecified;
1206+
public string cascade;
12421207

12431208
/// <remarks/>
12441209
[System.Xml.Serialization.XmlAttributeAttribute()]
@@ -1410,11 +1375,7 @@ public partial class HbmManyToOne {
14101375

14111376
/// <remarks/>
14121377
[System.Xml.Serialization.XmlAttributeAttribute()]
1413-
public HbmCascadeStyle cascade;
1414-
1415-
/// <remarks/>
1416-
[System.Xml.Serialization.XmlIgnoreAttribute()]
1417-
public bool cascadeSpecified;
1378+
public string cascade;
14181379

14191380
/// <remarks/>
14201381
[System.Xml.Serialization.XmlAttributeAttribute("outer-join")]
@@ -1964,11 +1925,7 @@ public partial class HbmBag {
19641925

19651926
/// <remarks/>
19661927
[System.Xml.Serialization.XmlAttributeAttribute()]
1967-
public HbmCascadeStyle cascade;
1968-
1969-
/// <remarks/>
1970-
[System.Xml.Serialization.XmlIgnoreAttribute()]
1971-
public bool cascadeSpecified;
1928+
public string cascade;
19721929

19731930
/// <remarks/>
19741931
[System.Xml.Serialization.XmlAttributeAttribute()]
@@ -2246,11 +2203,7 @@ public partial class HbmList {
22462203

22472204
/// <remarks/>
22482205
[System.Xml.Serialization.XmlAttributeAttribute()]
2249-
public HbmCascadeStyle cascade;
2250-
2251-
/// <remarks/>
2252-
[System.Xml.Serialization.XmlIgnoreAttribute()]
2253-
public bool cascadeSpecified;
2206+
public string cascade;
22542207

22552208
/// <remarks/>
22562209
[System.Xml.Serialization.XmlAttributeAttribute()]
@@ -2443,11 +2396,7 @@ public partial class HbmMap {
24432396

24442397
/// <remarks/>
24452398
[System.Xml.Serialization.XmlAttributeAttribute()]
2446-
public HbmCascadeStyle cascade;
2447-
2448-
/// <remarks/>
2449-
[System.Xml.Serialization.XmlIgnoreAttribute()]
2450-
public bool cascadeSpecified;
2399+
public string cascade;
24512400

24522401
/// <remarks/>
24532402
[System.Xml.Serialization.XmlAttributeAttribute()]
@@ -2616,11 +2565,7 @@ public partial class HbmOneToOne {
26162565

26172566
/// <remarks/>
26182567
[System.Xml.Serialization.XmlAttributeAttribute()]
2619-
public HbmCascadeStyle cascade;
2620-
2621-
/// <remarks/>
2622-
[System.Xml.Serialization.XmlIgnoreAttribute()]
2623-
public bool cascadeSpecified;
2568+
public string cascade;
26242569

26252570
/// <remarks/>
26262571
[System.Xml.Serialization.XmlAttributeAttribute("outer-join")]
@@ -2831,11 +2776,7 @@ public partial class HbmSet {
28312776

28322777
/// <remarks/>
28332778
[System.Xml.Serialization.XmlAttributeAttribute()]
2834-
public HbmCascadeStyle cascade;
2835-
2836-
/// <remarks/>
2837-
[System.Xml.Serialization.XmlIgnoreAttribute()]
2838-
public bool cascadeSpecified;
2779+
public string cascade;
28392780

28402781
/// <remarks/>
28412782
[System.Xml.Serialization.XmlAttributeAttribute()]
@@ -3012,11 +2953,7 @@ public partial class HbmIdbag {
30122953

30132954
/// <remarks/>
30142955
[System.Xml.Serialization.XmlAttributeAttribute()]
3015-
public HbmCascadeStyle cascade;
3016-
3017-
/// <remarks/>
3018-
[System.Xml.Serialization.XmlIgnoreAttribute()]
3019-
public bool cascadeSpecified;
2956+
public string cascade;
30202957

30212958
/// <remarks/>
30222959
[System.Xml.Serialization.XmlAttributeAttribute()]

‎src/NHibernate/Cfg/XmlHbmBinding/MappingRootBinder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void Bind(XmlNode node)
4242
private void SetMappingsProperties(HbmMapping mappingSchema)
4343
{
4444
mappings.SchemaName = mappingSchema.schema;
45-
mappings.DefaultCascade = GetXmlEnumAttribute(mappingSchema.defaultcascade);
45+
mappings.DefaultCascade = mappingSchema.defaultcascade;
4646
mappings.DefaultAccess = mappingSchema.defaultaccess;
4747
mappings.DefaultLazy = mappingSchema.defaultlazy;
4848
mappings.IsAutoImport = mappingSchema.autoimport;

‎src/NHibernate/nhibernate-mapping.xsd

+7-24
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,6 @@
4040
<xs:enumeration value="always" />
4141
</xs:restriction>
4242
</xs:simpleType>
43-
<xs:simpleType name="cascadeStyle">
44-
<xs:annotation>
45-
<xs:documentation>Rule as to how to operate on child objects (for more information, read topics about "persistence by reachability" or "transparent/transitive/cascading persistence")</xs:documentation>
46-
</xs:annotation>
47-
<xs:restriction base="xs:string">
48-
<xs:enumeration value="all" />
49-
<xs:enumeration value="all-delete-orphan" />
50-
<xs:enumeration value="none" />
51-
<xs:enumeration value="save-update" />
52-
<xs:enumeration value="delete" />
53-
<xs:enumeration value="delete-orphan" />
54-
</xs:restriction>
55-
</xs:simpleType>
5643
<xs:simpleType name="optimisticLockMode">
5744
<xs:restriction base="xs:string">
5845
<xs:enumeration value="none" />
@@ -128,7 +115,7 @@
128115
</xs:attribute>
129116
<xs:attribute name="outer-join" type="outerJoinStrategy" use="optional" />
130117
<xs:attribute name="fetch" type="collectionFetchMode" use="optional" />
131-
<xs:attribute name="cascade" type="cascadeStyle" use="optional" />
118+
<xs:attribute name="cascade" type="xs:string" use="optional" />
132119
<xs:attribute name="where" type="xs:string" use="optional" />
133120
<xs:attribute name="inverse" type="xs:boolean" use="optional" default="false" />
134121
<xs:attribute name="persister" type="xs:string" use="optional" />
@@ -245,12 +232,8 @@
245232
<xs:element ref="filter-def" minOccurs="0" maxOccurs="unbounded" />
246233
<xs:element ref="database-object" minOccurs="0" maxOccurs="unbounded" />
247234
</xs:sequence>
248-
<xs:attribute name="schema" type="xs:string" use="optional">
249-
<xs:annotation>
250-
<xs:documentation>defaults to none used</xs:documentation>
251-
</xs:annotation>
252-
</xs:attribute>
253-
<xs:attribute name="default-cascade" type="cascadeStyle" use="optional" default="none" />
235+
<xs:attribute name="schema" type="xs:string" use="optional"/>
236+
<xs:attribute name="default-cascade" type="xs:string" use="optional" default="none" />
254237
<xs:attribute name="default-access" type="xs:string" use="optional" default="property">
255238
<xs:annotation>
256239
<xs:documentation>Default property access setting</xs:documentation>
@@ -666,7 +649,7 @@
666649
<xs:attribute name="access" type="xs:string" />
667650
<xs:attribute name="insert" type="xs:boolean" />
668651
<xs:attribute name="update" type="xs:boolean" />
669-
<xs:attribute name="cascade" type="cascadeStyle" default="none" />
652+
<xs:attribute name="cascade" type="xs:string" default="none" />
670653
<xs:attribute name="index" type="xs:string" use="optional" />
671654
<xs:attribute name="unique-key" type="xs:string" use="optional" />
672655
</xs:complexType>
@@ -694,7 +677,7 @@
694677
<xs:attribute name="table" type="xs:string" />
695678
<xs:attribute name="schema" type="xs:string" />
696679
<xs:attribute name="element-class" type="xs:string" />
697-
<xs:attribute name="cascade" type="cascadeStyle" />
680+
<xs:attribute name="cascade" type="xs:string" />
698681
<xs:attribute name="where" type="xs:string" />
699682
<xs:attribute name="optimistic-lock" type="xs:boolean" use="optional" />
700683
</xs:complexType>
@@ -962,7 +945,7 @@
962945
<xs:attribute name="unique" type="xs:boolean" default="false" />
963946
<xs:attribute name="unique-key" type="xs:string" />
964947
<xs:attribute name="index" type="xs:string" />
965-
<xs:attribute name="cascade" type="cascadeStyle" />
948+
<xs:attribute name="cascade" type="xs:string" />
966949
<xs:attribute name="outer-join" type="outerJoinStrategy" use="optional" />
967950
<xs:attribute name="fetch" type="fetchMode" use="optional" />
968951
<xs:attribute name="update" type="xs:boolean" />
@@ -1008,7 +991,7 @@
1008991
<xs:attribute name="name" type="xs:string" use="required" />
1009992
<xs:attribute name="access" type="xs:string" />
1010993
<xs:attribute name="class" type="xs:string" />
1011-
<xs:attribute name="cascade" type="cascadeStyle" />
994+
<xs:attribute name="cascade" type="xs:string" />
1012995
<xs:attribute name="outer-join" type="outerJoinStrategy" use="optional" />
1013996
<xs:attribute name="fetch" type="fetchMode" use="optional" />
1014997
<xs:attribute name="constrained" type="xs:boolean" default="false" />

0 commit comments

Comments
 (0)