Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[3954] trunk/nhibernate/src/NHibernate
|
From: <wo...@us...> - 2008-12-15 23:37:49
|
Revision: 3954
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3954&view=rev
Author: woil
Date: 2008-12-15 23:37:40 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
Fixes NH 1611, NH 1274.
1611 is an uncommon one-to-one mapping issue.
1274 fills requests for schema-action="none|drop|export|update|validate|all"
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs
trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/JoinedSubclassBinder.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs
trunk/nhibernate/src/NHibernate/Mapping/Table.cs
trunk/nhibernate/src/NHibernate/Type/OneToOneType.cs
trunk/nhibernate/src/NHibernate/nhibernate-mapping.xsd
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Home.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Person.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/Adjunct.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/NH1611OneToOneIdentityFixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/Primary.cs
trunk/nhibernate/src/NHibernate.Tool.HbmXsd/How to generate Hbm.generated.cs.txt
Modified: trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs 2008-12-14 18:17:04 UTC (rev 3953)
+++ trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs 2008-12-15 23:37:40 UTC (rev 3954)
@@ -671,11 +671,11 @@
{
foreach (var table in TableMappings)
{
- if (table.IsPhysicalTable)
+ if (table.IsPhysicalTable && table.SchemaDrop)
{
foreach (var fk in table.ForeignKeyIterator)
{
- if (fk.HasPhysicalConstraint)
+ if (fk.HasPhysicalConstraint && fk.ReferencedTable.SchemaDrop)
{
script.Add(fk.SqlDropString(dialect, defaultCatalog, defaultSchema));
}
@@ -686,7 +686,7 @@
foreach (var table in TableMappings)
{
- if (table.IsPhysicalTable)
+ if (table.IsPhysicalTable && table.SchemaDrop)
{
script.Add(table.SqlDropString(dialect, defaultCatalog, defaultSchema));
}
@@ -723,7 +723,7 @@
foreach (var table in TableMappings)
{
- if (table.IsPhysicalTable)
+ if (table.IsPhysicalTable && table.SchemaExport)
{
script.Add(table.SqlCreateString(dialect, mapping, defaultCatalog, defaultSchema));
script.AddRange(table.SqlCommentStrings(dialect, defaultCatalog, defaultSchema));
@@ -732,7 +732,7 @@
foreach (var table in TableMappings)
{
- if (table.IsPhysicalTable)
+ if (table.IsPhysicalTable && table.SchemaExport)
{
if (!dialect.SupportsUniqueConstraintInCreateAlterTable)
{
@@ -755,7 +755,7 @@
{
foreach (var fk in table.ForeignKeyIterator)
{
- if (fk.HasPhysicalConstraint)
+ if (fk.HasPhysicalConstraint && fk.ReferencedTable.SchemaExport)
{
script.Add(fk.SqlCreateString(dialect, mapping, defaultCatalog, defaultSchema));
}
@@ -790,6 +790,7 @@
foreach (var clazz in classes.Values)
{
clazz.Validate(mapping);
+
if (validateProxy)
{
ICollection<string> errors = ValidateProxyInterface(clazz, pvalidator);
@@ -1919,7 +1920,7 @@
var script = new List<string>(50);
foreach (var table in TableMappings)
{
- if (table.IsPhysicalTable)
+ if (table.IsPhysicalTable && table.SchemaUpdate)
{
ITableMetadata tableInfo = databaseMetadata.GetTableMetadata(table.Name, table.Schema ?? defaultSchema,
table.Catalog ?? defaultCatalog, table.IsQuoted);
@@ -1940,7 +1941,7 @@
foreach (var table in TableMappings)
{
- if (table.IsPhysicalTable)
+ if (table.IsPhysicalTable && table.SchemaUpdate)
{
ITableMetadata tableInfo = databaseMetadata.GetTableMetadata(table.Name, table.Schema, table.Catalog,
table.IsQuoted);
@@ -1949,7 +1950,7 @@
{
foreach (var fk in table.ForeignKeyIterator)
{
- if (fk.HasPhysicalConstraint)
+ if (fk.HasPhysicalConstraint && fk.ReferencedTable.SchemaUpdate)
{
bool create = tableInfo == null
||
@@ -1999,7 +2000,7 @@
var iter = this.TableMappings;
foreach (var table in iter)
{
- if (table.IsPhysicalTable)
+ if (table.IsPhysicalTable && table.SchemaValidate)
{
/*NH Different Implementation :
TableMetadata tableInfo = databaseMetadata.getTableMetadata(
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs 2008-12-14 18:17:04 UTC (rev 3953)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs 2008-12-15 23:37:40 UTC (rev 3954)
@@ -2,7 +2,7 @@
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -83,7 +83,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -110,7 +110,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -128,7 +128,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -193,7 +193,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -207,7 +207,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -372,7 +372,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -386,7 +386,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -413,7 +413,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmCacheUsage {
@@ -436,7 +436,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmCacheInclude {
@@ -451,7 +451,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -465,7 +465,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -524,7 +524,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmOndelete {
@@ -539,7 +539,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -565,7 +565,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -586,7 +586,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -618,7 +618,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -632,7 +632,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -770,7 +770,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -784,7 +784,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmOuterJoinStrategy {
@@ -803,7 +803,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmFetchMode {
@@ -818,7 +818,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmLaziness {
@@ -837,7 +837,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmNotFoundMode {
@@ -852,7 +852,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -888,7 +888,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1005,7 +1005,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1023,7 +1023,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1041,7 +1041,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmPropertyGeneration {
@@ -1060,7 +1060,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1121,7 +1121,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1151,7 +1151,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1255,7 +1255,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1277,7 +1277,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmRestrictedLaziness {
@@ -1292,7 +1292,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1329,7 +1329,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1343,7 +1343,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1373,7 +1373,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmCustomSQLCheck {
@@ -1392,7 +1392,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmCollectionFetchMode {
@@ -1411,7 +1411,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1591,7 +1591,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmCollectionLazy {
@@ -1610,7 +1610,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1729,6 +1729,10 @@
public bool lazySpecified;
/// <remarks/>
+ [System.Xml.Serialization.XmlAttributeAttribute("schema-action")]
+ public string schemaaction;
+
+ /// <remarks/>
[System.Xml.Serialization.XmlAttributeAttribute()]
public string table;
@@ -1825,7 +1829,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1847,7 +1851,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmTuplizerEntitymode {
@@ -1866,7 +1870,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1916,7 +1920,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1966,7 +1970,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2011,7 +2015,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmUnsavedValueType {
@@ -2030,7 +2034,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2082,7 +2086,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2100,7 +2104,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2154,7 +2158,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2181,7 +2185,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2266,7 +2270,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2330,7 +2334,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2515,7 +2519,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2709,7 +2713,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2728,7 +2732,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2747,7 +2751,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2773,7 +2777,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2803,7 +2807,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2838,7 +2842,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2873,7 +2877,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2966,7 +2970,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3108,7 +3112,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmPrimitivearrayOuterjoin {
@@ -3127,7 +3131,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmPrimitivearrayFetch {
@@ -3146,7 +3150,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3330,7 +3334,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3383,7 +3387,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmTimestampUnsavedvalue {
@@ -3398,7 +3402,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmTimestampSource {
@@ -3413,7 +3417,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmVersionGeneration {
@@ -3428,7 +3432,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3462,7 +3466,7 @@
/// <remarks/>
[System.Xml.Serialization.XmlAttributeAttribute()]
- [System.ComponentModel.DefaultValueAttribute("integer")]
+ [System.ComponentModel.DefaultValueAttribute("Int32")]
public string type;
/// <remarks/>
@@ -3483,13 +3487,13 @@
public bool insertSpecified;
public HbmVersion() {
- this.type = "integer";
+ this.type = "Int32";
this.generated = HbmVersionGeneration.Never;
}
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3672,7 +3676,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3705,7 +3709,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3757,7 +3761,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3833,7 +3837,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmJoinFetch {
@@ -3848,7 +3852,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4009,7 +4013,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4030,7 +4034,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4061,7 +4065,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4083,7 +4087,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4097,7 +4101,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmLockMode {
@@ -4124,7 +4128,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4163,7 +4167,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4177,7 +4181,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4208,7 +4212,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4226,7 +4230,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4301,7 +4305,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4319,7 +4323,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmFlushMode {
@@ -4338,7 +4342,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmCacheMode {
@@ -4365,7 +4369,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4455,7 +4459,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4594,7 +4598,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4752,7 +4756,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmPolymorphismType {
@@ -4767,7 +4771,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
public enum HbmOptimisticLockMode {
@@ -4790,7 +4794,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4804,7 +4808,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4824,7 +4828,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4838,7 +4842,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4852,7 +4856,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4870,7 +4874,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4896,7 +4900,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4914,7 +4918,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5003,7 +5007,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5025,7 +5029,7 @@
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.0.0.1001")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "2.1.0.1001")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
Modified: trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs 2008-12-14 18:17:04 UTC (rev 3953)
+++ trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs 2008-12-15 23:37:40 UTC (rev 3954)
@@ -246,7 +246,7 @@
}
}
- public Table AddTable(string schema, string catalog, string name, string subselect, bool isAbstract)
+ public Table AddTable(string schema, string catalog, string name, string subselect, bool isAbstract, string schemaAction)
{
string key = subselect ?? dialect.Qualify(catalog, schema, name);
Table table;
@@ -258,6 +258,10 @@
table.Schema = schema;
table.Catalog = catalog;
table.Subselect = subselect;
+ table.SchemaDrop = SchemaActionRequested(schemaAction, "drop");
+ table.SchemaUpdate = SchemaActionRequested(schemaAction, "update");
+ table.SchemaExport = SchemaActionRequested(schemaAction, "export");
+ table.SchemaValidate = SchemaActionRequested(schemaAction, "validate");
tables[key] = table;
}
else
@@ -269,6 +273,11 @@
return table;
}
+ private static bool SchemaActionRequested(string schemaAction, string check)
+ {
+ return string.IsNullOrEmpty(schemaAction) || schemaAction.Contains("all") || schemaAction.Contains(check);
+ }
+
public Table AddDenormalizedTable(string schema, string catalog, string name, bool isAbstract, string subselect, Table includedTable)
{
string key = subselect ?? dialect.Qualify(schema, catalog, name);
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs 2008-12-14 18:17:04 UTC (rev 3953)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs 2008-12-15 23:37:40 UTC (rev 3954)
@@ -308,7 +308,10 @@
XmlAttribute catalogNode = node.Attributes["catalog"];
string catalog = catalogNode == null ? mappings.CatalogName : catalogNode.Value;
- Table table = mappings.AddTable(schema, catalog, GetClassTableName(persistentClass, node), null, false);
+ XmlAttribute actionNode = node.Attributes["schema-action"];
+ string action = actionNode == null ? "all" : actionNode.Value;
+
+ Table table = mappings.AddTable(schema, catalog, GetClassTableName(persistentClass, node), null, false, action);
join.Table = table;
XmlAttribute fetchNode = node.Attributes["fetch"];
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs 2008-12-14 18:17:04 UTC (rev 3953)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs 2008-12-15 23:37:40 UTC (rev 3954)
@@ -196,7 +196,10 @@
XmlAttribute catalogNode = node.Attributes["catalog"];
string catalog = catalogNode == null ? mappings.CatalogName : catalogNode.Value;
- model.CollectionTable = mappings.AddTable(schema, catalog, tableName, null, false);
+ XmlAttribute actionNode = node.Attributes["schema-action"];
+ string action = actionNode == null ? "all" : actionNode.Value;
+
+ model.CollectionTable = mappings.AddTable(schema, catalog, tableName, null, false, action);
log.InfoFormat("Mapping collection: {0} -> {1}", model.Role, model.CollectionTable.Name);
}
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/JoinedSubclassBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/JoinedSubclassBinder.cs 2008-12-14 18:17:04 UTC (rev 3953)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/JoinedSubclassBinder.cs 2008-12-15 23:37:40 UTC (rev 3954)
@@ -39,7 +39,10 @@
XmlAttribute catalogNode = subnode.Attributes["catalog"];
string catalog = catalogNode == null ? mappings.CatalogName : catalogNode.Value;
- Table mytable = mappings.AddTable(schema, catalog, GetClassTableName(subclass, subnode), null, false);
+ XmlAttribute actionNode = subnode.Attributes["schema-action"];
+ string action = actionNode == null ? "all" : actionNode.Value;
+
+ Table mytable = mappings.AddTable(schema, catalog, GetClassTableName(subclass, subnode), null, false, action);
((ITableOwner)subclass).Table = mytable;
log.InfoFormat("Mapping joined-subclass: {0} -> {1}", subclass.EntityName, subclass.Table.Name);
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs 2008-12-14 18:17:04 UTC (rev 3953)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs 2008-12-15 23:37:40 UTC (rev 3954)
@@ -30,7 +30,7 @@
rootClass.EntityName));
}
- Table table = mappings.AddTable(schema, catalog, tableName, null, rootClass.IsAbstract.GetValueOrDefault());
+ Table table = mappings.AddTable(schema, catalog, tableName, null, rootClass.IsAbstract.GetValueOrDefault(), classSchema.schemaaction);
((ITableOwner) rootClass).Table = table;
log.InfoFormat("Mapping class: {0} -> {1}", rootClass.EntityName, rootClass.Table.Name);
Modified: trunk/nhibernate/src/NHibernate/Mapping/Table.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/Table.cs 2008-12-14 18:17:04 UTC (rev 3953)
+++ trunk/nhibernate/src/NHibernate/Mapping/Table.cs 2008-12-15 23:37:40 UTC (rev 3954)
@@ -84,7 +84,12 @@
private string subselect;
private string rowId;
private bool isSchemaQuoted;
+ private bool schemaDrop = true;
+ private bool schemaUpdate = true;
+ private bool schemaExport = true;
+ private bool schemaValidate = true;
+
/// <summary>
/// Initializes a new instance of <see cref="Table"/>.
/// </summary>
@@ -923,6 +928,30 @@
get { return !IsSubselect && !IsAbstractUnionTable; }
}
+ public bool SchemaDrop
+ {
+ get { return schemaDrop; }
+ set { schemaDrop = value; }
+ }
+
+ public bool SchemaUpdate
+ {
+ get { return schemaUpdate; }
+ set { schemaUpdate = value; }
+ }
+
+ public bool SchemaExport
+ {
+ get { return schemaExport; }
+ set { schemaExport = value; }
+ }
+
+ public bool SchemaValidate
+ {
+ get { return schemaValidate; }
+ set { schemaValidate = value; }
+ }
+
public string RowId
{
get { return rowId; }
Modified: trunk/nhibernate/src/NHibernate/Type/OneToOneType.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/OneToOneType.cs 2008-12-14 18:17:04 UTC (rev 3953)
+++ trunk/nhibernate/src/NHibernate/Type/OneToOneType.cs 2008-12-15 23:37:40 UTC (rev 3954)
@@ -91,7 +91,24 @@
public override object Hydrate(IDataReader rs, string[] names, ISessionImplementor session, object owner)
{
- return session.GetContextEntityIdentifier(owner);
+ IType type = GetIdentifierOrUniqueKeyType(session.Factory);
+ object identifier = session.GetContextEntityIdentifier(owner);
+
+ //This ugly mess is only used when mapping one-to-one entities with component ID types
+ EmbeddedComponentType componentType = type as EmbeddedComponentType;
+ if (componentType != null)
+ {
+ EmbeddedComponentType ownerIdType = session.GetEntityPersister(null, owner).IdentifierType as EmbeddedComponentType;
+ if (ownerIdType != null)
+ {
+ object[] values = ownerIdType.GetPropertyValues(identifier, session);
+ object id = componentType.ResolveIdentifier(values, session, null);
+ IEntityPersister persister = session.Factory.GetEntityPersister(type.ReturnedClass.FullName);
+ var key = new EntityKey(id, persister, session.EntityMode);
+ return session.PersistenceContext.GetEntity(key);
+ }
+ }
+ return identifier;
}
public override bool IsNullable
Modified: trunk/nhibernate/src/NHibernate/nhibernate-mapping.xsd
===================================================================
--- trunk/nhibernate/src/NHibernate/nhibernate-mapping.xsd 2008-12-14 18:17:04 UTC (rev 3953)
+++ trunk/nhibernate/src/NHibernate/nhibernate-mapping.xsd 2008-12-15 23:37:40 UTC (rev 3954)
@@ -184,6 +184,7 @@
<xs:attribute name="proxy" type="xs:string" />
<xs:attribute name="lazy" type="xs:boolean">
</xs:attribute>
+ <xs:attribute name="schema-action" type="xs:string" />
<xs:attribute name="table" type="xs:string" />
<xs:attribute name="schema" type="xs:string" />
<xs:attribute name="catalog" type="xs:string" />
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude
___________________________________________________________________
Added: bugtraq:url
+ http://jira.nhibernate.org/browse/%BUGID%
Added: bugtraq:logregex
+ NH-\d+
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Home.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Home.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Home.cs 2008-12-15 23:37:40 UTC (rev 3954)
@@ -0,0 +1,51 @@
+namespace NHibernate.Test.NHSpecificTest.NH1274ExportExclude
+{
+ public class Home
+ {
+ private int id;
+ private int zip;
+ private string city;
+
+ public Home()
+ {
+
+ }
+
+ public Home(string city, int zip)
+ {
+ this.city = city;
+ this.zip = zip;
+ }
+
+ virtual public int Id
+ {
+ get { return id; }
+ set { id = value; }
+ }
+
+ virtual public string City
+ {
+ get { return city; }
+ set { city = value; }
+ }
+
+ virtual public int Zip
+ {
+ get { return zip; }
+ set { zip = value; }
+ }
+ }
+
+ public class Home_Update : Home { public Home_Update() { } public Home_Update(string city, int zip) : base(city, zip) { } }
+
+ public class Home_Export : Home { public Home_Export() { } public Home_Export(string city, int zip) : base(city, zip) { } }
+
+ public class Home_Validate : Home { public Home_Validate() { } public Home_Validate(string city, int zip) : base(city, zip) { } }
+
+ public class Home_Drop : Home { public Home_Drop() { } public Home_Drop(string city, int zip) : base(city, zip) { } }
+
+ public class Home_None : Home {public Home_None() { } public Home_None(string city, int zip) : base(city, zip) { } }
+
+ public class Home_All : Home {public Home_All() { } public Home_All(string city, int zip) : base(city, zip) { } }
+
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Mappings.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Mappings.hbm.xml 2008-12-15 23:37:40 UTC (rev 3954)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1274ExportExclude">
+
+ <class name="Home_None" schema-action="none">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="City"/>
+ <property name="Zip"/>
+ </class>
+
+ <class name="Home_Drop" schema-action="drop">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="City"/>
+ <property name="Zip"/>
+ </class>
+
+ <class name="Home_Export" schema-action="export">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="City"/>
+ <property name="Zip"/>
+ </class>
+
+ <class name="Home_Update" schema-action="update">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="City"/>
+ <property name="Zip"/>
+ </class>
+
+ <class name="Home_Validate" schema-action="validate">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="City"/>
+ <property name="Zip"/>
+ </class>
+
+ <class name="Home_All" schema-action="all">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="City"/>
+ <property name="Zip"/>
+ </class>
+
+ <class name="Person">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="Name"/>
+ <many-to-one name="Home_Drop" column="Home_DropID" />
+ <many-to-one name="Home_Export" column="Home_ExportID" />
+ <many-to-one name="Home_Update" column="Home_UpdateID" />
+ <many-to-one name="Home_Validate" column="Home_ValidateID" />
+ </class>
+
+
+</hibernate-mapping>
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs 2008-12-15 23:37:40 UTC (rev 3954)
@@ -0,0 +1,118 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using NHibernate.Cfg;
+using NHibernate.Criterion;
+using NHibernate.Engine;
+using NHibernate.Tool.hbm2ddl;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1274ExportExclude
+{
+ [TestFixture]
+ public class NH1274ExportExcludeFixture
+ {
+
+ [Test]
+ public void SchemaExport_Drop_CreatesDropScript()
+ {
+ Configuration configuration = GetConfiguration();
+ SchemaExport export = new SchemaExport(configuration);
+ TextWriter tw = new StringWriter();
+ Console.SetOut(tw);
+ export.Drop(true, false);
+ string s = tw.ToString();
+ Assert.IsTrue(s.Contains("drop table Home_Drop"));
+ Assert.IsTrue(s.Contains("drop table Home_All"));
+ }
+
+ [Test]
+ public void SchemaExport_Export_CreatesExportScript()
+ {
+ Configuration configuration = GetConfiguration();
+ SchemaExport export = new SchemaExport(configuration);
+ TextWriter tw = new StringWriter();
+ Console.SetOut(tw);
+ export.Create(true, false);
+ string s = tw.ToString();
+ Assert.IsTrue(s.Contains("drop table Home_Drop"));
+ Assert.IsTrue(s.Contains("drop table Home_All"));
+ Assert.IsTrue(s.Contains("create table Home_All"));
+ Assert.IsTrue(s.Contains("create table Home_Export"));
+ }
+
+ [Test]
+ public void SchemaExport_Update_CreatesUpdateScript()
+ {
+ Configuration configuration = GetConfiguration();
+ SchemaUpdate update = new SchemaUpdate(configu...
[truncated message content] |
