Rename some extension methods so that it doesn't interfere with other providers (namely sql server)

Author: ChrisJollyAU

docs/README.md

@@ -38,6 +38,15 @@ To use the latest daily builds from our [Azure DevOps feed](https://bubibubi.vis
 </configuration>
 ```
 
+## Fluent API
+
+In order to be able to be shared with SqlServer (and other providers) the names of some of the Fluent API methods have been made specific to Jet.
+
+* `UseIdentityColumn` -> `UseJetIdentityColumn`
+* `UseIdentityColumns` -> `UseJetIdentityColumns`
+
+More may be added in the future
+
 ## Further information
 More information can be found on our [Wiki](https://www.github.com/bubibubi/EntityFrameworkCore.Jet/wiki).
 

src/EFCore.Jet/Extensions/JetIndexExtensions.cs

@@ -1,6 +1,8 @@
+using System;
 using System.Collections.Generic;
 using EntityFrameworkCore.Jet.Metadata.Internal;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Metadata;
 
 // ReSharper disable once CheckNamespace
@@ -16,7 +18,7 @@ public static class JetIndexExtensions
         /// </summary>
         /// <param name="index"> The index. </param>
         /// <returns> The included property names, or <c>null</c> if they have not been specified. </returns>
-        public static IReadOnlyList<string>? GetIncludeProperties([NotNull] this IReadOnlyIndex index)
+        public static IReadOnlyList<string>? GetJetIncludeProperties([NotNull] this IReadOnlyIndex index)
             => (index is RuntimeIndex)
                 ? throw new InvalidOperationException(CoreStrings.RuntimeModelMissingData)
                 : (string[]?)index[JetAnnotationNames.Include];
@@ -26,7 +28,7 @@ public static class JetIndexExtensions
         /// </summary>
         /// <param name="index"> The index. </param>
         /// <param name="properties"> The value to set. </param>
-        public static void SetIncludeProperties([NotNull] this IMutableIndex index, [NotNull] IReadOnlyList<string> properties)
+        public static void SetJetIncludeProperties([NotNull] this IMutableIndex index, [NotNull] IReadOnlyList<string> properties)
             => index.SetOrRemoveAnnotation(
                 JetAnnotationNames.Include,
                 properties);
@@ -37,7 +39,7 @@ public static void SetIncludeProperties([NotNull] this IMutableIndex index, [Not
         /// <param name="index"> The index. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         /// <param name="properties"> The value to set. </param>
-        public static void SetIncludeProperties(
+        public static void SetJetIncludeProperties(
             [NotNull] this IConventionIndex index, [NotNull] IReadOnlyList<string> properties, bool fromDataAnnotation = false)
             => index.SetOrRemoveAnnotation(
                 JetAnnotationNames.Include,
@@ -49,7 +51,7 @@ public static void SetIncludeProperties(
         /// </summary>
         /// <param name="index"> The index. </param>
         /// <returns> The <see cref="ConfigurationSource" /> for the included property names. </returns>
-        public static ConfigurationSource? GetIncludePropertiesConfigurationSource([NotNull] this IConventionIndex index)
+        public static ConfigurationSource? GetJetIncludePropertiesConfigurationSource([NotNull] this IConventionIndex index)
             => index.FindAnnotation(JetAnnotationNames.Include)?.GetConfigurationSource();
     }
 }

src/EFCore.Jet/Extensions/JetModelBuilderExtensions.cs

@@ -24,7 +24,7 @@ public static class JetModelBuilderExtensions
         /// <param name="seed"> The value that is used for the very first row loaded into the table. </param>
         /// <param name="increment"> The incremental value that is added to the identity value of the previous row that was loaded. </param>
         /// <returns> The same builder instance so that multiple calls can be chained. </returns>
-        public static ModelBuilder UseIdentityColumns(
+        public static ModelBuilder UseJetIdentityColumns(
             [NotNull] this ModelBuilder modelBuilder,
             int seed = 1,
             int increment = 1)
@@ -34,8 +34,8 @@ public static ModelBuilder UseIdentityColumns(
             var model = modelBuilder.Model;
 
             model.SetValueGenerationStrategy(JetValueGenerationStrategy.IdentityColumn);
-            model.SetIdentitySeed(seed);
-            model.SetIdentityIncrement(increment);
+            model.SetJetIdentitySeed(seed);
+            model.SetJetIdentityIncrement(increment);
 
             return modelBuilder;
         }
@@ -50,12 +50,12 @@ public static ModelBuilder UseIdentityColumns(
         ///     The same builder instance if the configuration was applied,
         ///     <c>null</c> otherwise.
         /// </returns>
-        public static IConventionModelBuilder? HasIdentityColumnSeed(
+        public static IConventionModelBuilder? HasJetIdentityColumnSeed(
             [NotNull] this IConventionModelBuilder modelBuilder, int? seed, bool fromDataAnnotation = false)
         {
-            if (modelBuilder.CanSetIdentityColumnSeed(seed, fromDataAnnotation))
+            if (modelBuilder.CanSetJetIdentityColumnSeed(seed, fromDataAnnotation))
             {
-                modelBuilder.Metadata.SetIdentitySeed(seed, fromDataAnnotation);
+                modelBuilder.Metadata.SetJetIdentitySeed(seed, fromDataAnnotation);
                 return modelBuilder;
             }
 
@@ -69,7 +69,7 @@ public static ModelBuilder UseIdentityColumns(
         /// <param name="seed"> The value that is used for the very first row loaded into the table. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         /// <returns> <c>true</c> if the given value can be set as the seed for Jet IDENTITY. </returns>
-        public static bool CanSetIdentityColumnSeed(
+        public static bool CanSetJetIdentityColumnSeed(
             [NotNull] this IConventionModelBuilder modelBuilder, int? seed, bool fromDataAnnotation = false)
         {
             Check.NotNull(modelBuilder, nameof(modelBuilder));
@@ -87,12 +87,12 @@ public static bool CanSetIdentityColumnSeed(
         ///     The same builder instance if the configuration was applied,
         ///     <c>null</c> otherwise.
         /// </returns>
-        public static IConventionModelBuilder? HasIdentityColumnIncrement(
+        public static IConventionModelBuilder? HasJetIdentityColumnIncrement(
             [NotNull] this IConventionModelBuilder modelBuilder, int? increment, bool fromDataAnnotation = false)
         {
-            if (modelBuilder.CanSetIdentityColumnIncrement(increment, fromDataAnnotation))
+            if (modelBuilder.CanSetJetIdentityColumnIncrement(increment, fromDataAnnotation))
             {
-                modelBuilder.Metadata.SetIdentityIncrement(increment, fromDataAnnotation);
+                modelBuilder.Metadata.SetJetIdentityIncrement(increment, fromDataAnnotation);
                 return modelBuilder;
             }
 
@@ -106,7 +106,7 @@ public static bool CanSetIdentityColumnSeed(
         /// <param name="increment"> The incremental value that is added to the identity value of the previous row that was loaded. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         /// <returns> <c>true</c> if the given value can be set as the default increment for Jet IDENTITY. </returns>
-        public static bool CanSetIdentityColumnIncrement(
+        public static bool CanSetJetIdentityColumnIncrement(
             [NotNull] this IConventionModelBuilder modelBuilder, int? increment, bool fromDataAnnotation = false)
         {
             Check.NotNull(modelBuilder, nameof(modelBuilder));
@@ -135,8 +135,8 @@ public static bool CanSetIdentityColumnIncrement(
                 modelBuilder.Metadata.SetValueGenerationStrategy(valueGenerationStrategy, fromDataAnnotation);
                 if (valueGenerationStrategy != JetValueGenerationStrategy.IdentityColumn)
                 {
-                    modelBuilder.HasIdentityColumnSeed(null, fromDataAnnotation);
-                    modelBuilder.HasIdentityColumnIncrement(null, fromDataAnnotation);
+                    modelBuilder.HasJetIdentityColumnSeed(null, fromDataAnnotation);
+                    modelBuilder.HasJetIdentityColumnIncrement(null, fromDataAnnotation);
                 }
 
                 return modelBuilder;

src/EFCore.Jet/Extensions/JetModelExtensions.cs

@@ -15,15 +15,15 @@ public static class JetModelExtensions
         /// </summary>
         /// <param name="model"> The model. </param>
         /// <returns> The default identity seed. </returns>
-        public static int GetIdentitySeed([NotNull] this IReadOnlyModel model)
-            => (int?) model[JetAnnotationNames.IdentitySeed] ?? 1;
+        public static int GetJetIdentitySeed([NotNull] this IReadOnlyModel model)
+            => (int?)model[JetAnnotationNames.IdentitySeed] ?? 1;
 
         /// <summary>
         ///     Sets the default identity seed.
         /// </summary>
         /// <param name="model"> The model. </param>
         /// <param name="seed"> The value to set. </param>
-        public static void SetIdentitySeed([NotNull] this IMutableModel model, int? seed)
+        public static void SetJetIdentitySeed([NotNull] this IMutableModel model, int? seed)
             => model.SetOrRemoveAnnotation(
                 JetAnnotationNames.IdentitySeed,
                 seed);
@@ -34,7 +34,7 @@ public static void SetIdentitySeed([NotNull] this IMutableModel model, int? seed
         /// <param name="model"> The model. </param>
         /// <param name="seed"> The value to set. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        public static void SetIdentitySeed([NotNull] this IConventionModel model, int? seed, bool fromDataAnnotation = false)
+        public static void SetJetIdentitySeed([NotNull] this IConventionModel model, int? seed, bool fromDataAnnotation = false)
             => model.SetOrRemoveAnnotation(
                 JetAnnotationNames.IdentitySeed,
                 seed,
@@ -45,23 +45,23 @@ public static void SetIdentitySeed([NotNull] this IConventionModel model, int? s
         /// </summary>
         /// <param name="model"> The model. </param>
         /// <returns> The <see cref="ConfigurationSource" /> for the default schema. </returns>
-        public static ConfigurationSource? GetIdentitySeedConfigurationSource([NotNull] this IConventionModel model)
+        public static ConfigurationSource? GetJetIdentitySeedConfigurationSource([NotNull] this IConventionModel model)
             => model.FindAnnotation(JetAnnotationNames.IdentitySeed)?.GetConfigurationSource();
 
         /// <summary>
         ///     Returns the default identity increment.
         /// </summary>
         /// <param name="model"> The model. </param>
         /// <returns> The default identity increment. </returns>
-        public static int GetIdentityIncrement([NotNull] this IReadOnlyModel model)
-            => (int?) model[JetAnnotationNames.IdentityIncrement] ?? 1;
+        public static int GetJetIdentityIncrement([NotNull] this IReadOnlyModel model)
+            => (int?)model[JetAnnotationNames.IdentityIncrement] ?? 1;
 
         /// <summary>
         ///     Sets the default identity increment.
         /// </summary>
         /// <param name="model"> The model. </param>
         /// <param name="increment"> The value to set. </param>
-        public static void SetIdentityIncrement([NotNull] this IMutableModel model, int? increment)
+        public static void SetJetIdentityIncrement([NotNull] this IMutableModel model, int? increment)
             => model.SetOrRemoveAnnotation(
                 JetAnnotationNames.IdentityIncrement,
                 increment);
@@ -72,7 +72,7 @@ public static void SetIdentityIncrement([NotNull] this IMutableModel model, int?
         /// <param name="model"> The model. </param>
         /// <param name="increment"> The value to set. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        public static void SetIdentityIncrement(
+        public static void SetJetIdentityIncrement(
             [NotNull] this IConventionModel model, int? increment, bool fromDataAnnotation = false)
             => model.SetOrRemoveAnnotation(
                 JetAnnotationNames.IdentityIncrement,
@@ -84,7 +84,7 @@ public static void SetIdentityIncrement(
         /// </summary>
         /// <param name="model"> The model. </param>
         /// <returns> The <see cref="ConfigurationSource" /> for the default identity increment. </returns>
-        public static ConfigurationSource? GetIdentityIncrementConfigurationSource([NotNull] this IConventionModel model)
+        public static ConfigurationSource? GetJetIdentityIncrementConfigurationSource([NotNull] this IConventionModel model)
             => model.FindAnnotation(JetAnnotationNames.IdentityIncrement)?.GetConfigurationSource();
 
         /// <summary>
@@ -94,7 +94,7 @@ public static void SetIdentityIncrement(
         /// <param name="model"> The model. </param>
         /// <returns> The default <see cref="JetValueGenerationStrategy" />. </returns>
         public static JetValueGenerationStrategy? GetValueGenerationStrategy([NotNull] this IReadOnlyModel model)
-            => (JetValueGenerationStrategy?) model[JetAnnotationNames.ValueGenerationStrategy];
+            => (JetValueGenerationStrategy?)model[JetAnnotationNames.ValueGenerationStrategy];
 
         /// <summary>
         ///     Sets the <see cref="JetValueGenerationStrategy" /> to use for properties
@@ -121,7 +121,7 @@ public static void SetValueGenerationStrategy(
         /// </summary>
         /// <param name="model"> The model. </param>
         /// <returns> The <see cref="ConfigurationSource" /> for the default <see cref="JetValueGenerationStrategy" />. </returns>
-        public static ConfigurationSource? GetValueGenerationStrategyConfigurationSource([NotNull] this IConventionModel model)
+        public static ConfigurationSource? GetJetValueGenerationStrategyConfigurationSource([NotNull] this IConventionModel model)
             => model.FindAnnotation(JetAnnotationNames.ValueGenerationStrategy)?.GetConfigurationSource();
     }
 }