Remove dialect instantiation in AddDeserializedMapping

src/NHibernate.Test/Async/NHSpecificTest/NH1007/Fixture.cs

@@ -60,13 +60,12 @@ public async Task MappingIdGeneratorWithAttributeTakesPrecendenceOverMappingWith
 
 		private void VerifyMapping(HbmMapping mapping)
 		{
-			var dialect = new MsSql2008Dialect();
 			var configuration = new Configuration();
-			var mappings = configuration.CreateMappings(dialect);
+			var mappings = configuration.CreateMappings();
 			mappings.DefaultAssembly = "NHibernate.Test";
 			mappings.DefaultNamespace = "NHibernate.Test.NHSpecificTest.NH1007";
 
-			var rootBinder = new MappingRootBinder(mappings, dialect);
+			var rootBinder = new MappingRootBinder(mappings);
 			rootBinder.Bind(mapping);
 
 			var employer = rootBinder.Mappings.GetClass("NHibernate.Test.NHSpecificTest.NH1007.Employer1");

src/NHibernate.Test/Bytecode/Lightweight/BytecodeProviderFixture.cs

@@ -131,8 +131,7 @@ public void AllowCustomCollectionTypeFactoryBeforeBuildFirstMapping()
 			// "mapping-sources" is better to limitate the moment of injectability.
 			var cfg = TestConfigurationHelper.GetDefaultConfiguration();
 			cfg.SetProperty(Environment.CollectionTypeFactoryClass, typeof(CustomCollectionTypeFactory).AssemblyQualifiedName);
-			Dialect.Dialect dialect = Dialect.Dialect.GetDialect(cfg.Properties);
-			cfg.CreateMappings(dialect);
+			cfg.CreateMappings();
 			Assert.That(Environment.BytecodeProvider.CollectionTypeFactory, Is.TypeOf<CustomCollectionTypeFactory>());
 		}
 

src/NHibernate.Test/CfgTest/ConfigurationAddMappingEvents.cs

@@ -53,7 +53,6 @@ public void WhenSubscribedToBeforeBindThenRaiseEventForEachMapping()
 			Assert.That(listOfCalls.Count, Is.EqualTo(2));
 			Assert.That(listOfCalls.Select(x => x.FileName).All(x => x != null), Is.True);
 			Assert.That(listOfCalls.Select(x => x.Mapping).All(x => x != null), Is.True);
-			Assert.That(listOfCalls.Select(x => x.Dialect).All(x => x.GetType() == typeof (MsSql2008Dialect)), Is.True);
 		}
 
 		[Test]
@@ -70,7 +69,6 @@ public void WhenSubscribedToAfterBindThenRaiseEventForEachMapping()
 			Assert.That(listOfCalls.Count, Is.EqualTo(2));
 			Assert.That(listOfCalls.Select(x => x.FileName).All(x => x != null), Is.True);
 			Assert.That(listOfCalls.Select(x => x.Mapping).All(x => x != null), Is.True);
-			Assert.That(listOfCalls.Select(x => x.Dialect).All(x => x.GetType() == typeof(MsSql2008Dialect)), Is.True);
 		}
 	}
 }

src/NHibernate.Test/CfgTest/Loquacious/TypeDefinitionFixture.cs

@@ -19,7 +19,7 @@ public void AddTypeDef()
 			                                             		c.Alias = "HighLow";
 			                                             		c.Properties = new {max_lo = 99};
 			                                             	});
-			var mappings = configure.CreateMappings(Dialect.Dialect.GetDialect(configure.Properties));
+			var mappings = configure.CreateMappings();
 			var typeDef = mappings.GetTypeDef("HighLow");
 			Assert.That(typeDef, Is.Not.Null);
 			Assert.That(typeDef.Parameters["max_lo"], Is.EqualTo("99"));

src/NHibernate.Test/NHSpecificTest/AliasFixture.cs

