Skip to content

Commit

Permalink
Review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajcvickers
ajcvickers committed Jul 26, 2022
1 parent 11230ef commit 4806c15
Show file tree
Hide file tree
Showing 23 changed files with 121 additions and 120 deletions.
10 changes: 5 additions & 5 deletions src/EFCore.SqlServer/Design/Internal/SqlServerAnnotationCodeGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ private static readonly MethodInfo ModelUseHiLoMethodInfo
= typeof(SqlServerModelBuilderExtensions).GetRuntimeMethod(
nameof(SqlServerModelBuilderExtensions.UseHiLo), new[] { typeof(ModelBuilder), typeof(string), typeof(string) })!;

private static readonly MethodInfo ModelUseKeySequenceMethodInfo
private static readonly MethodInfo ModelUseKeySequencesMethodInfo
= typeof(SqlServerModelBuilderExtensions).GetRuntimeMethod(
nameof(SqlServerModelBuilderExtensions.UseKeySequence), new[] { typeof(ModelBuilder), typeof(string), typeof(string) })!;
nameof(SqlServerModelBuilderExtensions.UseKeySequences), new[] { typeof(ModelBuilder), typeof(string), typeof(string) })!;

private static readonly MethodInfo ModelHasDatabaseMaxSizeMethodInfo
= typeof(SqlServerModelBuilderExtensions).GetRuntimeMethod(
Expand Down Expand Up @@ -63,9 +63,9 @@ private static readonly MethodInfo PropertyUseHiLoMethodInfo
= typeof(SqlServerPropertyBuilderExtensions).GetRuntimeMethod(
nameof(SqlServerPropertyBuilderExtensions.UseHiLo), new[] { typeof(PropertyBuilder), typeof(string), typeof(string) })!;

private static readonly MethodInfo PropertyUseKeySequenceMethodInfo
private static readonly MethodInfo PropertyUseSequenceMethodInfo
= typeof(SqlServerPropertyBuilderExtensions).GetRuntimeMethod(
nameof(SqlServerPropertyBuilderExtensions.UseKeySequence), new[] { typeof(PropertyBuilder), typeof(string), typeof(string) })!;
nameof(SqlServerPropertyBuilderExtensions.UseSequence), new[] { typeof(PropertyBuilder), typeof(string), typeof(string) })!;

