Rename an existing property (to be squashed, and all my other commits too).

Renaming an existing property without causing a breaking change causes some bloat.

Author: fredericDelaporte

src/NHibernate/Async/Dialect/InformixDialect.cs

@@ -8,14 +8,15 @@
 //------------------------------------------------------------------------------
 
 
+using System;
 using System.Data;
 using System.Data.Common;
 using System.Text;
-using NHibernate.Cfg;
 using NHibernate.Dialect.Function;
 using NHibernate.Exceptions;
 using NHibernate.SqlCommand;
 using NHibernate.Util;
+using Environment = NHibernate.Cfg.Environment;
 
 //using NHibernate.Dialect.Schema;
 

src/NHibernate/Async/Loader/Hql/QueryLoader.cs

@@ -121,4 +121,4 @@ internal async Task<IEnumerable> GetEnumerableAsync(QueryParameters queryParamet
 			return result;
 		}
 	}
-}
+}

src/NHibernate/Dialect/Dialect.cs

@@ -529,19 +529,27 @@ public virtual string ForUpdateString
 		/// <summary>Is <c>FOR UPDATE OF</c> syntax supported?</summary>
 		/// <value><see langword="true"/> if the database supports <c>FOR UPDATE OF</c> syntax; <see langword="false"/> otherwise. </value>
 		public virtual bool SupportsForUpdateOf
-			// By default, just check ForUpdateOfColumns. ForUpdateOf needs to be overriden only for dialect suppoting
+			// By default, just check UsesColumnsWithForUpdateOf. ForUpdateOf needs to be overriden only for dialects supporting
 			// "For Update Of" on table aliases.
-			=> ForUpdateOfColumns;
+			=> UsesColumnsWithForUpdateOf;
 
 		/// <summary>Is <c>FOR UPDATE OF</c> syntax expecting columns?</summary>
 		/// <value><see langword="true"/> if the database expects a column list with <c>FOR UPDATE OF</c> syntax,
 		/// <see langword="false"/> if it expects table alias instead or do not support <c>FOR UPDATE OF</c> syntax.</value>
+		// Since v5.1
+		[Obsolete("Use UsesColumnsWithForUpdateOf instead")]
 		public virtual bool ForUpdateOfColumns
 		{
 			// by default we report no support
 			get { return false; }
 		}
 
+		public virtual bool UsesColumnsWithForUpdateOf
+#pragma warning disable 618
+			// For avoiding a breaking change, we need to call the old name by default.
+			=> ForUpdateOfColumns;
+#pragma warning restore 618
+
 		/// <summary> 
 		/// Does this dialect support <tt>FOR UPDATE</tt> in conjunction with outer joined rows?
 		/// </summary>

src/NHibernate/Dialect/InformixDialect.cs

@@ -1,11 +1,12 @@
+using System;
 using System.Data;
 using System.Data.Common;
 using System.Text;
-using NHibernate.Cfg;
 using NHibernate.Dialect.Function;
 using NHibernate.Exceptions;
 using NHibernate.SqlCommand;
 using NHibernate.Util;
+using Environment = NHibernate.Cfg.Environment;
 
 //using NHibernate.Dialect.Schema;
 
@@ -176,11 +177,18 @@ public override string AddColumnString
 		//}
 
 		/// <inheritdoc />
+		// Since v5.1
+		[Obsolete("Use UsesColumnsWithForUpdateOf instead")]
 		public override bool ForUpdateOfColumns
 		{
 			get { return true; }
 		}
 
+		/* 6.0 TODO: uncomment once ForUpdateOfColumns is removed.
+		/// <inheritdoc />
+		public override bool UsesColumnsWithForUpdateOf => true;
+		*/
+
 		/// <summary> 
 		/// Does this dialect support <tt>FOR UPDATE</tt> in conjunction with outer joined rows?
 		/// </summary>

src/NHibernate/Dialect/Oracle8iDialect.cs

@@ -485,11 +485,18 @@ public override bool UseMaxForLimit
 			get { return true; }
 		}
 
+		// Since v5.1
+		[Obsolete("Use UsesColumnsWithForUpdateOf instead")]
 		public override bool ForUpdateOfColumns
 		{
 			get { return true; }
 		}
 