@@ -11,16 +11,44 @@ public class AliasFixture
 		[Test]
 		public void NoLeadingUnderscores()
 		{
-			Alias alias = new Alias("suffix");
+			var alias = new Alias("suffix");
 			Dialect.Dialect dialect = new MsSql2000Dialect();
 
-			Assert.IsFalse(
-				alias.ToAliasString("__someIdentifier", dialect)
-					.StartsWith("_"));
+			Assert.That(alias.ToAliasString("__someIdentifier", dialect), Does.Not.StartWith("_"));
 
-			Assert.IsFalse(
-				alias.ToUnquotedAliasString("__someIdentifier", dialect)
-					.StartsWith("_"));
+			Assert.That(alias.ToUnquotedAliasString("__someIdentifier", dialect), Does.Not.StartsWith("_"));
+		}
+
+		[Test]
+		public void TestDialectQuotedAlias()
+		{
+			var alias = new Alias(15, "PK");
+			var aliasString = alias.ToAliasString("[Hello]]World]", new MsSql2000Dialect());
+			Assert.That(aliasString, Is.EqualTo("[Hello]]WorldPK]"));
+		}
+
+		[Test]
+		public void TestDialectQuotedAliasWithEscapedStringAtTheEdge()
+		{
+			var alias = new Alias(15, "PK");
+			var aliasString = alias.ToAliasString("[Table0123456]]7890]", new MsSql2000Dialect());
+			Assert.That(aliasString, Is.EqualTo("[Table0123456]]PK]"));
+		}
+
+		[Test]
+		public void TestQuotedAlias()
+		{
+			var alias = new Alias(15, "PK");
+			var aliasString = alias.ToAliasString("[Hello]]World]");
+			Assert.That(aliasString, Is.EqualTo("[Hello]]WorldPK]"));
+		}
+
+		[Test]
+		public void TestQuotedAliasWithEscapedStringAtTheEdge()
+		{
+			var alias = new Alias(15, "PK");
+			var aliasString = alias.ToAliasString("[Table0123456]]7890]");
+			Assert.That(aliasString, Is.EqualTo("[Table0123456PK]"));
 		}
 	}
 }

src/NHibernate.Test/NHSpecificTest/NH1007/Fixture.cs

