Column.cs: Coding style - resolve most R# warnings.

Author: oskarb

src/NHibernate/Mapping/Column.cs

@@ -17,21 +17,21 @@ public class Column : ISelectable, ICloneable
 		public const int DefaultPrecision = 19;
 		public const int DefaultScale = 2;
 
-		private int? length;
-		private int? precision;
-		private int? scale;
+		private int? _length;
+		private int? _precision;
+		private int? _scale;
 		private IValue _value;
-		private int typeIndex = 0;
-		private string name;
-		private bool nullable = true;
-		private bool unique = false;
-		private string sqlType;
-		private SqlType sqlTypeCode;
-		private bool quoted = false;
-		internal int uniqueInteger;
-		private string checkConstraint;
-		private string comment;
-		private string defaultValue;
+		private int _typeIndex;
+		private string _name;
+		private bool _nullable = true;
+		private bool _unique;
+		private string _sqlType;
+		private SqlType _sqlTypeCode;
+		private bool _quoted;
+		internal int UniqueInteger;
+		private string _checkConstraint;
+		private string _comment;
+		private string _defaultValue;
 
 		/// <summary>
 		/// Initializes a new instance of <see cref="Column"/>.
@@ -55,8 +55,8 @@ public Column(string columnName)
 		/// <value>The length of the datatype in the database.</value>
 		public int Length
 		{
-			get { return length.GetValueOrDefault(DefaultLength); }
-			set { length = value; }
+			get { return _length.GetValueOrDefault(DefaultLength); }
+			set { _length = value; }
 		}
 
 		/// <summary>
@@ -79,24 +79,24 @@ public int Length
 		/// </remarks>
 		public string Name
 		{
-			get { return name; }
+			get { return _name; }
 			set
 			{
 				if (value[0] == '`')
 				{
-					quoted = true;
-					name = value.Substring(1, value.Length - 2);
+					_quoted = true;
+					_name = value.Substring(1, value.Length - 2);
 				}
 				else
 				{
-					name = value;
+					_name = value;
 				}
 			}
 		}
 
 		public string CanonicalName
 		{
-			get { return quoted ? name : name.ToLowerInvariant(); }
+			get { return _quoted ? _name : _name.ToLowerInvariant(); }
 		}
 
 		/// <summary>
