JoinFragment: explicitly remove " and " clause

Author: bahusoid

src/NHibernate/Loader/OuterJoinableAssociation.cs

@@ -34,12 +34,7 @@ public OuterJoinableAssociation(IAssociationType joinableType, String lhsAlias,
 			rhsColumns = JoinHelper.GetRHSColumnNames(joinableType, factory);
 			on = new SqlString(joinableType.GetOnCondition(rhsAlias, factory, enabledFilters));
 			if (SqlStringHelper.IsNotEmpty(withClause))
-			{
-				on = on.Count == 0
-					? on.Append(withClause)
-					: on.Append(" and ( ").Append(withClause).Append(" )");
-			}
-
+				on = on.Append(" and ( ").Append(withClause).Append(" )");
 			this.enabledFilters = enabledFilters; // needed later for many-to-many/filter application
 		}
 
@@ -161,7 +156,7 @@ public void AddManyToManyJoin(JoinFragment outerjoin, IQueryableCollection colle
 			string manyToManyFilter = collection.GetManyToManyFilterFragment(rhsAlias, enabledFilters);
 			SqlString condition = string.Empty.Equals(manyToManyFilter)
 								? on
-								: SqlStringHelper.IsEmpty(on) ? new SqlString(manyToManyFilter) : 
+								: SqlStringHelper.IsEmpty(on) ? new SqlString(manyToManyFilter) :
 									on.Append(" and ").Append(manyToManyFilter);
 
 			outerjoin.AddJoin(joinable.TableName, rhsAlias, lhsColumns, rhsColumns, joinType, condition);

src/NHibernate/SqlCommand/ANSIJoinFragment.cs

@@ -42,7 +42,7 @@ public override void AddJoin(string tableName, string alias, string[] fkColumns,
 
 			if (fkColumns.Length == 0)
 			{
-				_fromFragment.Add(on);
+				AddBareCondition(_fromFragment, on);
 				return;
 			}
 

src/NHibernate/SqlCommand/JoinFragment.cs

@@ -58,11 +58,25 @@ protected bool AddCondition(SqlStringBuilder buffer, string on)
 			}
 		}
 
+		/// <summary>
+		/// Adds condition to buffer without adding " and " prefix. Existing " and" prefix is removed
+		/// </summary>
+		protected void AddBareCondition(SqlStringBuilder buffer, SqlString condition)
+		{
+			if (SqlStringHelper.IsEmpty(condition))
+				return;
+			
+			buffer.Add(
+				condition.StartsWithCaseInsensitive(" and ")
+					? condition.Substring(4)
+					: condition);
+		}
+
 		protected bool AddCondition(SqlStringBuilder buffer, SqlString on)
 		{
 			if (SqlStringHelper.IsNotEmpty(on))
 			{
-				if (buffer.Count > 0 && !on.StartsWithCaseInsensitive(" and"))
+				if (!on.StartsWithCaseInsensitive(" and"))
 				{
 					buffer.Add(" and ");
 				}