Skip to content

Commit

Permalink
merged latest changes from master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
chester89 committed Nov 13, 2013
2 parents 650e2f4 + 774297f commit 4fde193
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 10 deletions.
11 changes: 2 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

**/*.suo
**/*.user
**/*.sln*
Expand All @@ -12,24 +11,18 @@ build
*.DotSettings.user
*.csproj.user
src/packages
*.resharper.user

*.resharper.user
*.resharper

*.suo

*.cache

*~
*ncrunch*
*.ncrunchsolution
*.ncrunchproject
*.swp
TestResult.xml

src/packages/
TestResult.xml
build/

*.ncrunchsolution
*.ncrunchproject
packages/
6 changes: 6 additions & 0 deletions src/FluentNHibernate.Testing/Cfg/Db/DB2ConfigurationTester.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ public void DB2_should_default_to_the_DB2_dialect()
DB2Configuration.Standard.ToProperties()["dialect"].ShouldEqual("NHibernate.Dialect.DB2Dialect, " + typeof(ISession).Assembly.FullName);
}

[Test]
public void DB2_should_include_informix_dialect()
{
DB2Configuration.Informix1150.ToProperties()["dialect"].ShouldEqual("NHibernate.Dialect.InformixDialect1000, " + typeof(ISession).Assembly.FullName);
}

[Test]
public void DB2_driver_should_default_to_the_DB2_ClientDriver()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,12 @@ public void ShouldBeAbleToSpecifyConnectionStringDirectly()
.ConnectionString("conn")
.ToProperties().ShouldContain("connection.connection_string", "conn");
}

[Test]
public void MsSqlCe_should_include_40dialect()
{
MsSqlCeConfiguration.MsSqlCe40.ToProperties()["dialect"].ShouldEqual("NHibernate.Dialect.MsSqlCe40Dialect, " +
typeof(ISession).Assembly.FullName);
}
}
}
10 changes: 9 additions & 1 deletion src/FluentNHibernate/Cfg/Db/DB2Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,13 @@ public static DB2Configuration Standard
{
get { return new DB2Configuration().Dialect<DB2Dialect>(); }
}

/// <summary>
/// DB2 Data Server/Client supports Informix 11.50+ with Informix syntax
/// </summary>
public static DB2Configuration Informix1150
{
get { return new DB2Configuration().Dialect<InformixDialect1000>(); }
}
}
}
}
5 changes: 5 additions & 0 deletions src/FluentNHibernate/Cfg/Db/MsSqlCeConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,10 @@ public static MsSqlCeConfiguration Standard
{
get { return new MsSqlCeConfiguration().Dialect<MsSqlCeDialect>(); }
}

public static MsSqlCeConfiguration MsSqlCe40
{
get { return new MsSqlCeConfiguration().Dialect<MsSqlCe40Dialect>(); }
}
}
}

0 comments on commit 4fde193

Please sign in to comment.