Merge pull request #2017 from sbwalker/dev

moved AlterStringColumn to IDatabase interface so that it can be overridden in the Sqlite provider rather than requiring conditional logic in the migrations

Oqtane.Database.Sqlite/SqliteDatabase.cs

@@ -35,6 +35,11 @@ namespace Oqtane.Database.Sqlite
             // not implemented as SQLite does not support dropping columns
         }
 
+        public override void AlterStringColumn(MigrationBuilder builder, string name, string table, int length, bool nullable, bool unicode)
+        {
+            // not implemented as SQLite does not support altering columns
+        }
+
         public override string ConcatenateSql(params string[] values)
         {
             var returnValue = String.Empty;

Oqtane.Server/Databases/DatabaseBase.cs

@@ -81,6 +81,11 @@ namespace Oqtane.Databases
             builder.DropColumn(name, table);
         }
 
+        public virtual void AlterStringColumn(MigrationBuilder builder, string name, string table, int length, bool nullable, bool unicode)
+        {
+            builder.AlterColumn<string>(RewriteName(name), RewriteName(table), maxLength: length, nullable: nullable, unicode: unicode);
+        }
+
         public abstract DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString);
     }
 }

Oqtane.Server/Databases/Interfaces/IDatabase.cs

@@ -34,6 +34,8 @@ namespace Oqtane.Databases.Interfaces
 
         public void DropColumn(MigrationBuilder builder, string name, string table);
 
+        public void AlterStringColumn(MigrationBuilder builder, string name, string table, int length, bool nullable, bool unicode);
+
         public DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString);
     }
 }

Oqtane.Server/Migrations/EntityBuilders/BaseEntityBuilder.cs

@@ -109,7 +109,7 @@ namespace Oqtane.Migrations.EntityBuilders
 
         public void AlterStringColumn(string name, int length, bool nullable = false, bool unicode = true)
         {
-            _migrationBuilder.AlterColumn<string>(RewriteName(name), RewriteName(EntityTableName), maxLength: length, nullable: nullable, unicode: unicode);
+            ActiveDatabase.AlterStringColumn(_migrationBuilder, RewriteName(name), RewriteName(EntityTableName), length, nullable, unicode);
         }
 
         public void AddDecimalColumn(string name, int precision, int scale, bool nullable = false)

Oqtane.Server/Migrations/Tenant/02010001_ChangeFolderNameAndPathColumnsSize.cs

@@ -16,33 +16,22 @@ namespace Oqtane.Migrations.Tenant
 
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            if (ActiveDatabase.Name != "Sqlite")
+            var folderEntityBuilder = new FolderEntityBuilder(migrationBuilder, ActiveDatabase);
-            {
+            // Drop the index is needed because the Path is already associated with IX_Folder
-                var folderEntityBuilder = new FolderEntityBuilder(migrationBuilder, ActiveDatabase);
+            folderEntityBuilder.DropIndex("IX_Folder");
-
+            folderEntityBuilder.AlterStringColumn("Name", 256);
-                folderEntityBuilder.AlterStringColumn("Name", 256);
+            folderEntityBuilder.AlterStringColumn("Path", 512);
-
+            folderEntityBuilder.AddIndex("IX_Folder", new[] { "SiteId", "Path" }, true);
-                // Drop the index is needed because the Path is already associated with IX_Folder
-                folderEntityBuilder.DropForeignKey("FK_Folder_Site");
-                folderEntityBuilder.DropIndex("IX_Folder");
-                folderEntityBuilder.AlterStringColumn("Path", 512);
-                folderEntityBuilder.AddIndex("IX_Folder", new[] { "SiteId", "Path" }, true);
-                folderEntityBuilder.AddForeignKey("FK_Folder_Site");
-            }
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            if (ActiveDatabase.Name != "Sqlite")
+            var folderEntityBuilder = new FolderEntityBuilder(migrationBuilder, ActiveDatabase);
-            {
+            // Drop the index is needed because the Path is already associated with IX_Folder
-                var folderEntityBuilder = new FolderEntityBuilder(migrationBuilder, ActiveDatabase);
+            folderEntityBuilder.DropIndex("IX_Folder");
-
+            folderEntityBuilder.AlterStringColumn("Path", 50);
-                folderEntityBuilder.AlterStringColumn("Name", 50);
+            folderEntityBuilder.AlterStringColumn("Name", 50);
-
+            folderEntityBuilder.AddIndex("IX_Folder", new[] { "SiteId", "Path" }, true);
-                folderEntityBuilder.DropIndex("IX_Folder");
-                folderEntityBuilder.AlterStringColumn("Path", 50);
-                folderEntityBuilder.AddIndex("IX_Folder", new[] { "SiteId", "Path" }, true);
-            }
         }
     }
 }

Oqtane.Server/Migrations/Tenant/03000101_ChangeFileNameColumnsSize.cs

