Modified classes and mappings to test the access="field" and the

various field naming strategies.


SVN: trunk@879

Author: Mike Doerfler

src/NHibernate.DomainModel/Foo.cs

@@ -69,7 +69,7 @@ public override int GetHashCode()
 		private byte[] _bytes;
 		private System.Globalization.CultureInfo _locale;
 		private String _formula;
-		private string[] _custom;
+		private string[] custom;
 		private int _version;
 		private FooProxy _foo;
 		private Fee _dependent;
@@ -314,8 +314,8 @@ public String Formula
 		/// </summary>
 		public string[] Custom
 		{
-			get { return _custom; }
-			set { _custom = value; }
+			get { return custom; }
+			set { custom = value; }
 		}
 
 		/// <summary>
@@ -395,7 +395,7 @@ public LifecycleVeto OnSave(ISession s)
 			_blob = ss;
 			_status=FooStatus.ON;
 			_binary = System.Text.Encoding.ASCII.GetBytes( _string + "yada yada yada" );
-			_custom = new string[]
+			custom = new string[]
 			  {
 				  "foo", "bar" 
 			  };
@@ -465,7 +465,7 @@ public bool EqualsFoo(Foo obj)
 				//&& ( ( _binary == other.Binary ) || _binary.Equals(other.Binary))
 				&& ( _key.Equals(other.Key) )
 				&& ( _locale.Equals(other.Locale) )
-				&& ( ( _custom == other.Custom ) || ( _custom[0].Equals(other.Custom[0]) && _custom[1].Equals(other.Custom[1]) ) )
+				&& ( ( custom == other.Custom ) || ( custom[0].Equals(other.Custom[0]) && custom[1].Equals(other.Custom[1]) ) )
 				;
 		}
 

src/NHibernate.DomainModel/FooBar.hbm.xml

@@ -72,11 +72,11 @@
 		<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="Locale" column="`localeayzabc123!@#$`" access="field.camelcase-underscore" type="locale"/>
 
 		<property name="Formula" formula="1/2 * int_"/>
 
-		<property name="Custom" type="NHibernate.DomainModel.DoubleStringType, NHibernate.DomainModel">
+		<property name="Custom" type="NHibernate.DomainModel.DoubleStringType, NHibernate.DomainModel" access="field.camelcase">
 			<column name="first_name" length="66"/>
 			<column name="surname" length="66"/>
 		</property>
@@ -134,6 +134,7 @@
 					cascade="all" 
 					class="NHibernate.DomainModel.Fee, NHibernate.DomainModel" 
 					outer-join="false"
+					access="field.camelcase-underscore"
 				/>
 			</component>
 

src/NHibernate.DomainModel/Fum.cs

@@ -10,7 +10,7 @@ public class Fum : ILifecycle
 		private Fum _fo;
 		private Qux[] _quxArray;
 		private IDictionary _friends; // <set> mapping
-		private DateTime _lastUpdated;
+		private DateTime m_LastUpdated;
 
 		public Fum() 
 		{
@@ -23,7 +23,7 @@ public Fum(FumCompositeID id)
 			//TODO: H2.0.3 - this is diff from H2.0.3 because I am getting a null exception
 			// when executing the Sql.  H203 uses the CalendarType which we don't have so
 			// I am using DateTime instead...
-			_lastUpdated = DateTime.Now;
+			m_LastUpdated = DateTime.Now;
 
 			FumCompositeID fid = new FumCompositeID();
 			fid.Date= new DateTime(2004, 4, 29, 9, 50, 0, 0);
@@ -151,11 +151,11 @@ public DateTime LastUpdated
 		{
 			get
 			{
-				return _lastUpdated;
+				return m_LastUpdated;
 			}
 			set
 			{
-				_lastUpdated = value;
+				m_LastUpdated = value;
 			}
 		}
 

src/NHibernate.DomainModel/Fum.hbm.xml

@@ -26,7 +26,8 @@
 
 		<version 
 			name="LastUpdated" 
-			type="DateTime" 
+			type="DateTime"
+			access="field.pascalcase-m-underscore" 
 		/>
 
 		<property 

src/NHibernate.DomainModel/Master.cs

@@ -20,7 +20,7 @@ public class 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 DateTime stamp = DateTime.Now;
 		// private BigDecimal bigDecimal = new BigDecimal("1234.123"); TODO: how to do in .net
 		private int _x;
 
@@ -90,12 +90,6 @@ public string Name
 			set { _name = value; }
 		}
 
-		public DateTime Stamp
-		{
-			get { return _stamp; }
-			set { _stamp = value; }
-		}
-
 		public int X
 		{
 			get { return _x; }

src/NHibernate.DomainModel/MasterDetail.hbm.xml

@@ -15,9 +15,10 @@
 
 		<!--TODO: make sure this type has an equiv .net type-->
 		<version 
-			name="Stamp" 
+			name="stamp" 
 			type="Timestamp" 
 			column="ts_"
+			access="field"
 		/>
 
 		<property name="Name"/>

src/NHibernate.DomainModel/Simple.hbm.xml

@@ -9,7 +9,7 @@
         <property name="Address" type="String" length="200" column="address" />
         <property name="Count" column="count_" not-null="true" unique="true"/> 
         <property name="Date" column="date_"/>
-        <many-to-one name="Other"/>
+        <many-to-one name="Other" access="field.camelcase"/>
     </class>