@@ -84,13 +84,12 @@ public void ConfiguringIdGeneratorUsingAttributeAndElementIsEquivalent()
 
 		private void VerifyMapping(HbmMapping mapping)
 		{
-			var dialect = new MsSql2008Dialect();
 			var configuration = new Configuration();
-			var mappings = configuration.CreateMappings(dialect);
+			var mappings = configuration.CreateMappings();
 			mappings.DefaultAssembly = "NHibernate.Test";
 			mappings.DefaultNamespace = "NHibernate.Test.NHSpecificTest.NH1007";
 
-			var rootBinder = new MappingRootBinder(mappings, dialect);
+			var rootBinder = new MappingRootBinder(mappings);
 			rootBinder.Bind(mapping);
 
 			var employer = rootBinder.Mappings.GetClass("NHibernate.Test.NHSpecificTest.NH1007.Employer1");

src/NHibernate.Test/NHSpecificTest/NH2041/Fixture.cs

@@ -12,7 +12,7 @@ public void WhenJoinTableContainComponentsThenColumnsShouldBeInJoinedTable()
 		{
 			Configuration cfg = TestConfigurationHelper.GetDefaultConfiguration();
 			cfg.AddResource("NHibernate.Test.NHSpecificTest.NH2041.Mappings.hbm.xml", GetType().Assembly);
-			var mappings = cfg.CreateMappings(Dialect.Dialect.GetDialect(cfg.Properties));
+			var mappings = cfg.CreateMappings();
 			var table = mappings.GetTable(null, null, "Locations");
 			Assert.That(table, Is.Not.Null);
 			Assert.That(table.ColumnIterator.Select(c => c.Name), Is.EquivalentTo(new [] {"myclassId", "latitudecol", "longitudecol"}));

src/NHibernate.Test/NHSpecificTest/NH2569/Fixture.cs

@@ -30,7 +30,7 @@ public void WhenMapHiloToDifferentSchemaThanClassThenIdHasTheMappedSchema()
 			conf.DataBaseIntegration(x=> x.Dialect<MsSql2008Dialect>());
 			conf.AddDeserializedMapping(mapper.CompileMappingForAllExplicitlyAddedEntities(), "wholeDomain");
 
-			var mappings = conf.CreateMappings(Dialect.Dialect.GetDialect());
+			var mappings = conf.CreateMappings();
 			var pc = mappings.GetClass(typeof(MyClass).FullName);
 			Assert.That(((SimpleValue)pc.Identifier).IdentifierGeneratorProperties["schema"], Is.EqualTo("gSchema"));
 		}

src/NHibernate.Test/NHSpecificTest/NH2761/Fixture.cs

@@ -23,7 +23,7 @@ public void WhenMultipleConfigurationUseSameMappingsThenConstraintsHasSameNames(
 		private Mappings GetMappings()
 		{
 			var configuration = GetConfiguration();
-			return configuration.CreateMappings(Dialect.Dialect.GetDialect(configuration.Properties));
+			return configuration.CreateMappings();
 		}
 
 		private Configuration GetConfiguration()

src/NHibernate.Test/NHSpecificTest/NH3153/Fixture.cs

@@ -17,7 +17,7 @@ public void ShouldGetIdentifierSchemaFromClassElement()
 			var conf = TestConfigurationHelper.GetDefaultConfiguration();
 			conf.AddResource("NHibernate.Test.NHSpecificTest.NH3153.SchemaInClass.hbm.xml", typeof(A).Assembly);
 
-			var mappings = conf.CreateMappings(Dialect.Dialect.GetDialect());
+			var mappings = conf.CreateMappings();
 
 			var pc = mappings.GetClass(typeof(A).FullName);
 			Assert.That(((SimpleValue)pc.Identifier).IdentifierGeneratorProperties["schema"], Is.EqualTo("Test"));
@@ -30,7 +30,7 @@ public void ShouldGetIdentifierSchemaFromMappingElement()
 			var conf = TestConfigurationHelper.GetDefaultConfiguration();
 			conf.AddResource("NHibernate.Test.NHSpecificTest.NH3153.SchemaInMapping.hbm.xml", typeof(A).Assembly);
 
-			var mappings = conf.CreateMappings(Dialect.Dialect.GetDialect());
+			var mappings = conf.CreateMappings();
 
 			var pc = mappings.GetClass(typeof(A).FullName);
 			Assert.That(((SimpleValue)pc.Identifier).IdentifierGeneratorProperties["schema"], Is.EqualTo("Test"));

src/NHibernate/Cfg/BindMappingEventArgs.cs

@@ -3,17 +3,28 @@
 
 namespace NHibernate.Cfg
 {
-	public class BindMappingEventArgs: EventArgs
+	public class BindMappingEventArgs : EventArgs
 	{
+		//6.0 TODO: Remove
+		internal Lazy<Dialect.Dialect> LazyDialect;
+
+		[Obsolete("Please use constructor without a dialect parameter.")]
 		public BindMappingEventArgs(Dialect.Dialect dialect, HbmMapping mapping, string fileName)
+			: this(mapping, fileName)
+		{
+			LazyDialect = new Lazy<Dialect.Dialect>(() => dialect);
+		}
+
+		public BindMappingEventArgs(HbmMapping mapping, string fileName)
 		{
-			Dialect = dialect;
 			Mapping = mapping;
 			FileName = fileName;
 		}
 
-		public Dialect.Dialect Dialect { get; private set; }
-		public HbmMapping Mapping { get; private set; }
-		public string FileName { get; private set; }
+		//Since v5.2
+		[Obsolete("This property will be removed in a future version.")]
+		public Dialect.Dialect Dialect => LazyDialect.Value;
+		public HbmMapping Mapping { get; }
+		public string FileName { get; }
 	}
 }

src/NHibernate/Cfg/Configuration.cs

@@ -518,12 +518,12 @@ public void AddDeserializedMapping(HbmMapping mappingDocument, string documentFi
 			}
 			try
 			{
-				Dialect.Dialect dialect = Dialect.Dialect.GetDialect(properties);
-				OnBeforeBindMapping(new BindMappingEventArgs(dialect, mappingDocument, documentFileName));
-				Mappings mappings = CreateMappings(dialect);
-
-				new MappingRootBinder(mappings, dialect).Bind(mappingDocument);
-				OnAfterBindMapping(new BindMappingEventArgs(dialect, mappingDocument, documentFileName));
+				var dialect = new Lazy<Dialect.Dialect>(() => Dialect.Dialect.GetDialect(properties));
+				OnBeforeBindMapping(new BindMappingEventArgs(mappingDocument, documentFileName) {LazyDialect = dialect});
+				var mappings = CreateMappings();
+				mappings.LazyDialect = dialect;
+				new MappingRootBinder(mappings).Bind(mappingDocument);
+				OnAfterBindMapping(new BindMappingEventArgs(mappingDocument, documentFileName) {LazyDialect = dialect});
 			}
 			catch (Exception e)
 			{
@@ -561,7 +561,16 @@ private void OnBeforeBindMapping(BindMappingEventArgs bindMappingEventArgs)
 		/// Create a new <see cref="Mappings" /> to add classes and collection
 		/// mappings to.
 		/// </summary>
+		//Since v5.2
+		[Obsolete("Please use overload without a dialect parameter.")]
 		public Mappings CreateMappings(Dialect.Dialect dialect)
+		{
+			var mappings = CreateMappings();
+			mappings.LazyDialect = new Lazy<Dialect.Dialect>(() => dialect);
+			return mappings;
+		}
+
+		public Mappings CreateMappings()
 		{
 			string defaultCatalog = PropertiesHelper.GetString(Environment.DefaultCatalog, properties, null);
 			string defaultSchema = PropertiesHelper.GetString(Environment.DefaultSchema, properties, null);
@@ -571,7 +580,7 @@ public Mappings CreateMappings(Dialect.Dialect dialect)
 			return new Mappings(classes, collections, tables, NamedQueries, NamedSQLQueries, SqlResultSetMappings, Imports,
 								secondPasses, filtersSecondPasses, propertyReferences, namingStrategy, typeDefs, FilterDefinitions, extendsQueue,
 								auxiliaryDatabaseObjects, tableNameBinding, columnNameBindingPerTable, defaultAssembly,
-								defaultNamespace, defaultCatalog, defaultSchema, preferPooledValuesLo, dialect);
+								defaultNamespace, defaultCatalog, defaultSchema, preferPooledValuesLo);
 		}
 
 		private void ProcessPreMappingBuildProperties()

src/NHibernate/Cfg/ConfigurationExtensions.cs

@@ -139,7 +139,8 @@ public static Configuration TypeDefinition<TDef>(this Configuration configuratio
 			{
 				return configuration;
 			}
-			var mappings = GetMappings(configuration);
+			var mappings = configuration.CreateMappings();
+			mappings.LazyDialect = new Lazy<Dialect.Dialect>(() => Dialect.Dialect.GetDialect(configuration.Properties));
 			mappings.AddTypeDef(tdConfiguration.Alias, typeof(TDef).AssemblyQualifiedName, tdConfiguration.Properties.ToTypeParameters());
 			return configuration;
 		}
@@ -163,11 +164,5 @@ public static Configuration AddNamedQuery(this Configuration configuration, stri
 			configuration.NamedQueries.Add(queryIdentifier, builder.Build());
 			return configuration;
 		}
-
-		private static Mappings GetMappings(Configuration configuration)
-		{
-			Dialect.Dialect dialect = Dialect.Dialect.GetDialect(configuration.Properties);
-			return configuration.CreateMappings(dialect);
-		}
 	}
 }

