Skip to content

Commit 9b5e54a

Browse files
committed
added sybase sql anywhere 12 config option + some tests for it
1 parent 5cffcc0 commit 9b5e54a

File tree

4 files changed

+60
-5
lines changed

4 files changed

+60
-5
lines changed
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using FluentNHibernate.Cfg.Db;
6+
using NHibernate;
7+
using NUnit.Framework;
8+
9+
namespace FluentNHibernate.Testing.Cfg.Db
10+
{
11+
[TestFixture]
12+
public class SqlAnywhereConfigurationTester
13+
{
14+
[Test]
15+
public void SqlAnywhere9_should_specify_SybaseAsa9_dialect()
16+
{
17+
SQLAnywhereConfiguration.SQLAnywhere9.ToProperties()["dialect"]
18+
.ShouldEqual("NHibernate.Dialect.SybaseASA9Dialect, " + typeof(ISession).Assembly.FullName);
19+
}
20+
21+
[Test]
22+
public void SqlAnywhere10_should_specify_Sybase10_dialect()
23+
{
24+
SQLAnywhereConfiguration.SQLAnywhere10.ToProperties()["dialect"]
25+
.ShouldEqual("NHibernate.Dialect.SybaseSQLAnywhere10Dialect, " + typeof(ISession).Assembly.FullName);
26+
}
27+
28+
[Test]
29+
public void SqlAnywhere11_should_specify_Sybase11_dialect()
30+
{
31+
SQLAnywhereConfiguration.SQLAnywhere11.ToProperties()["dialect"]
32+
.ShouldEqual("NHibernate.Dialect.SybaseSQLAnywhere11Dialect, " + typeof(ISession).Assembly.FullName);
33+
}
34+
35+
[Test]
36+
public void SqlAnywhere12_should_specify_Sybase12_dialect_and_net40driver()
37+
{
38+
var properties = SQLAnywhereConfiguration.SQLAnywhere12.ToProperties();
39+
properties["dialect"].ShouldEqual("NHibernate.Dialect.SybaseSQLAnywhere12Dialect, " + typeof(ISession).Assembly.FullName);
40+
properties["connection.driver_class"].ShouldEqual("NHibernate.Driver.SybaseSQLAnywhereDotNet4Driver, " + typeof(ISession).Assembly.FullName);
41+
}
42+
}
43+
}

src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<FileAlignment>512</FileAlignment>
1515
<SignAssembly>false</SignAssembly>
1616
<AssemblyOriginatorKeyFile>..\FluentKey.snk</AssemblyOriginatorKeyFile>
17-
<FileUpgradeFlags></FileUpgradeFlags>
17+
<FileUpgradeFlags>
18+
</FileUpgradeFlags>
1819
<OldToolsVersion>3.5</OldToolsVersion>
1920
<UpgradeBackupLocation />
2021
<PublishUrl>publish\</PublishUrl>
@@ -53,7 +54,8 @@
5354
<PlatformTarget>x86</PlatformTarget>
5455
<ErrorReport>prompt</ErrorReport>
5556
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
56-
<DocumentationFile></DocumentationFile>
57+
<DocumentationFile>
58+
</DocumentationFile>
5759
</PropertyGroup>
5860
<ItemGroup>
5961
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
@@ -123,6 +125,7 @@
123125
<Compile Include="AutoMapping\Overrides\ClassMappingOverrides.cs" />
124126
<Compile Include="AutoMapping\Overrides\CompositeIdOverrides.cs" />
125127
<Compile Include="AutoMapping\Overrides\HibernateMappingOverrides.cs" />
128+
<Compile Include="Cfg\Db\SqlAnywhereConfigurationTester.cs" />
126129
<Compile Include="DomainModel\Mapping\ManyToManySelfReferencedInverseIntegrationTester.cs" />
127130
<Compile Include="DomainModel\Mapping\MultipleKeyColumnsTester.cs" />
128131
<Compile Include="DomainModel\MemberAccessResolverTests.cs" />

src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhere.cs renamed to src/FluentNHibernate/Cfg/Db/SQLAnywhereConfiguration.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ public static SQLAnywhereConfiguration SQLAnywhere11
2929
{
3030
get { return new SQLAnywhereConfiguration().Dialect<SybaseSQLAnywhere11Dialect>(); }
3131
}
32-
#endif
32+
#endif
33+
34+
public static SQLAnywhereConfiguration SQLAnywhere12
35+
{
36+
get
37+
{
38+
return new SQLAnywhereConfiguration().Dialect<SybaseSQLAnywhere12Dialect>().Driver<SybaseSQLAnywhereDotNet4Driver>();
39+
}
40+
}
3341
}
3442
}

src/FluentNHibernate/FluentNHibernate.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<FileAlignment>512</FileAlignment>
1515
<SignAssembly>true</SignAssembly>
1616
<AssemblyOriginatorKeyFile>..\FluentKey.snk</AssemblyOriginatorKeyFile>
17-
<FileUpgradeFlags></FileUpgradeFlags>
17+
<FileUpgradeFlags>
18+
</FileUpgradeFlags>
1819
<OldToolsVersion>3.5</OldToolsVersion>
1920
<UpgradeBackupLocation />
2021
<PublishUrl>publish\</PublishUrl>
@@ -111,7 +112,7 @@
111112
<Compile Include="Automapping\Steps\HasManyToManyStep.cs" />
112113
<Compile Include="Automapping\Steps\CollectionStep.cs" />
113114
<Compile Include="Automapping\Steps\IAutomappingStep.cs" />
114-
<Compile Include="Cfg\Db\SybaseSQLAnywhere.cs" />
115+
<Compile Include="Cfg\Db\SQLAnywhereConfiguration.cs" />
115116
<Compile Include="Cfg\Db\SybaseSQLAnywhereConnectionStringBuilder.cs" />
116117
<Compile Include="Cfg\Db\IngresConfiguration.cs" />
117118
<Compile Include="Cfg\Db\IngresConnectionStringBuilder.cs" />

0 commit comments

Comments
 (0)