+		/* 6.0 TODO: uncomment once ForUpdateOfColumns is removed.
+		/// <inheritdoc />
+		public override bool UsesColumnsWithForUpdateOf => true;
+		*/
+
 		public override bool SupportsUnionAll
 		{
 			get { return true; }

src/NHibernate/Dialect/SybaseSQLAnywhere10Dialect.cs

@@ -643,11 +643,29 @@ public override string GetForUpdateString(LockMode lockMode)
 		/// In this dialect, we avoid this issue by supporting only
 		/// <tt>FOR UPDATE BY LOCK</tt>.
 		/// </summary>
+		// Since v5.1
+		[Obsolete("Use UsesColumnsWithForUpdateOf instead")]
 		public override bool ForUpdateOfColumns
 		{
 			get { return false; }
 		}
 
+		/* 6.0 TODO: uncomment once ForUpdateOfColumns is removed.
+		/// <summary>
+		/// SQL Anywhere does support <c>FOR UPDATE OF</c> syntax. However,
+		/// in SQL Anywhere one cannot specify both <c>FOR UPDATE OF</c> syntax
+		/// and <c>FOR UPDATE BY LOCK</c> in the same statement. To achieve INTENT
+		/// locking when using <c>FOR UPDATE OF</c> syntax one must use a table hint
+		/// in the query's FROM clause, ie.
+		/// <code>
+		/// SELECT * FROM FOO WITH( UPDLOCK ) FOR UPDATE OF ( column-list ).
+		/// </code>
+		/// In this dialect, we avoid this issue by supporting only
+		/// <c>FOR UPDATE BY LOCK</c>.
+		/// </summary>
+		public override bool UsesColumnsWithForUpdateOf => false;
+		*/
+
 		/// <summary>
 		/// SQL Anywhere supports <tt>FOR UPDATE</tt> over cursors containing
 		/// outer joins.

src/NHibernate/Loader/Criteria/CriteriaLoader.cs

@@ -171,7 +171,7 @@ protected override SqlString ApplyLocks(SqlString sqlSelectString, IDictionary<s
 			}
 
 			Dictionary<string, LockMode> aliasedLockModes = new Dictionary<string, LockMode>();
-			Dictionary<string, string[]> keyColumnNames = dialect.ForUpdateOfColumns ? new Dictionary<string, string[]>() : null;
+			Dictionary<string, string[]> keyColumnNames = dialect.UsesColumnsWithForUpdateOf ? new Dictionary<string, string[]>() : null;
 			string[] drivingSqlAliases = Aliases;
 
 			//NH-3710: if we are issuing an aggregation function, Aliases will be null

src/NHibernate/Loader/Hql/QueryLoader.cs

@@ -71,7 +71,7 @@ protected override SqlString ApplyLocks(SqlString sql, IDictionary<string, LockM
 			// we are given a map of user-alias -> lock mode
 			// create a new map of sql-alias -> lock mode
 			var aliasedLockModes = new Dictionary<string, LockMode>();
-			Dictionary<string, string[]> keyColumnNames = dialect.ForUpdateOfColumns ? new Dictionary<string, string[]>() : null;
+			Dictionary<string, string[]> keyColumnNames = dialect.UsesColumnsWithForUpdateOf ? new Dictionary<string, string[]>() : null;
 
 			foreach (var entry in lockModes)
 			{
@@ -456,4 +456,4 @@ protected override IEnumerable<IParameterSpecification> GetParameterSpecificatio
 			return _queryTranslator.CollectedParameterSpecifications;
 		}
 	}
-}
+}

src/NHibernate/SqlCommand/ForUpdateFragment.cs

@@ -30,7 +30,7 @@ public ForUpdateFragment(Dialect.Dialect dialect, IDictionary<string, LockMode>
 				if (LockMode.Read.LessThan(lockMode))
 				{
 					string tableAlias = me.Key;
-					if (dialect.ForUpdateOfColumns)
+					if (dialect.UsesColumnsWithForUpdateOf)
 					{
 						string[] keyColumns = keyColumnNames[tableAlias];
 						if (keyColumns == null)
@@ -89,4 +89,4 @@ public string ToSqlStringFragment()
 					: dialect.GetForUpdateString(aliases.ToString());
 		}
 	}
-}
+}

src/NHibernate/SqlCommand/SqlSelectBuilder.cs

@@ -320,7 +320,7 @@ private string GetForUpdateString()
 					return string.Empty;
 				}
 
-				if (Dialect.ForUpdateOfColumns)
+				if (Dialect.UsesColumnsWithForUpdateOf)
 				{
 					log.Warn(
 						"Unimplemented 'for update' case: 'for update' query with an outer join using a dialect not" +