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

[<fab...@us...>]

Revision: 5540
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5540&view=rev
Author:   fabiomaulo
Date:     2011-03-26 16:01:36 +0000 (Sat, 26 Mar 2011)

Log Message:
-----------
step over NH-2602

Modified Paths:
--------------
    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/Cfg/XmlHbmBinding/UnionSubclassBinder.cs

Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs	2011-03-26 15:45:48 UTC (rev 5539)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs	2011-03-26 16:01:36 UTC (rev 5540)
@@ -189,7 +189,7 @@
 			string action = "all"; // joinMapping.schemaaction ?? "all";
 
 			string tableName = joinMapping.table;
-			Table table = mappings.AddTable(schema, catalog, GetClassTableName(persistentClass, tableName), null, false, action);
+			Table table = mappings.AddTable(schema, catalog, GetClassTableName(persistentClass, tableName), joinMapping.Subselect, false, action);
 			join.Table = table;
 
 			join.IsSequentialSelect = joinMapping.fetch == HbmJoinFetch.Select;

Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs	2011-03-26 15:45:48 UTC (rev 5539)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs	2011-03-26 16:01:36 UTC (rev 5540)
@@ -199,7 +199,7 @@
 				string catalog = string.IsNullOrEmpty(collectionMapping.Catalog) ? mappings.CatalogName : collectionMapping.Catalog;
 
 				// TODO NH : add schema-action to the xsd
-				model.CollectionTable = mappings.AddTable(schema, catalog, tableName, null, false, "all");
+				model.CollectionTable = mappings.AddTable(schema, catalog, tableName, collectionMapping.Subselect, false, "all");
 
 				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	2011-03-26 15:45:48 UTC (rev 5539)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/JoinedSubclassBinder.cs	2011-03-26 16:01:36 UTC (rev 5540)
@@ -43,7 +43,7 @@
 			//string action = actionNode == null ? "all" : actionNode.Value;
 			string action = "all";
 
-			Table mytable = mappings.AddTable(schema, catalog, GetClassTableName(subclass, joinedSubclassMapping.table), null, false, action);
+			Table mytable = mappings.AddTable(schema, catalog, GetClassTableName(subclass, joinedSubclassMapping.table), joinedSubclassMapping.Subselect, 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	2011-03-26 15:45:48 UTC (rev 5539)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs	2011-03-26 16:01:36 UTC (rev 5540)
@@ -34,7 +34,7 @@
 						rootClass.EntityName));
 			}
 
-			Table table = mappings.AddTable(schema, catalog, tableName, null, rootClass.IsAbstract.GetValueOrDefault(), classSchema.schemaaction);
+			Table table = mappings.AddTable(schema, catalog, tableName, classSchema.Subselect, 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/Cfg/XmlHbmBinding/UnionSubclassBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/UnionSubclassBinder.cs	2011-03-26 15:45:48 UTC (rev 5539)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/UnionSubclassBinder.cs	2011-03-26 16:01:36 UTC (rev 5540)
@@ -41,7 +41,7 @@
 			Table denormalizedSuperTable = unionSubclass.Superclass.Table;
 			Table mytable =
 				mappings.AddDenormalizedTable(schema, catalog, GetClassTableName(unionSubclass, unionSubclassMapping.table),
-				                              unionSubclass.IsAbstract.GetValueOrDefault(), null, denormalizedSuperTable);
+				                              unionSubclass.IsAbstract.GetValueOrDefault(), unionSubclassMapping.Subselect, denormalizedSuperTable);
 			((ITableOwner)unionSubclass).Table = mytable;
 
 			log.InfoFormat("Mapping union-subclass: {0} -> {1}", unionSubclass.EntityName, unionSubclass.Table.Name);


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