Skip to content

Commit f394a4a

Browse files
committed
Merge branch 'master' of github.com:jagregory/fluent-nhibernate into informixDialect
2 parents 1b99e86 + 138801e commit f394a4a

File tree

6 files changed

+25
-5
lines changed

6 files changed

+25
-5
lines changed

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ build
1111

1212
*.DotSettings.user
1313
*.csproj.user
14-
14+
*ncrunch*
1515
*.resharper.user
16-
16+
src/packages
1717
*.resharper
1818

1919
*.suo
@@ -26,4 +26,4 @@ build
2626
TestResult.xml
2727
*.ncrunchsolution
2828
*.ncrunchproject
29-
packages/
29+
packages/

src/Examples.FirstProject/Examples.FirstProject.csproj.user

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<ProjectView>ShowAllFiles</ProjectView>
4+
<ProjectView>ProjectFiles</ProjectView>
55
<PublishUrlHistory />
66
<InstallUrlHistory />
77
<SupportUrlHistory />

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/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
}

src/FluentNHibernate/Conventions/Inspections/Cascade.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class Cascade
99
public static readonly Cascade SaveUpdate = new Cascade("save-update");
1010
public static readonly Cascade Delete = new Cascade("delete");
1111
public static readonly Cascade Merge = new Cascade("merge");
12+
public static readonly Cascade Replicate = new Cascade("replicate");
1213

1314
private readonly string value;
1415

src/FluentNHibernate/Mapping/CascadeExpression.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ public TParent Merge()
5858
return parent;
5959
}
6060

61-
61+
/// <summary>
62+
/// Cascade on replication
63+
/// </summary>
64+
public TParent Replicate()
65+
{
66+
setter("replicate");
67+
return parent;
68+
}
6269
}
6370
}

0 commit comments

Comments
 (0)