Skip to content

Commit 3ed2109

Browse files
committed
Remove dialect instantiation in AddDeserializedMapping
1 parent 7ab33b5 commit 3ed2109

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

src/NHibernate.Test/CfgTest/ConfigurationAddMappingEvents.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public void WhenSubscribedToBeforeBindThenRaiseEventForEachMapping()
5353
Assert.That(listOfCalls.Count, Is.EqualTo(2));
5454
Assert.That(listOfCalls.Select(x => x.FileName).All(x => x != null), Is.True);
5555
Assert.That(listOfCalls.Select(x => x.Mapping).All(x => x != null), Is.True);
56-
Assert.That(listOfCalls.Select(x => x.Dialect).All(x => x.GetType() == typeof (MsSql2008Dialect)), Is.True);
5756
}
5857

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

src/NHibernate/Cfg/BindMappingEventArgs.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,22 @@ namespace NHibernate.Cfg
55
{
66
public class BindMappingEventArgs: EventArgs
77
{
8-
public BindMappingEventArgs(Dialect.Dialect dialect, HbmMapping mapping, string fileName)
8+
[Obsolete("Please use constructor without a dialect parameter.", true)]
9+
public BindMappingEventArgs(Dialect.Dialect dialect, HbmMapping mapping, string fileName) : this(mapping, fileName)
910
{
1011
Dialect = dialect;
12+
}
13+
14+
public BindMappingEventArgs(HbmMapping mapping, string fileName)
15+
{
1116
Mapping = mapping;
1217
FileName = fileName;
1318
}
1419

15-
public Dialect.Dialect Dialect { get; private set; }
16-
public HbmMapping Mapping { get; private set; }
17-
public string FileName { get; private set; }
20+
//Since v5.2
21+
[Obsolete("This property will be removed in a future version.", true)]
22+
public Dialect.Dialect Dialect { get; }
23+
public HbmMapping Mapping { get; }
24+
public string FileName { get; }
1825
}
1926
}

src/NHibernate/Cfg/Configuration.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -518,12 +518,11 @@ public void AddDeserializedMapping(HbmMapping mappingDocument, string documentFi
518518
}
519519
try
520520
{
521-
Dialect.Dialect dialect = Dialect.Dialect.GetDialect(properties);
522-
OnBeforeBindMapping(new BindMappingEventArgs(dialect, mappingDocument, documentFileName));
521+
OnBeforeBindMapping(new BindMappingEventArgs(mappingDocument, documentFileName));
523522
Mappings mappings = CreateMappings();
524523

525524
new MappingRootBinder(mappings).Bind(mappingDocument);
526-
OnAfterBindMapping(new BindMappingEventArgs(dialect, mappingDocument, documentFileName));
525+
OnAfterBindMapping(new BindMappingEventArgs(mappingDocument, documentFileName));
527526
}
528527
catch (Exception e)
529528
{

0 commit comments

Comments
 (0)