src/NHibernate/Cfg/Mappings.cs

@@ -60,7 +60,6 @@ public sealed class PropertyReference
 		private string catalogName;
 		private string defaultCascade;
 		private string defaultNamespace;
-		private readonly Dialect.Dialect dialect;
 		private string defaultAssembly;
 		private string defaultAccess;
 		private bool autoImport;
@@ -89,6 +88,11 @@ public sealed class PropertyReference
 		/// </summary>
 		protected internal IDictionary<string, TableDescription> tableNameBinding;
 
+		//6.0 TODO: Remove
+		internal Lazy<Dialect.Dialect> LazyDialect;
+
+		//Since v5.2
+		[Obsolete("Please use constructor without a dialect parameter.")]
 		protected internal Mappings(
 			IDictionary<string, PersistentClass> classes,
 			IDictionary<string, Mapping.Collection> collections,
@@ -112,7 +116,57 @@ protected internal Mappings(
 			string defaultCatalog,
 			string defaultSchema,
 			string preferPooledValuesLo,
-			Dialect.Dialect dialect)
+			Dialect.Dialect dialect) :
+			this(
+				classes,
+				collections,
+				tables,
+				queries,
+				sqlqueries,
+				resultSetMappings,
+				imports,
+				secondPasses,
+				filtersSecondPasses,
+				propertyReferences,
+				namingStrategy,
+				typeDefs,
+				filterDefinitions,
+				extendsQueue,
+				auxiliaryDatabaseObjects,
+				tableNameBinding,
+				columnNameBindingPerTable,
+				defaultAssembly,
+				defaultNamespace,
+				defaultCatalog,
+				defaultSchema,
+				preferPooledValuesLo)
+		{
+			LazyDialect = new Lazy<Dialect.Dialect>(() => dialect);
+		}
+
+		protected internal Mappings(
+			IDictionary<string, PersistentClass> classes,
+			IDictionary<string, Mapping.Collection> collections,
+			IDictionary<string, Table> tables,
+			IDictionary<string, NamedQueryDefinition> queries,
+			IDictionary<string, NamedSQLQueryDefinition> sqlqueries,
+			IDictionary<string, ResultSetMappingDefinition> resultSetMappings,
+			IDictionary<string, string> imports,
+			IList<SecondPassCommand> secondPasses,
+			Queue<FilterSecondPassArgs> filtersSecondPasses,
+			IList<PropertyReference> propertyReferences,
+			INamingStrategy namingStrategy,
+			IDictionary<string, TypeDef> typeDefs,
+			IDictionary<string, FilterDefinition> filterDefinitions,
+			ISet<ExtendsQueueEntry> extendsQueue,
+			IList<IAuxiliaryDatabaseObject> auxiliaryDatabaseObjects,
+			IDictionary<string, TableDescription> tableNameBinding,
+			IDictionary<Table, ColumnNames> columnNameBindingPerTable,
+			string defaultAssembly,
+			string defaultNamespace,
+			string defaultCatalog,
+			string defaultSchema,
+			string preferPooledValuesLo)
 		{
 			this.classes = classes;
 			this.collections = collections;
@@ -135,7 +189,6 @@ protected internal Mappings(
 			DefaultCatalog = defaultCatalog;
 			DefaultSchema = defaultSchema;
 			PreferPooledValuesLo = preferPooledValuesLo;
-			this.dialect = dialect;
 			this.filtersSecondPasses = filtersSecondPasses;
 		}
 
@@ -183,10 +236,9 @@ public PersistentClass GetClass(string className)
 			return result;
 		}
 
