Merge branch 'issue-8146-drop-support-postgresql-92' into develop

Author: skoshelev

src/Libraries/Nop.Data/DataProviders/LinqToDb/LinqToDBPostgreSQLDataProvider.cs

@@ -11,12 +11,11 @@ namespace Nop.Data.DataProviders.LinqToDB;
 /// </summary>
 public partial class LinqToDBPostgreSQLDataProvider : PostgreSQLDataProvider
 {
-    public LinqToDBPostgreSQLDataProvider() : base(ProviderName.PostgreSQL92, PostgreSQLVersion.v92) { }
+    public LinqToDBPostgreSQLDataProvider() : base(ProviderName.PostgreSQL15, PostgreSQLVersion.v15) { }
 
     public override void SetParameter(DataConnection dataConnection, DbParameter parameter, string name, DbDataType dataType, object value)
     {
-
-        if (value is string && dataType.SystemType == typeof(string)) 
+        if (value is string && dataType.SystemType == typeof(string))
             dataType = dataType.WithDbType("citext");
 
         base.SetParameter(dataConnection, parameter, name, dataType, value);

src/Libraries/Nop.Data/DataProviders/PostgreSqlDataProvider.cs

@@ -92,7 +92,7 @@ protected virtual string GetSequenceName<TEntity>(DataConnection dataConnection)
     public override async Task BulkInsertEntitiesAsync<TEntity>(IEnumerable<TEntity> entities)
     {
         using var dataContext = CreateDataConnection(LinqToDbDataProvider);
-        await dataContext.BulkCopyAsync(new BulkCopyOptions() { KeepIdentity = true }, entities.RetrieveIdentity(dataContext, useSequenceName: true));
+        await dataContext.BulkCopyAsync(entities.RetrieveIdentity(dataContext, useSequenceName: false));
     }
 
     /// <summary>
@@ -103,7 +103,7 @@ public override async Task BulkInsertEntitiesAsync<TEntity>(IEnumerable<TEntity>
     public override void BulkInsertEntities<TEntity>(IEnumerable<TEntity> entities)
     {
         using var dataContext = CreateDataConnection(LinqToDbDataProvider);
-        dataContext.BulkCopy(new BulkCopyOptions() { KeepIdentity = true }, entities.RetrieveIdentity(dataContext, useSequenceName: true));
+        dataContext.BulkCopy(entities.RetrieveIdentity(dataContext, useSequenceName: false));
     }
 
     /// <summary>

src/Libraries/Nop.Data/Extensions/FluentMigratorExtensions.cs

@@ -66,15 +66,15 @@ private static void DefineByOwnType(string columnName, Type propType, CreateTabl
     public static IMigrationRunnerBuilder AddNopDbEngines(this IMigrationRunnerBuilder builder)
     {
         if (!DataSettingsManager.IsDatabaseInstalled())
-            return builder.AddSqlServer().AddMySql5().AddPostgres92();
+            return builder.AddSqlServer().AddMySql5().AddPostgres15_0();
 
         var dataSettings = DataSettingsManager.LoadSettings();
 
         return dataSettings.DataProvider switch
         {
             DataProviderType.MySql => builder.AddMySql5(),
             DataProviderType.SqlServer => builder.AddSqlServer(),
-            DataProviderType.PostgreSQL => builder.AddPostgres92(),
+            DataProviderType.PostgreSQL => builder.AddPostgres15_0(),
             _ => throw new NotImplementedException(),
         };
     }

src/Libraries/Nop.Data/Extensions/IndexOptionsSyntaxExtensions.cs

@@ -0,0 +1,40 @@
+using FluentMigrator.Builders.Create.Index;
+
+namespace Nop.Data.Extensions;
+
+/// <summary>
+/// Provides extension methods for configuring index options in database migrations.
+/// </summary>
+/// <remarks>This class contains extension methods that add provider-specific index options to migration
+/// expressions. These methods enable fluent configuration of indexes when using different database providers, such as
+/// SQL Server or PostgreSQL. The extensions are intended to be used within migration scripts to enhance index
+/// definitions in a provider-agnostic manner.</remarks>
+public static partial class IndexOptionsSyntaxExtensions
+{
+    /// <summary>
+    /// Specifies an additional column to be included in the index for covering queries, without being part of the index key
+    /// </summary>
+    /// <param name="expression">The index creation expression to extend with an included column</param>
+    /// <param name="columnName">The name of the column to include in the index. Cannot be null or empty</param>
+    /// <returns>The same index creation expression instance, allowing for fluent chaining of additional index configuration.</returns>
+    public static ICreateIndexOnColumnSyntax Include(this ICreateIndexOnColumnSyntax expression, string columnName)
+    {
+        var dataSettings = DataSettingsManager.LoadSettings();
+
+        switch (dataSettings.DataProvider)
+        {
+            case DataProviderType.SqlServer:
+                FluentMigrator.SqlServer.SqlServerExtensions.Include(expression, columnName);
+                break;
+            case DataProviderType.PostgreSQL:
+                FluentMigrator.Postgres.PostgresExtensions.Include(expression, columnName);
+                break;
+            case DataProviderType.Unknown:
+            case DataProviderType.MySql:
+            default:
+                break;
+        }
+
+        return expression;
+    }
+}

src/Libraries/Nop.Data/Mapping/FluentMigratorMetadataReader.cs

@@ -120,14 +120,8 @@ public MappingAttribute[] GetAttributes(Type type, MemberInfo memberInfo)
         var result = new List<MappingAttribute>();
 
         if (attribute is ColumnAttribute column)
-        {
             result.Add(column);
 
-            //define sequence name for supported db engines to retrieve identity values (PostgreSQL)
-            if (column.IsIdentity)
-                result.Add(new SequenceNameAttribute($"{entityDescriptor.EntityName}_{column.Name}_seq"));
-        }
-
         return result.ToArray();
     }
 

src/Libraries/Nop.Data/Migrations/Installation/Indexes.cs

@@ -1,5 +1,4 @@
 using FluentMigrator;
-using FluentMigrator.SqlServer;
 using Nop.Core.Domain.Catalog;
 using Nop.Core.Domain.Common;
 using Nop.Core.Domain.Customers;
@@ -12,6 +11,7 @@
 using Nop.Core.Domain.Seo;
 using Nop.Core.Domain.Stores;
 using Nop.Core.Domain.Topics;
+using Nop.Data.Extensions;
 using Nop.Data.Mapping;
 
 namespace Nop.Data.Migrations.Installation;

src/Libraries/Nop.Data/Migrations/NopColumnsConvention.cs

@@ -30,7 +30,7 @@ public IColumnsExpression Apply(IColumnsExpression expression)
             columnDefinition.Type = null;
             columnDefinition.CustomType = "citext";
         }
-
+        
         return expression;
     }
 

src/Libraries/Nop.Data/Migrations/NopGeneratorAccessor.cs

@@ -34,7 +34,7 @@ protected virtual void ConfigureGenerator(IList<IMigrationGenerator> generators)
         {
             DataProviderType.SqlServer => FindGenerator(generators, GeneratorIdConstants.SqlServer),
             DataProviderType.MySql => FindGenerator(generators, GeneratorIdConstants.MySql5),
-            DataProviderType.PostgreSQL => FindGenerator(generators, GeneratorIdConstants.PostgreSQL9_2),
+            DataProviderType.PostgreSQL => FindGenerator(generators, GeneratorIdConstants.PostgreSQL15_0),
             _ => throw new InvalidOperationException(
                 $@"A migration generator for Data provider type {dataSettings.DataProvider} couldn't be found.")
         };

src/Libraries/Nop.Data/Migrations/NopProcessorAccessor.cs

@@ -35,7 +35,7 @@ protected virtual void ConfigureProcessor(IList<IMigrationProcessor> processors)
         {
             DataProviderType.SqlServer => FindProcessor(processors, ProcessorIdConstants.SqlServer),
             DataProviderType.MySql => FindProcessor(processors, ProcessorIdConstants.MySql5),
-            DataProviderType.PostgreSQL => FindProcessor(processors, ProcessorIdConstants.PostgreSQL92),
+            DataProviderType.PostgreSQL => FindProcessor(processors, ProcessorIdConstants.PostgreSQL15_0),
             _ => throw new ProcessorFactoryNotFoundException(
                 $@"A migration processor for Data provider type {dataSettings.DataProvider} couldn't be found.")
         };

src/Libraries/Nop.Data/Migrations/UpgradeTo490/AddIndexesMigration.cs

@@ -1,7 +1,7 @@
 using FluentMigrator;
-using FluentMigrator.SqlServer;
 using Nop.Core.Domain.Catalog;
 using Nop.Core.Domain.Topics;
+using Nop.Data.Extensions;
 using Nop.Data.Mapping;
 
 namespace Nop.Data.Migrations.UpgradeTo490;