Fix MySQL index length

OrchardCMS · Oct 17, 2023 · f6366f9 · f6366f9
1 parent 7f51a1c
commit f6366f9
Show file tree

Hide file tree

Showing 19 changed files with 1,459 additions and 78 deletions.
diff --git a/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj b/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj
@@ -27,6 +27,7 @@
   <ItemGroup>
     <Folder Include="wwwroot\" />
     <Folder Include="Localization\" />
+    <Folder Include="Recipes\" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/OrchardCore.Cms.Web/Recipes/.placeholder b/src/OrchardCore.Cms.Web/Recipes/.placeholder
@@ -0,0 +1 @@
+# This file is used to ensure the Recipe folder is created
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/Migrations.cs
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/UserPickerMigrations.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/UserPickerMigrations.cs
@@ -31,7 +31,7 @@ public int Create()
             );
 
             // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published (1) + Latest (1) = 766 (less than 768)
+            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
             SchemaBuilder.AlterIndexTable<UserPickerFieldIndex>(table => table
                 .CreateIndex("IDX_UserPickerFieldIndex_DocumentId_ContentType",
                     "DocumentId",
@@ -67,7 +67,7 @@ public int UpdateFrom1()
             );
 
             // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published (1) + Latest (1) = 766 (less than 768)
+            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
             SchemaBuilder.AlterIndexTable<UserPickerFieldIndex>(table => table
                 .CreateIndex("IDX_UserPickerFieldIndex_DocumentId_ContentType",
                     "DocumentId",

diff --git a/src/OrchardCore.Modules/OrchardCore.Indexing/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Indexing/Migrations.cs
@@ -8,10 +8,10 @@ public class Migrations : DataMigration
         public int Create()
         {
             SchemaBuilder.CreateTable(nameof(IndexingTask), table => table
-                .Column<int>(nameof(IndexingTask.Id), col => col.PrimaryKey().Identity())
-                .Column<string>(nameof(IndexingTask.ContentItemId), c => c.WithLength(26))
-                .Column<DateTime>(nameof(IndexingTask.CreatedUtc), col => col.NotNull())
-                .Column<int>(nameof(IndexingTask.Type))
+                .Column<int>("Id", col => col.PrimaryKey().Identity())
+                .Column<string>("ContentItemId", c => c.WithLength(26))
+                .Column<DateTime>("CreatedUtc", col => col.NotNull())
+                .Column<int>("Type")
             );
 
             SchemaBuilder.AlterTable(nameof(IndexingTask), table => table

diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Migrations.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading.Tasks;
 using OrchardCore.Data.Migration;
 using OrchardCore.Layers.Indexes;
@@ -31,7 +30,9 @@ public int Create()
             );
 
             SchemaBuilder.AlterIndexTable<LayerMetadataIndex>(table => table
-                .CreateIndex("IDX_LayerMetadataIndex_DocumentId", "DocumentId", "Zone")
+                .CreateIndex("IDX_LayerMetadataIndex_DocumentId",
+                "DocumentId",
+                "Zone")
             );
 
             // Shortcut other migration steps on new content definition schemas.
@@ -42,7 +43,9 @@ public int Create()
         public int UpdateFrom1()
         {
             SchemaBuilder.AlterIndexTable<LayerMetadataIndex>(table => table
-                .CreateIndex("IDX_LayerMetadataIndex_DocumentId", "DocumentId", "Zone")
+                .CreateIndex("IDX_LayerMetadataIndex_DocumentId",
+                "DocumentId",
+                "Zone")
             );
 
             return 2;

diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Migrations.cs
@@ -63,7 +63,10 @@ public int UpdateFrom1()
         public int UpdateFrom2()
         {
             SchemaBuilder.AlterIndexTable<ContainedPartIndex>(table => table
-                .CreateIndex("IDX_ContainedPartIndex_DocumentId", "DocumentId", "ListContentItemId", "Order")
+                .CreateIndex("IDX_ContainedPartIndex_DocumentId",
+                "DocumentId",
+                "ListContentItemId",
+                "Order")
             );
 
             return 3;

diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Migrations.cs
@@ -63,12 +63,14 @@ public int Create()
                     "Latest")
             );
 
+            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
             SchemaBuilder.AlterIndexTable<TaxonomyIndex>(table => table
                 .CreateIndex("IDX_TaxonomyIndex_DocumentId_ContentType",
                     "DocumentId",
-                    "ContentType",
-                    "ContentPart",
-                    "ContentField",
+                    "ContentType(254)",
+                    "ContentPart(254)",
+                    "ContentField(254)",
                     "Published",
                     "Latest")
             );
@@ -125,12 +127,14 @@ public int UpdateFrom3()
                     "Latest")
             );
 
+            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
             SchemaBuilder.AlterIndexTable<TaxonomyIndex>(table => table
                 .CreateIndex("IDX_TaxonomyIndex_DocumentId_ContentType",
                     "DocumentId",
-                    "ContentType",
-                    "ContentPart",
-                    "ContentField",
+                    "ContentType(254)",
+                    "ContentPart(254)",
+                    "ContentField(254)",
                     "Published",
                     "Latest")
             );

diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Migrations/OpenIdMigrations.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Migrations/OpenIdMigrations.cs
@@ -25,8 +25,8 @@ public OpenIdMigrations(ISession session)
         public int Create()
         {
             SchemaBuilder.CreateMapIndexTable<OpenIdApplicationIndex>(table => table
-                .Column<string>(nameof(OpenIdApplicationIndex.ApplicationId), column => column.WithLength(48))
-                .Column<string>(nameof(OpenIdApplicationIndex.ClientId), column => column.Unique()),
+                .Column<string>("ApplicationId", column => column.WithLength(48))
+                .Column<string>("ClientId", column => column.Unique()),
                 collection: OpenIdApplicationCollection);
 
             SchemaBuilder.AlterIndexTable<OpenIdApplicationIndex>(table => table