-		public Dialect.Dialect Dialect
-		{
-			get { return dialect; }
-		}
+		//Since v5.2
+		[Obsolete("This property will be removed in a future version.")]
+		public Dialect.Dialect Dialect => LazyDialect.Value;
 
 		/// <summary>
 		/// 
@@ -260,7 +312,7 @@ public void AddImport(string className, string rename)
 
 		public Table AddTable(string schema, string catalog, string name, string subselect, bool isAbstract, string schemaAction)
 		{
-			string key = subselect ?? dialect.Qualify(catalog, schema, name);
+			string key = subselect ?? BuildTableNameKey(catalog, schema, name);
 			Table table;
 			if (!tables.TryGetValue(key, out table))
 			{
@@ -327,7 +379,7 @@ private static SchemaAction GetSchemaActions(string schemaAction)
 
 		public Table AddDenormalizedTable(string schema, string catalog, string name, bool isAbstract, string subselect, Table includedTable)
 		{
-			string key = subselect ?? dialect.Qualify(schema, catalog, name);
+			string key = subselect ?? BuildTableNameKey(schema, catalog, name);
 
 			Table table = new DenormalizedTable(includedTable)
 			              	{
@@ -370,7 +422,7 @@ public void AddTableBinding(string schema, string catalog, string logicalName, s
 
 		public Table GetTable(string schema, string catalog, string name)
 		{
-			string key = dialect.Qualify(catalog, schema, name);
+			string key = BuildTableNameKey(catalog, schema, name);
 			return tables[key];
 		}