[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Fo.hbm.xml,1.6,1.7 FooBar.hbm.xml,1.12,1.13

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

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

Modified Files:
	Fo.hbm.xml FooBar.hbm.xml 
Log Message:
modified mapping of serializable type from System.Object to Serializable
added some h2.0.3 types to the mapping files instead of nh types.

Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FooBar.hbm.xml	28 Jul 2004 15:09:03 -0000	1.12
--- FooBar.hbm.xml	21 Aug 2004 16:40:42 -0000	1.13
***************
*** 36,64 ****
  			<column name="foo" length="36" index="fbmtoidx"/>
  		</many-to-one>
! 		<property name="Long">
      		<column name="long_" index="fbmtoidx" unique-key="abc" not-null="true"/>
  		</property>
! 		<property name="Integer">
  			<column name="`@@##integer_  *`" unique-key="abc" not-null="true"/>
  		</property>
! 		<property name="Float">
  			<column name="float_" unique-key="abc" not-null="true"/>
  		</property>
  		<property name="X"/>
! 		<property name="Double" column="double_"/>
  
  		<primitive-array name="Bytes" table="foobytes">
  			<key column="id"/>
  			<index column="i"/>
! 			<element column="byte_" type="Byte"/>
  		</primitive-array>
  
! 		<property name="Date" type="DateTime" column="date_"/>
  		<property name="Timestamp" type="Timestamp" column="timestamp_"/>
! 		<property name="Boolean" column="boolean_"/>
  		<property name="Bool" column="bool_"/>
  		<property name="NullInt32" column="null_"/>
! 		<property name="Short" column="short_"/>
! 		<property name="Char" column="char_"/>
  		<property name="Zero" column="zero_"/>
  		<property name="Int" column="int_"/>
--- 36,65 ----
  			<column name="foo" length="36" index="fbmtoidx"/>
  		</many-to-one>
! 		<property name="Long" type="long">
      		<column name="long_" index="fbmtoidx" unique-key="abc" not-null="true"/>
  		</property>
! 		<property name="Integer" type="integer">
  			<column name="`@@##integer_  *`" unique-key="abc" not-null="true"/>
  		</property>
! 		<property name="Float" type="float">
  			<column name="float_" unique-key="abc" not-null="true"/>
  		</property>
  		<property name="X"/>
! 		<property name="Double" column="double_" type="double"/>
  
  		<primitive-array name="Bytes" table="foobytes">
  			<key column="id"/>
  			<index column="i"/>
! 			<element column="byte_" type="byte"/>
  		</primitive-array>
  
! 		<!-- note: this is a Hibernate "date" which is the same as a NHibernate "DateTime" -->
! 		<property name="Date" column="date_" type="date"/>
  		<property name="Timestamp" type="Timestamp" column="timestamp_"/>
! 		<property name="Boolean" column="boolean_" type="boolean"/>
  		<property name="Bool" column="bool_"/>
  		<property name="NullInt32" column="null_"/>
! 		<property name="Short" column="short_" type="short"/>
! 		<property name="Char" column="char_" type="character"/>
  		<property name="Zero" column="zero_"/>
  		<property name="Int" column="int_"/>
***************
*** 67,76 ****
  		</property>
  		<property name="Byte" column="byte_"/>
! 		<property name="YesNo" />
  		<property name="Blob" type="NHibernate.DomainModel.Foo+Struct, NHibernate.DomainModel" column="blobb_"/>
! 		<property name="NullBlob" type="System.Object"/>
  		<property name="Status" column="`status_@###`" type="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel"/>
  		<property name="Binary" column="bin_"/>
! 		<property name="Locale" column="`localeayzabc123!@#$`"/>
  	    
  		<property name="Formula" formula="1/2 * int_"/>
--- 68,77 ----
  		</property>
  		<property name="Byte" column="byte_"/>
! 		<property name="YesNo" type="yes_no"/>
  		<property name="Blob" type="NHibernate.DomainModel.Foo+Struct, NHibernate.DomainModel" column="blobb_"/>
! 		<property name="NullBlob" type="Serializable"/>
  		<property name="Status" column="`status_@###`" type="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel"/>
  		<property name="Binary" column="bin_"/>
! 		<property name="Locale" column="`localeayzabc123!@#$`" type="locale"/>
  	    
  		<property name="Formula" formula="1/2 * int_"/>

Index: Fo.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fo.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Fo.hbm.xml	3 Aug 2004 04:20:08 -0000	1.6
--- Fo.hbm.xml	21 Aug 2004 16:40:42 -0000	1.7
***************
*** 36,40 ****
  			name="Serial" 
  			column="serial_" 
! 			type="System.Object"
  			length="4000"
  		/>
--- 36,40 ----
  			name="Serial" 
  			column="serial_" 
! 			type="Serializable"
  			length="4000"
  		/>