[Nhibernate-commit] nhibernate/src/NHibernate.Test/JoinedSubclass JoinedSubclass.Employee.hbm.xml,1.2,1.3 JoinedSubclass.hbm.xml,1.2,1.3

[Paul H. <pha...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/JoinedSubclass
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32255/nhibernate/src/NHibernate.Test/JoinedSubclass

Modified Files:
	JoinedSubclass.Employee.hbm.xml JoinedSubclass.hbm.xml 
Log Message:
Updated Schema to remove conversion anomalies and strongly type attributes

Index: JoinedSubclass.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/JoinedSubclass/JoinedSubclass.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JoinedSubclass.hbm.xml	5 Jan 2005 02:44:18 -0000	1.2
--- JoinedSubclass.hbm.xml	18 Mar 2005 23:32:18 -0000	1.3
***************
*** 12,33 ****
  -->
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class 
! 		name="NHibernate.Test.JoinedSubclass.Person, NHibernate.Test" 
! 		table="person"	
! 		proxy="NHibernate.Test.JoinedSubclass.Person, NHibernate.Test" 
! 	>
! 		<id 
! 			name="Id" 
! 			type="Int32" 
! 			unsaved-value="0" 
! 			column="person_id" 
! 			access="nosetter.camelcase-underscore"
! 		>
! 			<generator class="native" />
  		</id>
! 		
! 		<property name="Name" column="name" />
! 		<property name="Sex" column="sex" />
! 		
  		<component name="Address">
  			<property name="Street"/>
--- 12,21 ----
  -->
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class name="NHibernate.Test.JoinedSubclass.Person, NHibernate.Test" table="person" proxy="NHibernate.Test.JoinedSubclass.Person, NHibernate.Test">
! 		<id name="Id" type="Int32" unsaved-value="0" column="person_id" access="nosetter.camelcase-underscore">
! 			<generator class="native"/>
  		</id>
! 		<property name="Name" column="name"/>
! 		<property name="Sex" column="sex"/>
  		<component name="Address">
  			<property name="Street"/>
***************
*** 35,61 ****
  			<property name="Country"/>
  		</component>
! 		
! 		<joined-subclass 
! 			name="NHibernate.Test.JoinedSubclass.Employee, NHibernate.Test" 
! 			table="empl"
! 			proxy="NHibernate.Test.JoinedSubclass.Employee, NHibernate.Test" 
! 		>
  			<key column="person_id"/>
! 			<property name="Title" not-null="true"  length="20"/>
! 			<property name="Salary" length="0"/>
  			<many-to-one name="Manager"/>
  		</joined-subclass>
! 		
! 		<joined-subclass 
! 			name="NHibernate.Test.JoinedSubclass.Customer, NHibernate.Test"
! 			table="cust"
! 			proxy="NHibernate.Test.JoinedSubclass.Customer, NHibernate.Test"
! 		>
  			<key column="person_id"/>
  			<property name="Comments"/>
  			<many-to-one name="Salesperson"/>
  		</joined-subclass>
- 		
  	</class>
- 	
  </hibernate-mapping>
--- 23,37 ----
  			<property name="Country"/>
  		</component>
! 		<joined-subclass name="NHibernate.Test.JoinedSubclass.Employee, NHibernate.Test" table="empl" proxy="NHibernate.Test.JoinedSubclass.Employee, NHibernate.Test">
  			<key column="person_id"/>
! 			<property name="Title" not-null="true" length="20"/>
! 			<property name="Salary"/>
  			<many-to-one name="Manager"/>
  		</joined-subclass>
! 		<joined-subclass name="NHibernate.Test.JoinedSubclass.Customer, NHibernate.Test" table="cust" proxy="NHibernate.Test.JoinedSubclass.Customer, NHibernate.Test">
  			<key column="person_id"/>
  			<property name="Comments"/>
  			<many-to-one name="Salesperson"/>
  		</joined-subclass>
  	</class>
  </hibernate-mapping>

Index: JoinedSubclass.Employee.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/JoinedSubclass/JoinedSubclass.Employee.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JoinedSubclass.Employee.hbm.xml	5 Jan 2005 02:44:18 -0000	1.2
--- JoinedSubclass.Employee.hbm.xml	18 Mar 2005 23:32:17 -0000	1.3
***************
*** 1,3 ****
! <?xml version="1.0" encoding="utf-8" ?> 
  <!-- 
  	This is the a mapping for the subclass in a joined-subclasses where it
--- 1,3 ----
! <?xml version="1.0" encoding="utf-8"?>
  <!-- 
  	This is the a mapping for the subclass in a joined-subclasses where it
***************
*** 8,23 ****
  -->
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 
! 	<joined-subclass
! 		extends="NHibernate.Test.JoinedSubclass.Person, NHibernate.Test" 
! 		name="NHibernate.Test.JoinedSubclass.Employee, NHibernate.Test" 
! 		table="j_sc_one"
! 		proxy="NHibernate.Test.JoinedSubclass.Employee, NHibernate.Test" 
! 	>
  		<key column="person_id"/>
! 		<property name="Title" not-null="true"  length="20"/>
! 		<property name="Salary" length="0"/>
  		<many-to-one name="Manager"/>
  	</joined-subclass>
- 	
  </hibernate-mapping>
--- 8,16 ----
  -->
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<joined-subclass extends="NHibernate.Test.JoinedSubclass.Person, NHibernate.Test" name="NHibernate.Test.JoinedSubclass.Employee, NHibernate.Test" table="j_sc_one" proxy="NHibernate.Test.JoinedSubclass.Employee, NHibernate.Test">
  		<key column="person_id"/>
! 		<property name="Title" not-null="true" length="20"/>
! 		<property name="Salary"/>
  		<many-to-one name="Manager"/>
  	</joined-subclass>
  </hibernate-mapping>