From a7fd42ddee50a8066a083c57b7940e4f9896dcb7 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 31 Jan 2020 20:25:06 +0800 Subject: Fix a bug in url generation and add development database migration. --- .../20200131100517_RefactorUser.cs | 136 +++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs (limited to 'Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs') diff --git a/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs b/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs new file mode 100644 index 00000000..e6f38506 --- /dev/null +++ b/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs @@ -0,0 +1,136 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Timeline.Migrations.DevelopmentDatabase +{ + public partial class RefactorUser : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn(name: "name", table: "users", newName: "username"); + migrationBuilder.RenameIndex(name: "IX_users_name", table: "users", newName: "IX_users_username"); + + migrationBuilder.AddColumn( + name: "nickname", + table: "users", + maxLength: 100, + nullable: true); + + migrationBuilder.Sql(@" +UPDATE users + SET nickname = ( + SELECT nickname + FROM user_details + WHERE user_details.UserId = users.id + ); + "); + + /* + migrationBuilder.RenameColumn(name: "UserId", table: "user_avatars", newName: "user"); + + migrationBuilder.DropForeignKey( + name: "FK_user_avatars_users_UserId", + table: "user_avatars"); + + migrationBuilder.AddForeignKey( + name: "FK_user_avatars_users_user", + table: "user_avatars", + column: "user", + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + + migrationBuilder.RenameIndex( + name: "IX_user_avatars_UserId", + table: "user_avatars", + newName: "IX_user_avatars_user"); + */ + + migrationBuilder.Sql(@" +CREATE TABLE user_avatars_backup ( + id INTEGER NOT NULL + CONSTRAINT PK_user_avatars PRIMARY KEY AUTOINCREMENT, + data BLOB, + type TEXT, + etag TEXT, + last_modified TEXT NOT NULL, + user INTEGER NOT NULL, + CONSTRAINT FK_user_avatars_users_user FOREIGN KEY ( + user + ) + REFERENCES users (id) ON DELETE CASCADE +); + +INSERT INTO user_avatars_backup (id, data, type, etag, last_modified, user) + SELECT id, data, type, etag, last_modified, UserId FROM user_avatars; + +DROP TABLE user_avatars; + +ALTER TABLE user_avatars_backup + RENAME TO user_avatars; + +CREATE UNIQUE INDEX IX_user_avatars_user ON user_avatars (user); + "); + + // migrationBuilder.DropTable(name: "user_details"); + + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.Sql(@" +CREATE TABLE user_avatars_backup ( + id INTEGER NOT NULL + CONSTRAINT PK_user_avatars PRIMARY KEY AUTOINCREMENT, + data BLOB, + type TEXT, + etag TEXT, + last_modified TEXT NOT NULL, + UserId INTEGER NOT NULL, + CONSTRAINT FK_user_avatars_users_UserId FOREIGN KEY ( + user + ) + REFERENCES users (id) ON DELETE CASCADE +); + +INSERT INTO user_avatars_backup (id, data, type, etag, last_modified, UserId) + SELECT id, data, type, etag, last_modified, user FROM user_avatars; + +DROP TABLE user_avatars; + +ALTER TABLE user_avatars_backup + RENAME TO user_avatars; + +CREATE UNIQUE INDEX IX_user_avatars_UserId ON user_avatars (UserId); + "); + + migrationBuilder.Sql(@" +CREATE TABLE users_backup ( + id INTEGER NOT NULL + CONSTRAINT PK_users PRIMARY KEY AUTOINCREMENT, + name TEXT NOT NULL, + password TEXT NOT NULL, + roles TEXT NOT NULL, + version INTEGER NOT NULL + DEFAULT 0 +); + +INSERT INTO users_backup (id, name, password, roles, version) + SELECT id, username, password, roles, version FROM users; + +DROP TABLE users; + +ALTER TABLE users_backup + RENAME TO users; + +CREATE UNIQUE INDEX IX_users_name ON users (name); + "); + + migrationBuilder.RenameColumn(name: "user", table: "user_avatars", newName: "UserId"); + + migrationBuilder.RenameIndex( + name: "IX_user_avatars_user", + table: "user_avatars", + newName: "IX_user_avatars_UserId"); + } + } +} -- cgit v1.2.3 From bcb0a2361467614531a337282da1fd23996924f1 Mon Sep 17 00:00:00 2001 From: crupest Date: Sat, 1 Feb 2020 00:25:41 +0800 Subject: ... --- .../20200131100517_RefactorUser.cs | 7 - .../20200131152033_RefactorUser.Designer.cs | 244 +++++++++++++++++++++ .../20200131152033_RefactorUser.cs | 55 +++++ .../ProductionDatabaseContextModelSnapshot.cs | 92 +++----- Timeline/Startup.cs | 5 +- 5 files changed, 336 insertions(+), 67 deletions(-) create mode 100644 Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs create mode 100644 Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs (limited to 'Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs') diff --git a/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs b/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs index e6f38506..ade65eb1 100644 --- a/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs +++ b/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs @@ -124,13 +124,6 @@ ALTER TABLE users_backup CREATE UNIQUE INDEX IX_users_name ON users (name); "); - - migrationBuilder.RenameColumn(name: "user", table: "user_avatars", newName: "UserId"); - - migrationBuilder.RenameIndex( - name: "IX_user_avatars_user", - table: "user_avatars", - newName: "IX_user_avatars_UserId"); } } } diff --git a/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs b/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs new file mode 100644 index 00000000..bb0bb5af --- /dev/null +++ b/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs @@ -0,0 +1,244 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Timeline.Entities; + +namespace Timeline.Migrations.ProductionDatabase +{ + [DbContext(typeof(ProductionDatabaseContext))] + [Migration("20200131152033_RefactorUser")] + partial class RefactorUser + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.1.1") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("bigint"); + + b.Property("CreateTime") + .HasColumnName("create_time") + .HasColumnType("datetime(6)"); + + b.Property("Description") + .HasColumnName("description") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Name") + .HasColumnName("name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("OwnerId") + .HasColumnName("owner") + .HasColumnType("bigint"); + + b.Property("Visibility") + .HasColumnName("visibility") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.ToTable("timelines"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("bigint"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("bigint"); + + b.Property("UserId") + .HasColumnName("user") + .HasColumnType("bigint"); + + b.HasKey("Id"); + + b.HasIndex("TimelineId"); + + b.HasIndex("UserId"); + + b.ToTable("timeline_members"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("bigint"); + + b.Property("AuthorId") + .HasColumnName("author") + .HasColumnType("bigint"); + + b.Property("Content") + .HasColumnName("content") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("LastUpdated") + .HasColumnName("last_updated") + .HasColumnType("datetime(6)"); + + b.Property("Time") + .HasColumnName("time") + .HasColumnType("datetime(6)"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("bigint"); + + b.HasKey("Id"); + + b.HasIndex("AuthorId"); + + b.HasIndex("TimelineId"); + + b.ToTable("timeline_posts"); + }); + + modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("bigint"); + + b.Property("Data") + .HasColumnName("data") + .HasColumnType("longblob"); + + b.Property("ETag") + .HasColumnName("etag") + .HasColumnType("varchar(30) CHARACTER SET utf8mb4") + .HasMaxLength(30); + + b.Property("LastModified") + .HasColumnName("last_modified") + .HasColumnType("datetime(6)"); + + b.Property("Type") + .HasColumnName("type") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("UserId") + .HasColumnName("user") + .HasColumnType("bigint"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("user_avatars"); + }); + + modelBuilder.Entity("Timeline.Entities.UserEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("bigint"); + + b.Property("Nickname") + .HasColumnName("nickname") + .HasColumnType("varchar(100) CHARACTER SET utf8mb4") + .HasMaxLength(100); + + b.Property("Password") + .IsRequired() + .HasColumnName("password") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Roles") + .IsRequired() + .HasColumnName("roles") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Username") + .IsRequired() + .HasColumnName("username") + .HasColumnType("varchar(26) CHARACTER SET utf8mb4") + .HasMaxLength(26); + + b.Property("Version") + .ValueGeneratedOnAdd() + .HasColumnName("version") + .HasColumnType("bigint") + .HasDefaultValue(0L); + + b.HasKey("Id"); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("users"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "Owner") + .WithMany("Timelines") + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => + { + b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") + .WithMany("Members") + .HasForeignKey("TimelineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Timeline.Entities.UserEntity", "User") + .WithMany("TimelinesJoined") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "Author") + .WithMany("TimelinePosts") + .HasForeignKey("AuthorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") + .WithMany("Posts") + .HasForeignKey("TimelineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "User") + .WithOne("Avatar") + .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs b/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs new file mode 100644 index 00000000..a0ca5212 --- /dev/null +++ b/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs @@ -0,0 +1,55 @@ +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Timeline.Migrations.ProductionDatabase +{ + public partial class RefactorUser : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.Sql(@" +START TRANSACTION; + +ALTER TABLE `users` + CHANGE COLUMN `name` `username` varchar (26) NOT NULL, + RENAME INDEX IX_users_name TO IX_users_username, + ADD `nickname` varchar(100) CHARACTER SET utf8mb4 NULL; + +UPDATE users + SET nickname = ( + SELECT nickname + FROM user_details + WHERE user_details.UserId = users.id + ); + +ALTER TABLE `user_avatars` + CHANGE COLUMN `UserId` `user` bigint (20) NOT NULL, + RENAME INDEX IX_user_avatars_UserId TO IX_user_avatars_user, + DROP FOREIGN KEY FK_user_avatars_users_UserId, + ADD CONSTRAINT FK_user_avatars_users_user FOREIGN KEY (`user`) REFERENCES `users` (`id`) ON DELETE CASCADE; + +COMMIT; + "); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.Sql(@" +START TRANSACTION; + +ALTER TABLE `users` + CHANGE COLUMN `username` `name` varchar (26) NOT NULL, + RENAME INDEX IX_users_username TO IX_users_name, + DROP COLUMN `nickname`; + +ALTER TABLE `user_avatars` + CHANGE COLUMN `user` `UserId` bigint (20) NOT NULL, + RENAME INDEX IX_user_avatars_user TO IX_user_avatars_UserId, + DROP FOREIGN KEY FK_user_avatars_users_user, + ADD CONSTRAINT FK_user_avatars_users_UserId FOREIGN KEY (`UserId`) REFERENCES `users` (`id`) ON DELETE CASCADE; + +COMMIT; + "); + } + } +} diff --git a/Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs b/Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs index 67ef52a4..bfc9b768 100644 --- a/Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs +++ b/Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs @@ -14,7 +14,7 @@ namespace Timeline.Migrations.ProductionDatabase { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "3.1.0") + .HasAnnotation("ProductVersion", "3.1.1") .HasAnnotation("Relational:MaxIdentifierLength", 64); modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => @@ -111,44 +111,7 @@ namespace Timeline.Migrations.ProductionDatabase b.ToTable("timeline_posts"); }); - modelBuilder.Entity("Timeline.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("EncryptedPassword") - .IsRequired() - .HasColumnName("password") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Name") - .IsRequired() - .HasColumnName("name") - .HasColumnType("varchar(26) CHARACTER SET utf8mb4") - .HasMaxLength(26); - - b.Property("RoleString") - .IsRequired() - .HasColumnName("roles") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Version") - .ValueGeneratedOnAdd() - .HasColumnName("version") - .HasColumnType("bigint") - .HasDefaultValue(0L); - - b.HasKey("Id"); - - b.HasIndex("Name") - .IsUnique(); - - b.ToTable("users"); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => + modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -173,6 +136,7 @@ namespace Timeline.Migrations.ProductionDatabase .HasColumnType("longtext CHARACTER SET utf8mb4"); b.Property("UserId") + .HasColumnName("user") .HasColumnType("bigint"); b.HasKey("Id"); @@ -183,7 +147,7 @@ namespace Timeline.Migrations.ProductionDatabase b.ToTable("user_avatars"); }); - modelBuilder.Entity("Timeline.Entities.UserDetail", b => + modelBuilder.Entity("Timeline.Entities.UserEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -192,23 +156,42 @@ namespace Timeline.Migrations.ProductionDatabase b.Property("Nickname") .HasColumnName("nickname") + .HasColumnType("varchar(100) CHARACTER SET utf8mb4") + .HasMaxLength(100); + + b.Property("Password") + .IsRequired() + .HasColumnName("password") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Roles") + .IsRequired() + .HasColumnName("roles") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Username") + .IsRequired() + .HasColumnName("username") .HasColumnType("varchar(26) CHARACTER SET utf8mb4") .HasMaxLength(26); - b.Property("UserId") - .HasColumnType("bigint"); + b.Property("Version") + .ValueGeneratedOnAdd() + .HasColumnName("version") + .HasColumnType("bigint") + .HasDefaultValue(0L); b.HasKey("Id"); - b.HasIndex("UserId") + b.HasIndex("Username") .IsUnique(); - b.ToTable("user_details"); + b.ToTable("users"); }); modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => { - b.HasOne("Timeline.Entities.User", "Owner") + b.HasOne("Timeline.Entities.UserEntity", "Owner") .WithMany("Timelines") .HasForeignKey("OwnerId") .OnDelete(DeleteBehavior.Cascade) @@ -223,7 +206,7 @@ namespace Timeline.Migrations.ProductionDatabase .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Timeline.Entities.User", "User") + b.HasOne("Timeline.Entities.UserEntity", "User") .WithMany("TimelinesJoined") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -232,7 +215,7 @@ namespace Timeline.Migrations.ProductionDatabase modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => { - b.HasOne("Timeline.Entities.User", "Author") + b.HasOne("Timeline.Entities.UserEntity", "Author") .WithMany("TimelinePosts") .HasForeignKey("AuthorId") .OnDelete(DeleteBehavior.Cascade) @@ -245,20 +228,11 @@ namespace Timeline.Migrations.ProductionDatabase .IsRequired(); }); - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => + modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => { - b.HasOne("Timeline.Entities.User", null) + b.HasOne("Timeline.Entities.UserEntity", "User") .WithOne("Avatar") - .HasForeignKey("Timeline.Entities.UserAvatar", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserDetail", b => - { - b.HasOne("Timeline.Entities.User", null) - .WithOne("Detail") - .HasForeignKey("Timeline.Entities.UserDetail", "UserId") + .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs index 14ee37e3..86349a27 100644 --- a/Timeline/Startup.cs +++ b/Timeline/Startup.cs @@ -8,6 +8,8 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure; +using Pomelo.EntityFrameworkCore.MySql.Storage; using System; using System.Text.Json.Serialization; using Timeline.Auth; @@ -108,7 +110,8 @@ namespace Timeline { if (databaseConfig.ConnectionString == null) throw new InvalidOperationException("DatabaseConfig.ConnectionString is not set. Please set it as a mysql connection string."); - options.UseMySql(databaseConfig.ConnectionString); + options.UseMySql(databaseConfig.ConnectionString, + mySqlOptions => mySqlOptions.ServerVersion(new ServerVersion(new Version(5, 7), ServerType.MySql))); }); } } -- cgit v1.2.3