Skip to content

Commit a94796c

Browse files
committed
Merge pull request #205 from chester89/175additions
closing #175 completely
2 parents 9d37e28 + 8ee3d87 commit a94796c

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/IdConventionTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,13 @@ public void ShouldSetCustomGenerator()
153153
VerifyModel(x => x.Generator.Class.ShouldEqual(typeof(CustomGenerator).AssemblyQualifiedName));
154154
}
155155

156+
[Test]
157+
public void ShouldSetTriggerIdentityGenerator()
158+
{
159+
Convention(x => x.GeneratedBy.TriggerIdentity());
160+
161+
VerifyModel(x => x.Generator.Class.ShouldEqual("trigger-identity"));
162+
}
156163

157164
#region Helpers
158165

src/FluentNHibernate/Conventions/Instances/IGeneratorInstance.cs

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ namespace FluentNHibernate.Conventions.Instances
88
public interface IGeneratorInstance : IGeneratorInspector
99
{
1010
void Increment();
11-
void Increment(Action<ParamBuilder> paramValue);
11+
void Increment(Action<ParamBuilder> paramValues);
1212
void Identity();
13-
void Identity(Action<ParamBuilder> paramValue);
13+
void Identity(Action<ParamBuilder> paramValues);
1414
void Sequence(string sequenceName);
1515
void Sequence(string sequenceName, Action<ParamBuilder> paramValues);
16-
void HiLo(string talbe, string column, string maxLo);
17-
void HiLo(string talbe, string column, string maxLo, Action<ParamBuilder> paramValues);
16+
void HiLo(string table, string column, string maxLo, string where);
17+
void HiLo(string table, string column, string maxLo);
18+
void HiLo(string table, string column, string maxLo, Action<ParamBuilder> paramValues);
1819
void HiLo(string maxLo);
1920
void HiLo(string maxLo, Action<ParamBuilder> paramValues);
2021
void SeqHiLo(string sequence, string maxLo);
@@ -31,6 +32,8 @@ public interface IGeneratorInstance : IGeneratorInspector
3132
void Assigned(Action<ParamBuilder> paramValues);
3233
void Native();
3334
void Native(Action<ParamBuilder> paramValues);
35+
void Native(string sequenceName);
36+
void Native(string sequenceName, Action<ParamBuilder> paramValues);
3437
void Foreign(string property);
3538
void Foreign(string property, Action<ParamBuilder> paramValues);
3639
void Custom<T>() where T : IIdentifierGenerator;
@@ -39,8 +42,15 @@ public interface IGeneratorInstance : IGeneratorInspector
3942
void Custom<T>(Action<ParamBuilder> paramValues) where T : IIdentifierGenerator;
4043
void Custom(Type generator, Action<ParamBuilder> paramValues);
4144
void Custom(string generator, Action<ParamBuilder> paramValues);
42-
void Native(string sequenceName);
43-
void Native(string sequenceName, Action<ParamBuilder> paramValues);
45+
void GuidNative();
46+
void GuidNative(Action<ParamBuilder> paramValues);
47+
void Select();
48+
void Select(Action<ParamBuilder> paramValues);
49+
void SequenceIdentity();
50+
void SequenceIdentity(string sequence);
51+
void SequenceIdentity(Action<ParamBuilder> paramValues);
52+
void SequenceIdentity(string sequence, Action<ParamBuilder> paramValues);
4453
void TriggerIdentity();
54+
void TriggerIdentity(Action<ParamBuilder> paramValues);
4555
}
4656
}

0 commit comments

Comments
 (0)