@@ -112,7 +112,7 @@ public string CanonicalName
 		/// </returns>
 		public string GetQuotedName(Dialect.Dialect d)
 		{
-			return IsQuoted ? d.QuoteForColumnName(name) : name;
+			return IsQuoted ? d.QuoteForColumnName(_name) : _name;
 		}
 
 		/**
@@ -123,32 +123,32 @@ public string GetQuotedName(Dialect.Dialect d)
 
 		public string GetAlias(Dialect.Dialect dialect)
 		{
-			string alias = name;
-			string _unique = uniqueInteger.ToString() + '_';
-			int lastLetter = StringHelper.LastIndexOfLetter(name);
+			string alias = _name;
+			string suffix = UniqueInteger.ToString() + '_';
+			int lastLetter = StringHelper.LastIndexOfLetter(_name);
 			if (lastLetter == -1)
 			{
 				alias = "column";
 			}
-			else if (lastLetter < name.Length - 1)
+			else if (lastLetter < _name.Length - 1)
 			{
-				alias = name.Substring(0, lastLetter + 1);
+				alias = _name.Substring(0, lastLetter + 1);
 			}
 			if (alias.Length > dialect.MaxAliasLength)
 			{
-				alias = alias.Substring(0, dialect.MaxAliasLength - _unique.Length);
+				alias = alias.Substring(0, dialect.MaxAliasLength - suffix.Length);
 			}
-			bool useRawName = name.Equals(alias) &&
-							  !quoted &&
-							  !StringHelper.EqualsCaseInsensitive(name, "rowid");
+			bool useRawName = _name.Equals(alias) &&
+							  !_quoted &&
+							  !StringHelper.EqualsCaseInsensitive(_name, "rowid");
 
 			if (useRawName)
 			{
 				return alias;
 			}
 			else
 			{
-				return alias + _unique;
+				return alias + suffix;
 			}
 		}
 
@@ -164,8 +164,8 @@ public string GetAlias(Dialect.Dialect dialect, Table table)
 		/// <value><see langword="true" /> if the column can have a null value in it.</value>
 		public bool IsNullable
 		{
-			get { return nullable; }
-			set { nullable = value; }
+			get { return _nullable; }
+			set { _nullable = value; }
 		}
 
 		/// <summary>
@@ -176,8 +176,8 @@ public bool IsNullable
 		/// </value>
 		public int TypeIndex
 		{
-			get { return typeIndex; }
-			set { typeIndex = value; }
+			get { return _typeIndex; }
+			set { _typeIndex = value; }
 		}
 
 		/// <summary>
@@ -186,8 +186,8 @@ public int TypeIndex
 		/// <value><see langword="true" /> if the column contains unique values.</value>
 		public bool IsUnique
 		{
-			get { return unique; }
-			set { unique = value; }
+			get { return _unique; }
+			set { _unique = value; }
 		}
 
 		/// <summary>
@@ -205,7 +205,7 @@ public bool IsUnique
 		/// </remarks>
 		public string GetSqlType(Dialect.Dialect dialect, IMapping mapping)
 		{
-			return sqlType ?? GetDialectTypeName(dialect, mapping);
+			return _sqlType ?? GetDialectTypeName(dialect, mapping);
 		}
 
 		private string GetDialectTypeName(Dialect.Dialect dialect, IMapping mapping)
@@ -250,18 +250,18 @@ public bool Equals(Column column)
 			if (null == column)
 				return false;
 
-			if (this == column)
+			if (ReferenceEquals(this, column))
 				return true;
 
-			return IsQuoted ? name.Equals(column.name) : name.ToLowerInvariant().Equals(column.name.ToLowerInvariant());
+			return IsQuoted ? _name.Equals(column._name) : _name.ToLowerInvariant().Equals(column._name.ToLowerInvariant());
 		}
 
 		/// <summary>
 		/// Returns the hash code for this instance.
 		/// </summary>
 		public override int GetHashCode()
 		{
-			return IsQuoted ? name.GetHashCode() : name.ToLowerInvariant().GetHashCode();
+			return IsQuoted ? _name.GetHashCode() : _name.ToLowerInvariant().GetHashCode();
 		}
 
 		#endregion
@@ -277,8 +277,8 @@ public override int GetHashCode()
 		/// </remarks>
 		public string SqlType
 		{
-			get { return sqlType; }
-			set { sqlType = value; }
+			get { return _sqlType; }
+			set { _sqlType = value; }
 		}
 
 		/// <summary>
@@ -287,34 +287,34 @@ public string SqlType
 		/// <value><see langword="true" /> if the column is quoted.</value>
 		public bool IsQuoted
 		{
-			get { return quoted; }
-			set { quoted = value; }
+			get { return _quoted; }
+			set { _quoted = value; }
 		}
 
 		/// <summary>
 		/// Gets or sets whether the column is unique.
 		/// </summary>
 		public bool Unique
 		{
-			get { return unique; }
-			set { unique = value; }
+			get { return _unique; }
+			set { _unique = value; }
 		}
 
 		/// <summary>
 		/// Gets or sets a check constraint on the column
 		/// </summary>
 		public string CheckConstraint
 		{
-			get { return checkConstraint; }
-			set { checkConstraint = value; }
+			get { return _checkConstraint; }
+			set { _checkConstraint = value; }
 		}
 
 		/// <summary>
 		/// Do we have a check constraint?
 		/// </summary>
 		public bool HasCheckConstraint
 		{
-			get { return !string.IsNullOrEmpty(checkConstraint); }
+			get { return !string.IsNullOrEmpty(_checkConstraint); }
 		}
 
 		public string Text
@@ -334,14 +334,14 @@ public bool IsFormula
 
 		public int Precision
 		{
-			get { return precision.GetValueOrDefault(DefaultPrecision); }
-			set { precision = value; }
+			get { return _precision.GetValueOrDefault(DefaultPrecision); }
+			set { _precision = value; }
 		}
 
 		public int Scale
 		{
-			get { return scale.GetValueOrDefault(DefaultScale); }
-			set { scale = value; }
+			get { return _scale.GetValueOrDefault(DefaultScale); }
+			set { _scale = value; }
 		}
 
 		public IValue Value
@@ -361,20 +361,20 @@ public IValue Value
 		/// </remarks>
 		public SqlType SqlTypeCode
 		{
-			get { return sqlTypeCode; }
-			set { sqlTypeCode = value; }
+			get { return _sqlTypeCode; }
+			set { _sqlTypeCode = value; }
 		}
 
 		public string Comment
 		{
-			get { return comment; }
-			set { comment = value; }
+			get { return _comment; }
+			set { _comment = value; }
 		}
 
 		public string DefaultValue
 		{
-			get { return defaultValue; }
-			set { defaultValue = value; }
+			get { return _defaultValue; }
+			set { _defaultValue = value; }
 		}
 
 		public string GetTemplate(Dialect.Dialect dialect, SQLFunctionRegistry functionRegistry)
@@ -384,7 +384,7 @@ public string GetTemplate(Dialect.Dialect dialect, SQLFunctionRegistry functionR
 
 		public override string ToString()
 		{
-			return string.Format("{0}({1})", GetType().FullName, name);
+			return string.Format("{0}({1})", GetType().FullName, _name);
 		}
 
 		public SqlType GetSqlTypeCode(IMapping mapping)
@@ -393,7 +393,7 @@ public SqlType GetSqlTypeCode(IMapping mapping)
 			try
 			{
 				SqlType sqltc = type.SqlTypes(mapping)[TypeIndex];
-				if (SqlTypeCode != null && SqlTypeCode != sqltc)
+				if (SqlTypeCode != null && !ReferenceEquals(SqlTypeCode, sqltc))
 				{
 					throw new MappingException(string.Format("SQLType code's does not match. mapped as {0} but is {1}", sqltc, SqlTypeCode));
 				}
@@ -402,14 +402,14 @@ public SqlType GetSqlTypeCode(IMapping mapping)
 			catch (Exception e)
 			{
 				throw new MappingException(string.Format("Could not determine type for column {0} of type {1}: {2}", 
-					name, type.GetType().FullName, e.GetType().FullName), e);
+					_name, type.GetType().FullName, e.GetType().FullName), e);
 			}
 		}
 
 		/// <summary>returns quoted name as it would be in the mapping file. </summary>
 		public string GetQuotedName()
 		{
-			return quoted ? '`' + name + '`' : name;
+			return _quoted ? '`' + _name + '`' : _name;
 		}
 
 		public bool IsCaracteristicsDefined()
@@ -419,39 +419,39 @@ public bool IsCaracteristicsDefined()
 
 		public bool IsPrecisionDefined()
 		{
-			return precision.HasValue || scale.HasValue;
+			return _precision.HasValue || _scale.HasValue;
 		}
 
 		public bool IsLengthDefined()
 		{
-			return length.HasValue;
+			return _length.HasValue;
 		}
 
 		#region ICloneable Members
 		/// <summary> Shallow copy, the value is not copied</summary>
 		public object Clone()
 		{
 			Column copy = new Column();
-			if (length.HasValue)
+			if (_length.HasValue)
 				copy.Length = Length;
-			if (precision.HasValue)
+			if (_precision.HasValue)
 				copy.Precision = Precision;
-			if (scale.HasValue)
+			if (_scale.HasValue)
 				copy.Scale = Scale;
 			copy.Value = _value;
-			copy.TypeIndex = typeIndex;
+			copy.TypeIndex = _typeIndex;
 			copy.Name = GetQuotedName();
-			copy.IsNullable = nullable;
-			copy.Unique = unique;
-			copy.SqlType = sqlType;
-			copy.SqlTypeCode = sqlTypeCode;
-			copy.uniqueInteger = uniqueInteger; //usually useless
-			copy.CheckConstraint = checkConstraint;
-			copy.Comment = comment;
-			copy.DefaultValue = defaultValue;
+			copy.IsNullable = _nullable;
+			copy.Unique = _unique;
+			copy.SqlType = _sqlType;
+			copy.SqlTypeCode = _sqlTypeCode;
+			copy.UniqueInteger = UniqueInteger; //usually useless
+			copy.CheckConstraint = _checkConstraint;
+			copy.Comment = _comment;
+			copy.DefaultValue = _defaultValue;
 			return copy;
 		}
 
 		#endregion
 	}
-}
+}

src/NHibernate/Mapping/Table.cs

@@ -581,11 +581,11 @@ public void AddColumn(Column column)
 			if (old == null)
 			{
 				columns[column.CanonicalName] = column;
-				column.uniqueInteger = columns.Count;
+				column.UniqueInteger = columns.Count;
 			}
 			else
 			{
-				column.uniqueInteger = old.uniqueInteger;
+				column.UniqueInteger = old.UniqueInteger;
 			}
 		}