Using MappingTools.RelationCharacter where appropriate.

Author: RogerKratz

Src/NHibernate.Envers/Configuration/AuditEntitiesConfiguration.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using NHibernate.Envers.Tools;
 using NHibernate.Mapping;
 
 namespace NHibernate.Envers.Configuration
@@ -81,7 +82,7 @@ public string GetAuditEntityName(string referencingEntityName, string referenced
 		{
 			return string.Concat(_auditTablePrefix,
 							referencingEntityName.Substring(referencingEntityName.LastIndexOf(".") + 1),
-							"_",
+							MappingTools.RelationCharacter,
 							referencedEntityName.Substring(referencedEntityName.LastIndexOf(".") + 1),
 							_auditTableSuffix);
 		}

Src/NHibernate.Envers/Configuration/DefaultNamingStrategy.cs

@@ -1,4 +1,5 @@
 using System;
+using NHibernate.Envers.Tools;
 using NHibernate.Mapping;
 
 namespace NHibernate.Envers.Configuration
@@ -31,9 +32,9 @@ public virtual string UnidirectionOneToManyTableName(PersistentClass referencing
 			var referencingEntityName = referencingPersistentClass.EntityName;
 			return string.Concat(DefaultPrefix,
 										referencingEntityName.Substring(referencingEntityName.LastIndexOf(".") + 1),
-			                     "_",
+										MappingTools.RelationCharacter,
 										referencedEntityName.Substring(referencedEntityName.LastIndexOf(".") + 1),
-			                     DefaultSuffix);
+										DefaultSuffix);
 		}
 
 		public virtual string CollectionTableName(Mapping.Collection originalCollection)

Src/NHibernate.Envers/Configuration/Metadata/CollectionMetadataGenerator.cs

@@ -127,7 +127,7 @@ private void addOneToManyAttached(bool fakeOneToManyBidirectional)
 
 			// Generating the id mappers data for the referencing side of the relation.
 			var referencingIdData = createMiddleIdData(referencingIdMapping,
-					mappedBy + "_", _referencingEntityName);
+					mappedBy + MappingTools.RelationCharacter, _referencingEntityName);
 
 			// And for the referenced side. The prefixed mapper won't be used (as this collection isn't persisted
 			// in a join table, so the prefix value is arbitrary).
@@ -290,14 +290,14 @@ private void addWithMiddleTable()
 				// If the relation is inverse, then referencedEntityName is not null.
 				mappedBy = getMappedBy(_propertyValue.CollectionTable, _mainGenerator.Cfg.GetClassMapping(_referencedEntityName));
 
-				referencingPrefixRelated = mappedBy + "_";
+				referencingPrefixRelated = mappedBy + MappingTools.RelationCharacter;
 				referencedPrefix = StringTools.GetLastComponent(_referencedEntityName);
 			}
 			else
 			{
 				mappedBy = null;
 
-				referencingPrefixRelated = StringTools.GetLastComponent(_referencingEntityName) + "_";
+				referencingPrefixRelated = StringTools.GetLastComponent(_referencingEntityName) + MappingTools.RelationCharacter;
 				referencedPrefix = _referencedEntityName == null ? "element" : _propertyName;
 			}
 
@@ -415,7 +415,7 @@ private MiddleComponentData addValueToMiddleTable(IValue value, XElement xmlMapp
 			var type = value.Type;
 			if (type is ManyToOneType)
 			{
-				var prefixRelated = prefix + "_";
+				var prefixRelated = prefix + MappingTools.RelationCharacter;
 				var referencedEntityName = MappingTools.ReferencedEntityName(value);
 
 				var referencedIdMapping = _mainGenerator.GetReferencedIdMappingData(_referencingEntityName,

Src/NHibernate.Envers/Query/Criteria/CriteriaTools.cs

@@ -3,6 +3,7 @@
 using NHibernate.Envers.Exceptions;
 using NHibernate.Envers.Query.Property;
 using NHibernate.Envers.Reader;
+using NHibernate.Envers.Tools;
 
 namespace NHibernate.Envers.Query.Criteria
 {
@@ -58,7 +59,7 @@ public static string DeterminePropertyName(AuditConfiguration auditCfg, IAuditRe
 			{
 				return auditCfg.AuditEntCfg.OriginalIdPropName + "." + propertyName;
 			}
-			if (propertyName.StartsWith(idPropertyName + "_"))
+			if (propertyName.StartsWith(idPropertyName + MappingTools.RelationCharacter))
 			{
 				return auditCfg.AuditEntCfg.OriginalIdPropName + "." + propertyName.Substring(idPropertyName.Length + 1);
 			}