[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel BasicClass.hbm.xml,1.4,1.5 Child.hbm.xml,1.4,1.5 ClassWithCompositeId.hbm.xml,1.3,1.4 JoinedSubclass.hbm.xml,1.3,1.4 Parent.hbm.xml,1.4,1.5 SexType.hbm.xml,1.3,1.4 SimpleComponent.hbm.xml,1.3,1.4 Subclass.hbm.xml,1.2,1.3 Team.hbm.xml,1.3,1.4 UnsavedType.hbm.xml,1.2,1.3

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13519/NHibernate.DomainModel

Modified Files:
	BasicClass.hbm.xml Child.hbm.xml ClassWithCompositeId.hbm.xml 
	JoinedSubclass.hbm.xml Parent.hbm.xml SexType.hbm.xml 
	SimpleComponent.hbm.xml Subclass.hbm.xml Team.hbm.xml 
	UnsavedType.hbm.xml 
Log Message:
Shorted length of table names and column names so Oralce would not have problems with DB Identifiers being too long.  JIRA issue NH-48.

Index: UnsavedType.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/UnsavedType.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UnsavedType.hbm.xml	9 Mar 2004 16:37:01 -0000	1.2
--- UnsavedType.hbm.xml	10 Apr 2004 03:15:44 -0000	1.3
***************
*** 2,6 ****
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!     <class name="NHibernate.DomainModel.UnsavedType, NHibernate.DomainModel">
  		<id name="Id" column="id" unsaved-value="0">
  			<generator class="identity" />
--- 2,9 ----
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!     <class 
! 		name="NHibernate.DomainModel.UnsavedType, NHibernate.DomainModel"
! 		table="uns_type"
!     >
  		<id name="Id" column="id" unsaved-value="0">
  			<generator class="identity" />

Index: Parent.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Parent.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Parent.hbm.xml	24 Mar 2004 12:11:07 -0000	1.4
--- Parent.hbm.xml	10 Apr 2004 03:15:44 -0000	1.5
***************
*** 2,6 ****
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!     <class name="NHibernate.DomainModel.Parent, NHibernate.DomainModel"> 
  		<id name="Id" column="id">
  			<generator class="assigned" />
--- 2,9 ----
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!     <class 
! 		name="NHibernate.DomainModel.Parent, NHibernate.DomainModel"
! 		table="par"
! 	> 
  		<id name="Id" column="id">
  			<generator class="assigned" />
***************
*** 8,12 ****
  		<property name="AdultName" type="String" column="adult_name" />
  		
! 		<set name="AdultFriends" table="parent_friends" sort="NHibernate.DomainModel.ParentComparer, NHibernate.DomainModel">
  			<key column="parent_id" />
  			<many-to-many column="parent_friend_id" class="NHibernate.DomainModel.Parent, NHibernate.DomainModel" />
--- 11,15 ----
  		<property name="AdultName" type="String" column="adult_name" />
  		
! 		<set name="AdultFriends" table="par_frnd" sort="NHibernate.DomainModel.ParentComparer, NHibernate.DomainModel">
  			<key column="parent_id" />
  			<many-to-many column="parent_friend_id" class="NHibernate.DomainModel.Parent, NHibernate.DomainModel" />

Index: JoinedSubclass.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/JoinedSubclass.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JoinedSubclass.hbm.xml	9 Mar 2004 16:43:45 -0000	1.3
--- JoinedSubclass.hbm.xml	10 Apr 2004 03:15:44 -0000	1.4
***************
*** 1,5 ****
  <?xml version="1.0"?>
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class name="NHibernate.DomainModel.JoinedSubclassBase, NHibernate.DomainModel" table="joined_subclass_base">
  		<id name="Id" type="Int32" unsaved-value="null" column="joined_subclass_id" >
  			<generator class="assigned" />
--- 1,8 ----
  <?xml version="1.0"?>
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class 
! 		name="NHibernate.DomainModel.JoinedSubclassBase, NHibernate.DomainModel" 
! 		table="j_sc"	
! 	>
  		<id name="Id" type="Int32" unsaved-value="null" column="joined_subclass_id" >
  			<generator class="assigned" />
***************
*** 10,14 ****
  		<property name="TestDateTime" column="test_date_time" type="DateTime" />
  		
! 		<joined-subclass name="NHibernate.DomainModel.JoinedSubclassOne, NHibernate.DomainModel" table="joined_subclass_one">
  			<key column="joined_subclass_id" />
  			<property name="OneTestLong" column="one_test_long" type="Int64" />
--- 13,20 ----
  		<property name="TestDateTime" column="test_date_time" type="DateTime" />
  		
! 		<joined-subclass 
! 			name="NHibernate.DomainModel.JoinedSubclassOne, NHibernate.DomainModel" 
! 			table="j_sc_one"
! 		>
  			<key column="joined_subclass_id" />
  			<property name="OneTestLong" column="one_test_long" type="Int64" />

Index: Child.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Child.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Child.hbm.xml	9 Mar 2004 16:43:45 -0000	1.4
--- Child.hbm.xml	10 Apr 2004 03:15:44 -0000	1.5
***************
*** 2,6 ****
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!     <class name="NHibernate.DomainModel.Child, NHibernate.DomainModel">
  		<id name="Id" column="id">
  			<generator class="assigned" />
--- 2,9 ----
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!     <class 
! 		name="NHibernate.DomainModel.Child, NHibernate.DomainModel"
! 		table="child"
! 	>
  		<id name="Id" column="id">
  			<generator class="assigned" />
***************
*** 12,16 ****
  		<many-to-one name="Sex" class="NHibernate.DomainModel.SexType, NHibernate.DomainModel" column="sex_type_id"/>
  		
! 		<map name="Parents" table="child_parent" lazy="true">
  			<key column="child_id" />
  			<index column="which_parent" type="String" />
--- 15,19 ----
  		<many-to-one name="Sex" class="NHibernate.DomainModel.SexType, NHibernate.DomainModel" column="sex_type_id"/>
  		
! 		<map name="Parents" table="c_prnt" lazy="true">
  			<key column="child_id" />
  			<index column="which_parent" type="String" />
***************
*** 18,22 ****
  		</map>
  		
! 		<list name="Siblings" table="child_siblings" lazy="true">
  			<key column="child_id" />
  			<index column="which_sibling" />
--- 21,25 ----
  		</map>
  		
! 		<list name="Siblings" table="c_sibs" lazy="true">
  			<key column="child_id" />
  			<index column="which_sibling" />
***************
*** 30,34 ****
  			
  		-->
! 		<array name="Friends" table="child_friends">
  			<key column="child_id" />
  			<index column="friend_index" />
--- 33,37 ----
  			
  		-->
! 		<array name="Friends" table="c_frnds">
  			<key column="child_id" />
  			<index column="friend_index" />

Index: Subclass.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Subclass.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Subclass.hbm.xml	9 Mar 2004 16:37:01 -0000	1.2
--- Subclass.hbm.xml	10 Apr 2004 03:15:44 -0000	1.3
***************
*** 3,8 ****
  	<class 
  		name="NHibernate.DomainModel.JoinedSubclassBase, NHibernate.DomainModel" 
! 		table="one_table_with_subclasses" 
! 		discriminator-value="SUPER">
  		
  		<id name="Id" type="Int32" column="class_id" >
--- 3,9 ----
  	<class 
  		name="NHibernate.DomainModel.JoinedSubclassBase, NHibernate.DomainModel" 
! 		table="one_tab" 
! 		discriminator-value="SUPER"
! 	>
  		
  		<id name="Id" type="Int32" column="class_id" >

Index: SexType.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/SexType.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SexType.hbm.xml	9 Mar 2004 16:43:45 -0000	1.3
--- SexType.hbm.xml	10 Apr 2004 03:15:44 -0000	1.4
***************
*** 2,6 ****
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!     <class name="NHibernate.DomainModel.SexType, NHibernate.DomainModel">
  		<id name="Id" column="id">
  			<generator class="identity" />
--- 2,9 ----
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!     <class 
! 		name="NHibernate.DomainModel.SexType, NHibernate.DomainModel"
! 		table="s_type"	
! 	>
  		<id name="Id" column="id">
  			<generator class="identity" />

Index: BasicClass.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/BasicClass.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BasicClass.hbm.xml	8 Apr 2004 15:55:46 -0000	1.4
--- BasicClass.hbm.xml	10 Apr 2004 03:15:44 -0000	1.5
***************
*** 3,7 ****
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!     <class name="NHibernate.DomainModel.BasicClass, NHibernate.DomainModel" >
  		
  		<id name="Id" column="id">
--- 3,9 ----
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!     <class 
! 		name="NHibernate.DomainModel.BasicClass, NHibernate.DomainModel" 
! 		table="bc">
  		
  		<id name="Id" column="id">
***************
*** 9,59 ****
  		</id>
  		
! 		<property name="BinaryProperty" type="Byte[]" />
! 		<property name="BooleanProperty" type="Boolean" />
! 		<property name="ByteProperty" type="Byte" />
! 		<property name="CharacterProperty" type="Char" />
! 		<property name="ClassProperty" type="Type" />
! 		<property name="CultureInfoProperty" type="CultureInfo" />
! 		<property name="DateTimeProperty" type="DateTime" />
! 		<property name="DecimalProperty" type="Decimal(19,5)" />
! 		<property name="DoubleProperty" type="Double" />
! 		<property name="Int16Property" type="Int16" />
! 		<property name="Int32Property" type="Int32" />
! 		<property name="Int64Property" type="Int64" />
! 		<property name="SerializableProperty" type="NHibernate.DomainModel.SerializableClass, NHibernate.DomainModel(1000)" />
! 		<property name="SingleProperty" type="Single" />
! 		<property name="StringProperty" type="String" />
! 		<property name="TicksProperty" type="Ticks" />
! 		<property name="TrueFalseProperty" type="TrueFalse" />
! 		<property name="YesNoProperty" type="YesNo" />
  		
  		
! 		<array name="StringArray" table="BasicClass_StringArray"  >
! 			<key column="BasicClass_id" />
! 			<index column="StringArray_index" />
! 			<element column="string_value" type="String(100)" />
  		</array>
  		
! 		<primitive-array name="Int32Array" table="BasicClass_Int32Array">
! 			<key column="BasicClass_id" />
! 			<index column="Int32Array_index" />
! 			<element column="int32_value" type="Int32" />
  		</primitive-array>
  		
! 		<list name="StringList" table="BasicClass_StringList">
! 			<key column="BasicClass_id" />
! 			<index column="StringList_index" />
! 			<element column="string_value" type="String(300)" />
  		</list>
  		
! 		<map name="StringMap" table="BasicClass_StringMap">
! 			<key column="BasicClass_id"/>
! 			<index column="StringMap_index" type="String(10)" />
! 			<element column="string_value" type="String(50)" />
  		</map>
  		
! 		<set name="StringSet" table="BasicClass_StringSet">
! 			<key column="BasicClass_id" />
! 			<element column="string_value" type="String(25)"/>
  		</set>
  		
--- 11,61 ----
  		</id>
  		
! 		<property name="BinaryProperty" type="Byte[]" column="bin_p"/>
! 		<property name="BooleanProperty" type="Boolean" column="bool_p"/>
! 		<property name="ByteProperty" type="Byte" column="byte_p"/>
! 		<property name="CharacterProperty" type="Char" column="char_p"/>
! 		<property name="ClassProperty" type="Type" column="class_p"/>
! 		<property name="CultureInfoProperty" type="CultureInfo" column="cinfo_p"/>
! 		<property name="DateTimeProperty" type="DateTime" column="dtm_p"/>
! 		<property name="DecimalProperty" type="Decimal(19,5)" column="decm_p"/>
! 		<property name="DoubleProperty" type="Double" column="dbl_p"/>
! 		<property name="Int16Property" type="Int16" column="shrt_p" />
! 		<property name="Int32Property" type="Int32" column="int_p"/>
! 		<property name="Int64Property" type="Int64" column="lng_p"/>
! 		<property name="SerializableProperty" type="NHibernate.DomainModel.SerializableClass, NHibernate.DomainModel(1000)"  column="ser_p"/>
! 		<property name="SingleProperty" type="Single" column="flt_p"/>
! 		<property name="StringProperty" type="String" column="str_p"/>
! 		<property name="TicksProperty" type="Ticks" column="ticks_p"/>
! 		<property name="TrueFalseProperty" type="TrueFalse" column="tf_p"/>
! 		<property name="YesNoProperty" type="YesNo" column="yn_p"/>
  		
  		
! 		<array name="StringArray" table="bc_starr"  >
! 			<key column="bc_id" />
! 			<index column="sa_idx" />
! 			<element column="str_val" type="String(100)" />
  		</array>
  		
! 		<primitive-array name="Int32Array" table="bc_inarr">
! 			<key column="bc_id" />
! 			<index column="inta_idx" />
! 			<element column="int32_val" type="Int32" />
  		</primitive-array>
  		
! 		<list name="StringList" table="bc_stlst">
! 			<key column="bc_id" />
! 			<index column="lst_idx" />
! 			<element column="str_val" type="String(300)" />
  		</list>
  		
! 		<map name="StringMap" table="bc_stmap">
! 			<key column="bc_id"/>
! 			<index column="strm_idx" type="String(10)" />
! 			<element column="str_val" type="String(50)" />
  		</map>
  		
! 		<set name="StringSet" table="bc_stset">
! 			<key column="bc_id" />
! 			<element column="str_val" type="String(25)"/>
  		</set>
  		

Index: Team.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Team.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Team.hbm.xml	9 Mar 2004 16:43:45 -0000	1.3
--- Team.hbm.xml	10 Apr 2004 03:15:44 -0000	1.4
***************
*** 10,14 ****
  			<key column="team_id" />
  			<index column="player_index" type="Int32" />
! 			<one-to-many class="NHibernate.DomainModel.Child, NHibernate.DomainModel"/>
  		</list>
  
--- 10,14 ----
  			<key column="team_id" />
  			<index column="player_index" type="Int32" />
! 			<one-to-many class="NHibernate.DomainModel.Child, NHibernate.DomainModel" />
  		</list>
  

Index: SimpleComponent.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/SimpleComponent.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimpleComponent.hbm.xml	9 Mar 2004 16:43:45 -0000	1.3
--- SimpleComponent.hbm.xml	10 Apr 2004 03:15:44 -0000	1.4
***************
*** 2,6 ****
  
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class name="NHibernate.DomainModel.SimpleComponent, NHibernate.DomainModel" table="simple_component" >
  		<id name="Key" type="Int64" column="id_"  >
  			<generator class="assigned" />
--- 2,8 ----
  
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class name="NHibernate.DomainModel.SimpleComponent, NHibernate.DomainModel" 
! 		table="simp_com" 
! 	>
  		<id name="Key" type="Int64" column="id_"  >
  			<generator class="assigned" />

Index: ClassWithCompositeId.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ClassWithCompositeId.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ClassWithCompositeId.hbm.xml	9 Mar 2004 16:43:45 -0000	1.3
--- ClassWithCompositeId.hbm.xml	10 Apr 2004 03:15:44 -0000	1.4
***************
*** 3,7 ****
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
! 	<class name="NHibernate.DomainModel.ClassWithCompositeId, NHibernate.DomainModel" table="class_with_composite_id">
  		<composite-id name="Id" class="NHibernate.DomainModel.CompositeId, NHibernate.DomainModel">
  			<key-property name="KeyString" column="string_" type="String(20)" />
--- 3,10 ----
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
! 	<class 
! 		name="NHibernate.DomainModel.ClassWithCompositeId, NHibernate.DomainModel" 
! 		table="class_w_com_id"
! 	>
  		<composite-id name="Id" class="NHibernate.DomainModel.CompositeId, NHibernate.DomainModel">
  			<key-property name="KeyString" column="string_" type="String(20)" />