Skip to content

Commit eaea448

Browse files
committed
Fix tests which incorrectly fails with MsSql2012Dialect
1 parent c5058b2 commit eaea448

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
</drop>
3030
<dialect-scope name="NHibernate.Dialect.Oracle9Dialect"/>
3131
<dialect-scope name="NHibernate.Dialect.OracleDialect"/>
32-
<dialect-scope name="NHibernate.Dialect.Oracle8iDialect"/>
33-
<dialect-scope name="NHibernate.Dialect.Oracle9iDialect"/>
34-
<dialect-scope name="NHibernate.Dialect.Oracle10gDialect"/>
32+
<dialect-scope name="NHibernate.Dialect.Oracle8iDialect"/>
33+
<dialect-scope name="NHibernate.Dialect.Oracle9iDialect"/>
34+
<dialect-scope name="NHibernate.Dialect.Oracle10gDialect"/>
3535
</database-object>
3636

3737
<database-object>
@@ -50,7 +50,8 @@
5050
</drop>
5151
<dialect-scope name="NHibernate.Dialect.MsSql2000Dialect"/>
5252
<dialect-scope name="NHibernate.Dialect.MsSql2005Dialect"/>
53-
<dialect-scope name="NHibernate.Dialect.MsSql2008Dialect"/>
53+
<dialect-scope name="NHibernate.Dialect.MsSql2008Dialect"/>
54+
<dialect-scope name="NHibernate.Dialect.MsSql2012Dialect"/>
5455
</database-object>
5556

5657
<database-object>

src/NHibernate.Test/GeneratedTest/GeneratedPropertyEntity.hbm.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
</drop>
5858
<dialect-scope name="NHibernate.Dialect.MsSql2000Dialect"/>
5959
<dialect-scope name="NHibernate.Dialect.MsSql2005Dialect"/>
60-
<dialect-scope name="NHibernate.Dialect.MsSql2008Dialect"/>
60+
<dialect-scope name="NHibernate.Dialect.MsSql2008Dialect"/>
61+
<dialect-scope name="NHibernate.Dialect.MsSql2012Dialect"/>
6162
</database-object>
6263

6364
</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH1756/Mappings.hbm.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ DROP TRIGGER [dbo].[t_sack]
7878
</drop>
7979
<dialect-scope name="NHibernate.Dialect.MsSql2005Dialect"/>
8080
<dialect-scope name="NHibernate.Dialect.MsSql2008Dialect"/>
81+
<dialect-scope name="NHibernate.Dialect.MsSql2012Dialect"/>
8182
</database-object>
8283

8384
</hibernate-mapping>

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,19 @@ private IAuxiliaryDatabaseObject CreateHighLowScript(IEnumerable<System.Type> en
2626
{
2727
script.AppendLine(string.Format("INSERT INTO [NextHighVaues] (Entity, NextHigh) VALUES ('{0}',1);", entity.Name));
2828
}
29-
return new SimpleAuxiliaryDatabaseObject(script.ToString(), null, new HashedSet<string> { typeof(MsSql2000Dialect).FullName, typeof(MsSql2005Dialect).FullName, typeof(MsSql2008Dialect).FullName });
29+
var dialects = new HashedSet<string>
30+
{
31+
typeof (MsSql2000Dialect).FullName,
32+
typeof (MsSql2005Dialect).FullName,
33+
typeof (MsSql2008Dialect).FullName,
34+
typeof (MsSql2012Dialect).FullName
35+
};
36+
return new SimpleAuxiliaryDatabaseObject(script.ToString(), null, dialects);
3037
}
3138

3239
protected override bool AppliesTo(Dialect.Dialect dialect)
3340
{
34-
return (dialect is Dialect.MsSql2000Dialect);
41+
return (dialect is MsSql2000Dialect);
3542
}
3643

3744
[Test]

0 commit comments

Comments
 (0)