aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2020-02-01 00:25:41 +0800
committercrupest <crupest@outlook.com>2020-02-01 00:25:41 +0800
commitbcb0a2361467614531a337282da1fd23996924f1 (patch)
treef02f8d57440c777d4732bc4439f82e8b25c6732c
parent69a5cc2a6f3282de4859d7c083bd67dfa17226fb (diff)
downloadtimeline-bcb0a2361467614531a337282da1fd23996924f1.tar.gz
timeline-bcb0a2361467614531a337282da1fd23996924f1.tar.bz2
timeline-bcb0a2361467614531a337282da1fd23996924f1.zip
...
Diffstat
-rw-r--r--Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs7
-rw-r--r--Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs244
-rw-r--r--Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs55
-rw-r--r--Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs92
-rw-r--r--Timeline/Startup.cs5
5 files changed, 336 insertions, 67 deletions
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 @@
+// <auto-generated />
+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<long>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnName("id")
+ .HasColumnType("bigint");
+
+ b.Property<DateTime>("CreateTime")
+ .HasColumnName("create_time")
+ .HasColumnType("datetime(6)");
+
+ b.Property<string>("Description")
+ .HasColumnName("description")
+ .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+ b.Property<string>("Name")
+ .HasColumnName("name")
+ .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+ b.Property<long>("OwnerId")
+ .HasColumnName("owner")
+ .HasColumnType("bigint");
+
+ b.Property<int>("Visibility")
+ .HasColumnName("visibility")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OwnerId");
+
+ b.ToTable("timelines");
+ });
+
+ modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b =>
+ {
+ b.Property<long>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnName("id")
+ .HasColumnType("bigint");
+
+ b.Property<long>("TimelineId")
+ .HasColumnName("timeline")
+ .HasColumnType("bigint");
+
+ b.Property<long>("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<long>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnName("id")
+ .HasColumnType("bigint");
+
+ b.Property<long>("AuthorId")
+ .HasColumnName("author")
+ .HasColumnType("bigint");
+
+ b.Property<string>("Content")
+ .HasColumnName("content")
+ .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+ b.Property<DateTime>("LastUpdated")
+ .HasColumnName("last_updated")
+ .HasColumnType("datetime(6)");
+
+ b.Property<DateTime>("Time")
+ .HasColumnName("time")
+ .HasColumnType("datetime(6)");
+
+ b.Property<long>("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<long>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnName("id")
+ .HasColumnType("bigint");
+
+ b.Property<byte[]>("Data")
+ .HasColumnName("data")
+ .HasColumnType("longblob");
+
+ b.Property<string>("ETag")
+ .HasColumnName("etag")
+ .HasColumnType("varchar(30) CHARACTER SET utf8mb4")
+ .HasMaxLength(30);
+
+ b.Property<DateTime>("LastModified")
+ .HasColumnName("last_modified")
+ .HasColumnType("datetime(6)");
+
+ b.Property<string>("Type")
+ .HasColumnName("type")
+ .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+ b.Property<long>("UserId")
+ .HasColumnName("user")
+ .HasColumnType("bigint");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId")
+ .IsUnique();
+
+ b.ToTable("user_avatars");
+ });
+
+ modelBuilder.Entity("Timeline.Entities.UserEntity", b =>
+ {
+ b.Property<long>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnName("id")
+ .HasColumnType("bigint");
+
+ b.Property<string>("Nickname")
+ .HasColumnName("nickname")
+ .HasColumnType("varchar(100) CHARACTER SET utf8mb4")
+ .HasMaxLength(100);
+
+ b.Property<string>("Password")
+ .IsRequired()
+ .HasColumnName("password")
+ .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+ b.Property<string>("Roles")
+ .IsRequired()
+ .HasColumnName("roles")
+ .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+ b.Property<string>("Username")
+ .IsRequired()
+ .HasColumnName("username")
+ .HasColumnType("varchar(26) CHARACTER SET utf8mb4")
+ .HasMaxLength(26);
+
+ b.Property<long>("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<long>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id")
- .HasColumnType("bigint");
-
- b.Property<string>("EncryptedPassword")
- .IsRequired()
- .HasColumnName("password")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<string>("Name")
- .IsRequired()
- .HasColumnName("name")
- .HasColumnType("varchar(26) CHARACTER SET utf8mb4")
- .HasMaxLength(26);
-
- b.Property<string>("RoleString")
- .IsRequired()
- .HasColumnName("roles")
- .HasColumnType("longtext CHARACTER SET utf8mb4");
-
- b.Property<long>("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<long>("Id")
.ValueGeneratedOnAdd()
@@ -173,6 +136,7 @@ namespace Timeline.Migrations.ProductionDatabase
.HasColumnType("longtext CHARACTER SET utf8mb4");
b.Property<long>("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<long>("Id")
.ValueGeneratedOnAdd()
@@ -192,23 +156,42 @@ namespace Timeline.Migrations.ProductionDatabase
b.Property<string>("Nickname")
.HasColumnName("nickname")
+ .HasColumnType("varchar(100) CHARACTER SET utf8mb4")
+ .HasMaxLength(100);
+
+ b.Property<string>("Password")
+ .IsRequired()
+ .HasColumnName("password")
+ .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+ b.Property<string>("Roles")
+ .IsRequired()
+ .HasColumnName("roles")
+ .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+ b.Property<string>("Username")
+ .IsRequired()
+ .HasColumnName("username")
.HasColumnType("varchar(26) CHARACTER SET utf8mb4")
.HasMaxLength(26);
- b.Property<long>("UserId")
- .HasColumnType("bigint");
+ b.Property<long>("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)));
});
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-28 20:33:04 +0000