[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Master.cs,1.6,1.7 MasterDetail.hbm.xml,1.4,1.5 Parent.cs,1.4,1.5 ParentChild.hbm.xml,1.5,1.6

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

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

Modified Files:
	Master.cs MasterDetail.hbm.xml Parent.cs ParentChild.hbm.xml 
Log Message:
Added "foreign-key" attribute to many-to-one, one-to-one etc so primary/foreign column names can differ

Index: ParentChild.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ParentChild.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ParentChild.hbm.xml	31 Aug 2004 20:24:23 -0000	1.5
--- ParentChild.hbm.xml	31 Mar 2005 12:40:23 -0000	1.6
***************
*** 1,10 ****
  <?xml version="1.0"?>
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	
! 	<class 
! 		name="NHibernate.DomainModel.Parent, NHibernate.DomainModel"
! 	>
  		<id name="Id" type="Int64" unsaved-value="0">
! 			<generator class="native"> 
  				<!--seqhilo-->
  				<!--<param>foo_seq</param>-->
--- 1,7 ----
  <?xml version="1.0"?>
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class name="NHibernate.DomainModel.Parent, NHibernate.DomainModel">
  		<id name="Id" type="Int64" unsaved-value="0">
! 			<generator class="native">
  				<!--seqhilo-->
  				<!--<param>foo_seq</param>-->
***************
*** 14,34 ****
  		<property name="Count" column="count_"/>
  		<one-to-one name="Child"/>
! 		
  	</class>
! 	
! 	<class 
! 		name="NHibernate.DomainModel.Child, NHibernate.DomainModel"
! 	>
  		<id name="Id" type="Int64" unsaved-value="0">
  			<generator class="assigned"/>
  		</id>
  		<property name="X"/>
! 		<one-to-one 
! 			name="Parent" 
! 			class="NHibernate.DomainModel.Parent, NHibernate.DomainModel" 
! 			constrained="true"
! 		/>
  		<property name="Count" column="count_"/>
  	</class>
! 
! </hibernate-mapping>
\ No newline at end of file
--- 11,26 ----
  		<property name="Count" column="count_"/>
  		<one-to-one name="Child"/>
! 		<property name="any" type="object">
! 			<column name="any_id"/>
! 			<column name="any_class"/>
! 		</property>
  	</class>
! 	<class name="NHibernate.DomainModel.Child, NHibernate.DomainModel">
  		<id name="Id" type="Int64" unsaved-value="0">
  			<generator class="assigned"/>
  		</id>
  		<property name="X"/>
! 		<one-to-one name="Parent" class="NHibernate.DomainModel.Parent, NHibernate.DomainModel" constrained="true" foreign-key="parentfk"/>
  		<property name="Count" column="count_"/>
  	</class>
! </hibernate-mapping>

Index: Master.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Master.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Master.cs	14 Mar 2005 19:04:36 -0000	1.6
--- Master.cs	31 Mar 2005 12:40:23 -0000	1.7
***************
*** 18,26 ****
  		private Iesi.Collections.ISet _outgoing = new Iesi.Collections.HashedSet();
  		private string _name = "master";
! 		// since this is a version column a value should be set.  NHibernate is unable
! 		// to set it right now because it checks to see if value==null -> since this 
! 		// is a struct it is not null...
! 		private DateTime stamp = DateTime.Now;
! 		// private BigDecimal bigDecimal = new BigDecimal("1234.123"); TODO: how to do in .net
  		private int _x;
  		
--- 18,23 ----
  		private Iesi.Collections.ISet _outgoing = new Iesi.Collections.HashedSet();
  		private string _name = "master";
! 		private DateTime version;
! 		//private BigDecimal bigDecimal = new BigDecimal("1234.123"); //TODO: how to do in .net
  		private int _x;
  		

Index: MasterDetail.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/MasterDetail.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MasterDetail.hbm.xml	23 Aug 2004 02:11:53 -0000	1.4
--- MasterDetail.hbm.xml	31 Mar 2005 12:40:23 -0000	1.5
***************
*** 1,25 ****
  <?xml version="1.0"?>
- 
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 
! 	<class 
! 		name="NHibernate.DomainModel.Master, NHibernate.DomainModel"
! 	>
! 		<id 
! 			column="master_key" 
! 			type="Int64"
! 			unsaved-value="0"
! 		>
  			<generator class="native"/>
  		</id>
- 		
  		<!--TODO: make sure this type has an equiv .net type-->
! 		<version 
! 			name="stamp" 
! 			type="Timestamp" 
! 			column="ts_"
! 			access="field"
! 		/>
! 		
  		<property name="Name"/>
  		<property name="X"/>
--- 1,10 ----
  <?xml version="1.0"?>
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class name="NHibernate.DomainModel.Master, NHibernate.DomainModel">
! 		<id column="master_key_column" type="Int64" unsaved-value="0">
  			<generator class="native"/>
  		</id>
  		<!--TODO: make sure this type has an equiv .net type-->
! 		<version name="version" type="Timestamp" column="ts_" access="field" unsaved-value="1/1/0001"/>
  		<property name="Name"/>
  		<property name="X"/>
***************
*** 36,125 ****
  		/>
  		-->
! 		
! 		<set 
! 			name="Details" 
! 			inverse="true" 
! 			lazy="true" 
! 			order-by="i asc"
! 		>
  			<key column="master_key"/>
  			<one-to-many class="NHibernate.DomainModel.Detail, NHibernate.DomainModel"/>
  		</set>
! 		
! 		<set 
! 			name="MoreDetails" 
! 			cascade="all" 
! 			lazy="true" 
! 			order-by="i desc"
! 		>
  			<key column="more_master_key"/>
  			<one-to-many class="NHibernate.DomainModel.Detail, NHibernate.DomainModel"/>
  		</set>
! 		
! 		<set 
! 			name="Incoming" 
! 			lazy="true" 
! 			table="mtm"
! 		>
! 			<key column="outgoingabcdef"/>
! 			<many-to-many 
! 				class="NHibernate.DomainModel.Master, NHibernate.DomainModel" 
! 				column="incomingabcdef"
! 			/>
  		</set>
! 		
! 		<set 
! 			name="Outgoing" 
! 			lazy="true" 
! 			table="mtm" 
! 			inverse="true"
! 		>
  			<key column="incomingabcdef"/>
! 			<many-to-many 
! 				class="NHibernate.DomainModel.Master, NHibernate.DomainModel" 
! 				column="outgoingabcdef"
! 			/>
  		</set>
- 		
  		<many-to-one name="OtherMaster"/>
  	</class>
! 	
! 	<class 
! 		name="NHibernate.DomainModel.Detail, NHibernate.DomainModel"
! 	>
! 		<id 
! 			column="detail_key" 
! 			type="Int64"
! 			unsaved-value="0"
! 		>
  			<generator class="native"/>
  		</id>
- 		
  		<property name="X">
! 			<column name="x" unique-key="uk"/>
  		</property>
  		<property name="I">
! 			<column name="i" unique-key="uk"/>
  		</property>
! 		<many-to-one name="Master"> 
! 			<column name="master_key" unique-key="uk"/>
  		</many-to-one>
! 		<set 
! 			name="SubDetails" 
! 			lazy="true" 
! 			cascade="all"
! 		>
  			<key column="detail_key"/>
  			<one-to-many class="NHibernate.DomainModel.SubDetail, NHibernate.DomainModel"/>
  		</set>
  	</class>
! 	
! 	<class 
! 		name="NHibernate.DomainModel.SubDetail, NHibernate.DomainModel"
! 	>
! 		<id 
! 			column="subdetail_key" 
! 			type="Int64"
! 		>
  			<generator class="native">
  				<param name="sequence">fooseq</param>
--- 21,64 ----
  		/>
  		-->
! 		<set name="Details" inverse="true" lazy="true" order-by="i asc">
  			<key column="master_key"/>
  			<one-to-many class="NHibernate.DomainModel.Detail, NHibernate.DomainModel"/>
  		</set>
! 		<set name="MoreDetails" cascade="all" lazy="true" order-by="i desc">
  			<key column="more_master_key"/>
  			<one-to-many class="NHibernate.DomainModel.Detail, NHibernate.DomainModel"/>
  		</set>
! 		<set name="Incoming" lazy="true" table="mtm">
! 			<key foreign-key="AA" column="outgoingabcdef"/>
! 			<many-to-many class="NHibernate.DomainModel.Master, NHibernate.DomainModel" foreign-key="BB">
! 				<column name="incomingabcdef" index="IBB"/>
! 			</many-to-many>
  		</set>
! 		<set name="Outgoing" lazy="true" table="mtm" inverse="true">
  			<key column="incomingabcdef"/>
! 			<many-to-many class="NHibernate.DomainModel.Master, NHibernate.DomainModel" column="outgoingabcdef"/>
  		</set>
  		<many-to-one name="OtherMaster"/>
  	</class>
! 	<class name="NHibernate.DomainModel.Detail, NHibernate.DomainModel">
! 		<id column="detail_key" type="Int64" unsaved-value="0">
  			<generator class="native"/>
  		</id>
  		<property name="X">
! 			<column name="x" unique-key="uk" not-null="true"/>
  		</property>
  		<property name="I">
! 			<column name="i" unique-key="uk" not-null="true"/>
  		</property>
! 		<many-to-one name="Master" foreign-key="CC">
! 			<column name="master_key" unique-key="uk" not-null="true"/>
  		</many-to-one>
! 		<set name="SubDetails" lazy="true" cascade="all">
  			<key column="detail_key"/>
  			<one-to-many class="NHibernate.DomainModel.SubDetail, NHibernate.DomainModel"/>
  		</set>
  	</class>
! 	<class name="NHibernate.DomainModel.SubDetail, NHibernate.DomainModel">
! 		<id column="subdetail_key" type="Int64">
  			<generator class="native">
  				<param name="sequence">fooseq</param>
***************
*** 128,136 ****
  		<property name="Name"/>
  	</class>
- 	
  	<query name="all_details"><![CDATA[
  		from d in class 
  			NHibernate.DomainModel.Detail
  	]]></query>
- 
  </hibernate-mapping>
--- 67,73 ----

Index: Parent.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Parent.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Parent.cs	31 Aug 2004 20:24:23 -0000	1.4
--- Parent.cs	31 Mar 2005 12:40:23 -0000	1.5
***************
*** 11,14 ****
--- 11,15 ----
  		private int _count;
  		private Child _child;
+ 		private object _any;
  		private int _x;
  		
***************
*** 31,34 ****
--- 32,41 ----
  		}
  
+ 		public object Any
+ 		{
+ 			get { return _any; }
+ 			set { _any = value; }
+ 		}
+ 
  		public int X
  		{