@@ -16,29 +16,20 @@ namespace Oqtane.Migrations.Tenant
 
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            if (ActiveDatabase.Name != "Sqlite")
+            var fileEntityBuilder = new FileEntityBuilder(migrationBuilder, ActiveDatabase);
-            {
+            // Drop the index is needed because the Name is already associated with IX_File
-                var fileEntityBuilder = new FileEntityBuilder(migrationBuilder, ActiveDatabase);
+            fileEntityBuilder.DropIndex("IX_File");
-
+            fileEntityBuilder.AlterStringColumn("Name", 256);
-                // Drop the index is needed because the Name is already associated with IX_File
+            fileEntityBuilder.AddIndex("IX_File", new[] { "FolderId", "Name" }, true);
-                fileEntityBuilder.DropForeignKey("FK_File_Folder");
-                fileEntityBuilder.DropIndex("IX_File");
-                fileEntityBuilder.AlterStringColumn("Name", 256);
-                fileEntityBuilder.AddIndex("IX_File", new[] { "FolderId", "Name" }, true);
-                fileEntityBuilder.AddForeignKey("FK_File_Folder");
-            }
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            if (ActiveDatabase.Name != "Sqlite")
+            var fileEntityBuilder = new FileEntityBuilder(migrationBuilder, ActiveDatabase);
-            {
+            // Drop the index is needed because the Name is already associated with IX_File
-                var fileEntityBuilder = new FileEntityBuilder(migrationBuilder, ActiveDatabase);
+            fileEntityBuilder.DropIndex("IX_File");
-
+            fileEntityBuilder.AlterStringColumn("Name", 50);
-                fileEntityBuilder.DropIndex("IX_File");
+            fileEntityBuilder.AddIndex("IX_File", new[] { "FolderId", "Name" }, true);
-                fileEntityBuilder.AlterStringColumn("Name", 50);
-                fileEntityBuilder.AddIndex("IX_File", new[] { "FolderId", "Name" }, true);
-            }
         }
     }
 }

Oqtane.Server/Migrations/Tenant/03010001_ExpandVisitorAndUrlMappingUrls.cs

@@ -16,37 +16,28 @@ namespace Oqtane.Migrations.Tenant
 
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            if (ActiveDatabase.Name != "Sqlite")
+            var visitorEntityBuilder = new VisitorEntityBuilder(migrationBuilder, ActiveDatabase);
-            {
+            visitorEntityBuilder.AlterStringColumn("Url", 2048);
-                var visitorEntityBuilder = new VisitorEntityBuilder(migrationBuilder, ActiveDatabase);
-                visitorEntityBuilder.AlterStringColumn("Url", 2048);
 
-                // Drop the index is needed because the Url is already associated with IX_UrlMapping
+            var urlMappingEntityBuilder = new UrlMappingEntityBuilder(migrationBuilder, ActiveDatabase);
-                var urlMappingEntityBuilder = new UrlMappingEntityBuilder(migrationBuilder, ActiveDatabase);
+            // Drop the index is needed because the Url is already associated with IX_UrlMapping
-                urlMappingEntityBuilder.DropForeignKey("FK_UrlMapping_Site");
+            urlMappingEntityBuilder.DropIndex("IX_UrlMapping");
-                urlMappingEntityBuilder.DropIndex("IX_UrlMapping");
+            urlMappingEntityBuilder.AlterStringColumn("Url", 2048);
-                urlMappingEntityBuilder.AlterStringColumn("Url", 2048);
+            urlMappingEntityBuilder.AlterStringColumn("MappedUrl", 2048);
-                urlMappingEntityBuilder.AlterStringColumn("MappedUrl", 2048);
+            urlMappingEntityBuilder.AddIndex("IX_UrlMapping", new[] { "SiteId", "Url" }, true);
-                urlMappingEntityBuilder.AddIndex("IX_UrlMapping", new[] { "SiteId", "Url" }, true);
-                urlMappingEntityBuilder.AddForeignKey("FK_UrlMapping_Site");
-            }
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            if (ActiveDatabase.Name != "Sqlite")
+            var visitorEntityBuilder = new VisitorEntityBuilder(migrationBuilder, ActiveDatabase);
-            {
+            visitorEntityBuilder.AlterStringColumn("Url", 500);
-                var visitorEntityBuilder = new VisitorEntityBuilder(migrationBuilder, ActiveDatabase);
-                visitorEntityBuilder.AlterStringColumn("Url", 500);
 
-                var urlMappingEntityBuilder = new UrlMappingEntityBuilder(migrationBuilder, ActiveDatabase);
+            var urlMappingEntityBuilder = new UrlMappingEntityBuilder(migrationBuilder, ActiveDatabase);
-                urlMappingEntityBuilder.DropForeignKey("FK_UrlMapping_Site");
+            // Drop the index is needed because the Url is already associated with IX_UrlMapping
-                urlMappingEntityBuilder.DropIndex("IX_UrlMapping");
+            urlMappingEntityBuilder.DropIndex("IX_UrlMapping");
-                urlMappingEntityBuilder.AlterStringColumn("Url", 500);
+            urlMappingEntityBuilder.AlterStringColumn("Url", 500);
-                urlMappingEntityBuilder.AlterStringColumn("MappedUrl", 500);
+            urlMappingEntityBuilder.AlterStringColumn("MappedUrl", 500);
-                urlMappingEntityBuilder.AddIndex("IX_UrlMapping", new[] { "SiteId", "Url" }, true);
+            urlMappingEntityBuilder.AddIndex("IX_UrlMapping", new[] { "SiteId", "Url" }, true);
-                urlMappingEntityBuilder.AddForeignKey("FK_UrlMapping_Site");
-            }
         }
     }
 }