Skip to content

Commit 4fde193

Browse files
committed
merged latest changes from master branch
2 parents 650e2f4 + 774297f commit 4fde193

File tree

5 files changed

+29
-10
lines changed

5 files changed

+29
-10
lines changed

.gitignore

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
**/*.suo
32
**/*.user
43
**/*.sln*
@@ -12,24 +11,18 @@ build
1211
*.DotSettings.user
1312
*.csproj.user
1413
src/packages
15-
*.resharper.user
1614

15+
*.resharper.user
1716
*.resharper
1817

1918
*.suo
20-
2119
*.cache
22-
2320
*~
21+
*ncrunch*
2422
*.ncrunchsolution
2523
*.ncrunchproject
2624
*.swp
2725
TestResult.xml
2826

29-
src/packages/
3027
TestResult.xml
3128
build/
32-
33-
*.ncrunchsolution
34-
*.ncrunchproject
35-
packages/

src/FluentNHibernate.Testing/Cfg/Db/DB2ConfigurationTester.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ public void DB2_should_default_to_the_DB2_dialect()
1313
DB2Configuration.Standard.ToProperties()["dialect"].ShouldEqual("NHibernate.Dialect.DB2Dialect, " + typeof(ISession).Assembly.FullName);
1414
}
1515

16+
[Test]
17+
public void DB2_should_include_informix_dialect()
18+
{
19+
DB2Configuration.Informix1150.ToProperties()["dialect"].ShouldEqual("NHibernate.Dialect.InformixDialect1000, " + typeof(ISession).Assembly.FullName);
20+
}
21+
1622
[Test]
1723
public void DB2_driver_should_default_to_the_DB2_ClientDriver()
1824
{

src/FluentNHibernate.Testing/Cfg/Db/MsSqlCeConfigurationTester.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,12 @@ public void ShouldBeAbleToSpecifyConnectionStringDirectly()
2121
.ConnectionString("conn")
2222
.ToProperties().ShouldContain("connection.connection_string", "conn");
2323
}
24+
25+
[Test]
26+
public void MsSqlCe_should_include_40dialect()
27+
{
28+
MsSqlCeConfiguration.MsSqlCe40.ToProperties()["dialect"].ShouldEqual("NHibernate.Dialect.MsSqlCe40Dialect, " +
29+
typeof(ISession).Assembly.FullName);
30+
}
2431
}
2532
}

src/FluentNHibernate/Cfg/Db/DB2Configuration.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,13 @@ public static DB2Configuration Standard
1414
{
1515
get { return new DB2Configuration().Dialect<DB2Dialect>(); }
1616
}
17+
18+
/// <summary>
19+
/// DB2 Data Server/Client supports Informix 11.50+ with Informix syntax
20+
/// </summary>
21+
public static DB2Configuration Informix1150
22+
{
23+
get { return new DB2Configuration().Dialect<InformixDialect1000>(); }
24+
}
1725
}
18-
}
26+
}

src/FluentNHibernate/Cfg/Db/MsSqlCeConfiguration.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,10 @@ public static MsSqlCeConfiguration Standard
1414
{
1515
get { return new MsSqlCeConfiguration().Dialect<MsSqlCeDialect>(); }
1616
}
17+
18+
public static MsSqlCeConfiguration MsSqlCe40
19+
{
20+
get { return new MsSqlCeConfiguration().Dialect<MsSqlCe40Dialect>(); }
21+
}
1722
}
1823
}

0 commit comments

Comments
 (0)