private static readonly MethodInfo IndexIsClusteredMethodInfo
= typeof(SqlServerIndexBuilderExtensions).GetRuntimeMethod(
Expand Down Expand Up @@ -404,7 +404,7 @@ protected override bool IsHandledByConvention(IModel model, IAnnotation annotati
var name = GetAndRemove<string>(annotations, SqlServerAnnotationNames.KeySequenceName);
var schema = GetAndRemove<string>(annotations, SqlServerAnnotationNames.KeySequenceSchema);
return new MethodCallCodeFragment(
onModel ? ModelUseKeySequenceMethodInfo : PropertyUseKeySequenceMethodInfo,
onModel ? ModelUseKeySequencesMethodInfo : PropertyUseSequenceMethodInfo,
(name, schema) switch
{
(null, null) => Array.Empty<object>(),
Expand Down
14 changes: 7 additions & 7 deletions src/EFCore.SqlServer/Extensions/SqlServerModelBuilderExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public static bool CanSetHiLoSequence(
/// <param name="name">The name of the sequence.</param>
/// <param name="schema">The schema of the sequence.</param>
/// <returns>The same builder instance so that multiple calls can be chained.</returns>
public static ModelBuilder UseKeySequence(
public static ModelBuilder UseKeySequences(
this ModelBuilder modelBuilder,
string? name = null,
string? schema = null)
Expand All @@ -141,7 +141,7 @@ public static ModelBuilder UseKeySequence(

if (model.FindSequence(name, schema) == null)
{
modelBuilder.HasSequence(name, schema).IncrementsBy(1);
modelBuilder.HasSequence(name, schema);
}

model.SetValueGenerationStrategy(SqlServerValueGenerationStrategy.Sequence);
Expand Down Expand Up @@ -169,13 +169,13 @@ public static ModelBuilder UseKeySequence(
/// <param name="schema">The schema of the sequence.</param>
/// <param name="fromDataAnnotation">Indicates whether the configuration was specified using a data annotation.</param>
/// <returns>A builder to further configure the sequence.</returns>
public static IConventionSequenceBuilder? HasKeySequence(
public static IConventionSequenceBuilder? HasKeySequences(
this IConventionModelBuilder modelBuilder,
string? name,
string? schema,
bool fromDataAnnotation = false)
{
if (!modelBuilder.CanSetSequence(name, schema))
if (!modelBuilder.CanSetKeySequences(name, schema))
{
return null;
}
Expand All @@ -199,7 +199,7 @@ public static ModelBuilder UseKeySequence(
/// <param name="schema">The schema of the sequence.</param>
/// <param name="fromDataAnnotation">Indicates whether the configuration was specified using a data annotation.</param>
/// <returns><see langword="true" /> if the given name and schema can be set for the hi-lo sequence.</returns>
public static bool CanSetSequence(
public static bool CanSetKeySequences(
this IConventionModelBuilder modelBuilder,
string? name,
string? schema,
Expand Down Expand Up @@ -386,13 +386,13 @@ public static bool CanSetIdentityColumnIncrement(
{
modelBuilder.HasIdentityColumnSeed(null, fromDataAnnotation);
modelBuilder.HasIdentityColumnIncrement(null, fromDataAnnotation);
modelBuilder.HasKeySequence(null, null, fromDataAnnotation);
modelBuilder.HasKeySequences(null, null, fromDataAnnotation);
}

if (valueGenerationStrategy != SqlServerValueGenerationStrategy.SequenceHiLo)
{
modelBuilder.HasHiLoSequence(null, null, fromDataAnnotation);
modelBuilder.HasKeySequence(null, null, fromDataAnnotation);
modelBuilder.HasKeySequences(null, null, fromDataAnnotation);
}

if (valueGenerationStrategy != SqlServerValueGenerationStrategy.Sequence)
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.SqlServer/Extensions/SqlServerModelExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public static void SetKeySequenceName(this IMutableModel model, string? name)

/// <summary>
/// Returns the schema to use for the default hi-lo sequence.
/// <see cref="SqlServerPropertyBuilderExtensions.UseKeySequence" />
/// <see cref="SqlServerPropertyBuilderExtensions.UseSequence" />
/// </summary>
/// <param name="model">The model.</param>
/// <returns>The schema to use for the default key value generation sequence.</returns>
Expand Down
28 changes: 14 additions & 14 deletions src/EFCore.SqlServer/Extensions/SqlServerPropertyBuilderExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public static bool CanSetHiLoSequence(
/// <param name="name">The name of the sequence.</param>
/// <param name="schema">The schema of the sequence.</param>
/// <returns>The same builder instance so that multiple calls can be chained.</returns>
public static PropertyBuilder UseKeySequence(
public static PropertyBuilder UseSequence(
this PropertyBuilder propertyBuilder,
string? name = null,
string? schema = null)
Expand All @@ -169,8 +169,8 @@ public static PropertyBuilder UseKeySequence(
}

property.SetValueGenerationStrategy(SqlServerValueGenerationStrategy.Sequence);
property.SetKeySequenceName(name);
property.SetKeySequenceSchema(schema);
property.SetSequenceName(name);
property.SetSequenceSchema(schema);
property.SetHiLoSequenceName(null);
property.SetHiLoSequenceSchema(null);
property.SetIdentitySeed(null);
Expand All @@ -193,11 +193,11 @@ public static PropertyBuilder UseKeySequence(
/// <param name="name">The name of the sequence.</param>
/// <param name="schema">The schema of the sequence.</param>
/// <returns>The same builder instance so that multiple calls can be chained.</returns>
public static PropertyBuilder<TProperty> UseKeySequence<TProperty>(
public static PropertyBuilder<TProperty> UseSequence<TProperty>(
this PropertyBuilder<TProperty> propertyBuilder,
string? name = null,
string? schema = null)
=> (PropertyBuilder<TProperty>)UseKeySequence((PropertyBuilder)propertyBuilder, name, schema);
=> (PropertyBuilder<TProperty>)UseSequence((PropertyBuilder)propertyBuilder, name, schema);

/// <summary>
/// Configures the database sequence used for the key value generation pattern to generate values for the key property,
Expand All @@ -213,19 +213,19 @@ public static PropertyBuilder<TProperty> UseKeySequence<TProperty>(
/// <param name="schema">The schema of the sequence.</param>
/// <param name="fromDataAnnotation">Indicates whether the configuration was specified using a data annotation.</param>
/// <returns>A builder to further configure the sequence.</returns>
public static IConventionSequenceBuilder? HasKeySequence(
public static IConventionSequenceBuilder? HasSequence(
this IConventionPropertyBuilder propertyBuilder,
string? name,
string? schema,
bool fromDataAnnotation = false)
{
if (!propertyBuilder.CanSetKeySequence(name, schema, fromDataAnnotation))
if (!propertyBuilder.CanSetSequence(name, schema, fromDataAnnotation))
{
return null;
}

propertyBuilder.Metadata.SetKeySequenceName(name, fromDataAnnotation);
propertyBuilder.Metadata.SetKeySequenceSchema(schema, fromDataAnnotation);
propertyBuilder.Metadata.SetSequenceName(name, fromDataAnnotation);
propertyBuilder.Metadata.SetSequenceSchema(schema, fromDataAnnotation);

return name == null
? null
Expand All @@ -245,7 +245,7 @@ public static PropertyBuilder<TProperty> UseKeySequence<TProperty>(
/// <param name="schema">The schema of the sequence.</param>
/// <param name="fromDataAnnotation">Indicates whether the configuration was specified using a data annotation.</param>
/// <returns><see langword="true" /> if the given name and schema can be set for the key value generation sequence.</returns>
public static bool CanSetKeySequence(
public static bool CanSetSequence(
this IConventionPropertyBuilder propertyBuilder,
string? name,
string? schema,
Expand Down Expand Up @@ -282,8 +282,8 @@ public static PropertyBuilder UseIdentityColumn(
property.SetIdentityIncrement(increment);
property.SetHiLoSequenceName(null);
property.SetHiLoSequenceSchema(null);
property.SetKeySequenceName(null);
property.SetKeySequenceSchema(null);
property.SetSequenceName(null);
property.SetSequenceSchema(null);

return propertyBuilder;
}
Expand Down Expand Up @@ -629,13 +629,13 @@ public static bool CanSetIdentityColumnIncrement(
{
propertyBuilder.HasIdentityColumnSeed(null, fromDataAnnotation);
propertyBuilder.HasIdentityColumnIncrement(null, fromDataAnnotation);
propertyBuilder.HasKeySequence(null, null, fromDataAnnotation);
propertyBuilder.HasSequence(null, null, fromDataAnnotation);
}

if (valueGenerationStrategy != SqlServerValueGenerationStrategy.SequenceHiLo)
{
propertyBuilder.HasHiLoSequence(null, null, fromDataAnnotation);
propertyBuilder.HasKeySequence(null, null, fromDataAnnotation);
propertyBuilder.HasSequence(null, null, fromDataAnnotation);
}

if (valueGenerationStrategy != SqlServerValueGenerationStrategy.Sequence)
Expand Down
Loading

0 comments on commit 4806c15

Please sign in to comment.