From 4cfb50d40384e5dea1805f8d6fc5ab38cd32d93b Mon Sep 17 00:00:00 2001 From: crupest Date: Sun, 14 Jun 2020 00:21:25 +0800 Subject: refactor(back): Use a better way to handle unique id in timeline. --- Timeline/Entities/DatabaseContext.cs | 11 +- Timeline/Entities/TimelineEntity.cs | 4 +- .../20200613135613_AddTimelineUniqueId.Designer.cs | 306 --------------------- .../20200613135613_AddTimelineUniqueId.cs | 39 --- .../20200613161127_AddTimelineUniqueId.Designer.cs | 305 ++++++++++++++++++++ .../20200613161127_AddTimelineUniqueId.cs | 37 +++ .../Migrations/DatabaseContextModelSnapshot.cs | 7 +- 7 files changed, 348 insertions(+), 361 deletions(-) delete mode 100644 Timeline/Migrations/20200613135613_AddTimelineUniqueId.Designer.cs delete mode 100644 Timeline/Migrations/20200613135613_AddTimelineUniqueId.cs create mode 100644 Timeline/Migrations/20200613161127_AddTimelineUniqueId.Designer.cs create mode 100644 Timeline/Migrations/20200613161127_AddTimelineUniqueId.cs (limited to 'Timeline') diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs index 96e47cc8..af7d2edb 100644 --- a/Timeline/Entities/DatabaseContext.cs +++ b/Timeline/Entities/DatabaseContext.cs @@ -9,15 +9,6 @@ namespace Timeline.Entities public DatabaseContext(DbContextOptions options) : base(options) { - if (Database.IsSqlite()) - { - var connection = (SqliteConnection)Database.GetDbConnection(); - connection.CreateFunction("timeline_create_guid", () => Guid.NewGuid().ToString()); - } - else - { - throw new InvalidOperationException(Resources.Entities.ExceptionOnlySqliteSupported); - } } protected override void OnModelCreating(ModelBuilder modelBuilder) @@ -25,7 +16,7 @@ namespace Timeline.Entities modelBuilder.Entity().Property(e => e.Version).HasDefaultValue(0); modelBuilder.Entity().HasIndex(e => e.Username).IsUnique(); modelBuilder.Entity().HasIndex(e => e.Tag).IsUnique(); - modelBuilder.Entity().Property(e => e.UniqueId).HasDefaultValueSql("timeline_create_guid()"); + modelBuilder.Entity().Property(e => e.UniqueId).HasDefaultValueSql("randomblob(16)"); } public DbSet Users { get; set; } = default!; diff --git a/Timeline/Entities/TimelineEntity.cs b/Timeline/Entities/TimelineEntity.cs index 1159cbfe..4a4e8502 100644 --- a/Timeline/Entities/TimelineEntity.cs +++ b/Timeline/Entities/TimelineEntity.cs @@ -14,8 +14,8 @@ namespace Timeline.Entities [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long Id { get; set; } - [Column("unique_id"), Required] - public string UniqueId { get; set; } = default!; + [Column("unique_id", TypeName = "BLOB"), Required] + public Guid UniqueId { get; set; } = default!; /// /// If null, then this timeline is a personal timeline. diff --git a/Timeline/Migrations/20200613135613_AddTimelineUniqueId.Designer.cs b/Timeline/Migrations/20200613135613_AddTimelineUniqueId.Designer.cs deleted file mode 100644 index fb24f8cf..00000000 --- a/Timeline/Migrations/20200613135613_AddTimelineUniqueId.Designer.cs +++ /dev/null @@ -1,306 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Timeline.Entities; - -namespace Timeline.Migrations -{ - [DbContext(typeof(DatabaseContext))] - [Migration("20200613135613_AddTimelineUniqueId")] - partial class AddTimelineUniqueId - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.1.4"); - - modelBuilder.Entity("Timeline.Entities.DataEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("Data") - .IsRequired() - .HasColumnName("data") - .HasColumnType("BLOB"); - - b.Property("Ref") - .HasColumnName("ref") - .HasColumnType("INTEGER"); - - b.Property("Tag") - .IsRequired() - .HasColumnName("tag") - .HasColumnType("TEXT"); - - b.HasKey("Id"); - - b.HasIndex("Tag") - .IsUnique(); - - b.ToTable("data"); - }); - - modelBuilder.Entity("Timeline.Entities.JwtTokenEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("Key") - .IsRequired() - .HasColumnName("key") - .HasColumnType("BLOB"); - - b.HasKey("Id"); - - b.ToTable("jwt_token"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("CreateTime") - .HasColumnName("create_time") - .HasColumnType("TEXT"); - - b.Property("CurrentPostLocalId") - .HasColumnName("current_post_local_id") - .HasColumnType("INTEGER"); - - b.Property("Description") - .HasColumnName("description") - .HasColumnType("TEXT"); - - b.Property("Name") - .HasColumnName("name") - .HasColumnType("TEXT"); - - b.Property("OwnerId") - .HasColumnName("owner") - .HasColumnType("INTEGER"); - - b.Property("UniqueId") - .IsRequired() - .ValueGeneratedOnAdd() - .HasColumnName("unique_id") - .HasColumnType("TEXT") - .HasDefaultValueSql("timeline_create_guid()"); - - b.Property("Visibility") - .HasColumnName("visibility") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.ToTable("timelines"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("INTEGER"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("INTEGER"); - - 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("INTEGER"); - - b.Property("AuthorId") - .HasColumnName("author") - .HasColumnType("INTEGER"); - - b.Property("Content") - .HasColumnName("content") - .HasColumnType("TEXT"); - - b.Property("ContentType") - .IsRequired() - .HasColumnName("content_type") - .HasColumnType("TEXT"); - - b.Property("ExtraContent") - .HasColumnName("extra_content") - .HasColumnType("TEXT"); - - b.Property("LastUpdated") - .HasColumnName("last_updated") - .HasColumnType("TEXT"); - - b.Property("LocalId") - .HasColumnName("local_id") - .HasColumnType("INTEGER"); - - b.Property("Time") - .HasColumnName("time") - .HasColumnType("TEXT"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("INTEGER"); - - 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("INTEGER"); - - b.Property("DataTag") - .HasColumnName("data_tag") - .HasColumnType("TEXT"); - - b.Property("LastModified") - .HasColumnName("last_modified") - .HasColumnType("TEXT"); - - b.Property("Type") - .HasColumnName("type") - .HasColumnType("TEXT"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_avatars"); - }); - - modelBuilder.Entity("Timeline.Entities.UserEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("Nickname") - .HasColumnName("nickname") - .HasColumnType("TEXT"); - - b.Property("Password") - .IsRequired() - .HasColumnName("password") - .HasColumnType("TEXT"); - - b.Property("Roles") - .IsRequired() - .HasColumnName("roles") - .HasColumnType("TEXT"); - - b.Property("Username") - .IsRequired() - .HasColumnName("username") - .HasColumnType("TEXT"); - - b.Property("Version") - .ValueGeneratedOnAdd() - .HasColumnName("version") - .HasColumnType("INTEGER") - .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/20200613135613_AddTimelineUniqueId.cs b/Timeline/Migrations/20200613135613_AddTimelineUniqueId.cs deleted file mode 100644 index fdca85b2..00000000 --- a/Timeline/Migrations/20200613135613_AddTimelineUniqueId.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Timeline.Migrations -{ - public partial class AddTimelineUniqueId : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.Sql( -@" -ALTER TABLE timelines RENAME TO timelines_backup; - -CREATE TABLE timelines ( - id INTEGER NOT NULL CONSTRAINT PK_timelines PRIMARY KEY AUTOINCREMENT, - unique_id TEXT NOT NULL DEFAULT (timeline_create_guid()), - name TEXT NULL, - description TEXT NULL, - owner INTEGER NOT NULL, - visibility INTEGER NOT NULL, - create_time TEXT NOT NULL, current_post_local_id INTEGER NOT NULL DEFAULT 0, - CONSTRAINT FK_timelines_users_owner FOREIGN KEY (owner) REFERENCES users (id) ON DELETE CASCADE -); - -INSERT INTO timelines (id, name, description, owner, visibility, create_time) - SELECT id, name, description, owner, visibility, create_time FROM timelines_backup; - -DROP TABLE timelines_backup; -" - ); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "unique_id", - table: "timelines"); - } - } -} diff --git a/Timeline/Migrations/20200613161127_AddTimelineUniqueId.Designer.cs b/Timeline/Migrations/20200613161127_AddTimelineUniqueId.Designer.cs new file mode 100644 index 00000000..4a8da5fd --- /dev/null +++ b/Timeline/Migrations/20200613161127_AddTimelineUniqueId.Designer.cs @@ -0,0 +1,305 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Timeline.Entities; + +namespace Timeline.Migrations +{ + [DbContext(typeof(DatabaseContext))] + [Migration("20200613161127_AddTimelineUniqueId")] + partial class AddTimelineUniqueId + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.1.4"); + + modelBuilder.Entity("Timeline.Entities.DataEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Data") + .IsRequired() + .HasColumnName("data") + .HasColumnType("BLOB"); + + b.Property("Ref") + .HasColumnName("ref") + .HasColumnType("INTEGER"); + + b.Property("Tag") + .IsRequired() + .HasColumnName("tag") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Tag") + .IsUnique(); + + b.ToTable("data"); + }); + + modelBuilder.Entity("Timeline.Entities.JwtTokenEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnName("key") + .HasColumnType("BLOB"); + + b.HasKey("Id"); + + b.ToTable("jwt_token"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("CreateTime") + .HasColumnName("create_time") + .HasColumnType("TEXT"); + + b.Property("CurrentPostLocalId") + .HasColumnName("current_post_local_id") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnName("description") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnName("name") + .HasColumnType("TEXT"); + + b.Property("OwnerId") + .HasColumnName("owner") + .HasColumnType("INTEGER"); + + b.Property("UniqueId") + .ValueGeneratedOnAdd() + .HasColumnName("unique_id") + .HasColumnType("BLOB") + .HasDefaultValueSql("randomblob(16)"); + + b.Property("Visibility") + .HasColumnName("visibility") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.ToTable("timelines"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("INTEGER"); + + b.Property("UserId") + .HasColumnName("user") + .HasColumnType("INTEGER"); + + 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("INTEGER"); + + b.Property("AuthorId") + .HasColumnName("author") + .HasColumnType("INTEGER"); + + b.Property("Content") + .HasColumnName("content") + .HasColumnType("TEXT"); + + b.Property("ContentType") + .IsRequired() + .HasColumnName("content_type") + .HasColumnType("TEXT"); + + b.Property("ExtraContent") + .HasColumnName("extra_content") + .HasColumnType("TEXT"); + + b.Property("LastUpdated") + .HasColumnName("last_updated") + .HasColumnType("TEXT"); + + b.Property("LocalId") + .HasColumnName("local_id") + .HasColumnType("INTEGER"); + + b.Property("Time") + .HasColumnName("time") + .HasColumnType("TEXT"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("INTEGER"); + + 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("INTEGER"); + + b.Property("DataTag") + .HasColumnName("data_tag") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnName("last_modified") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnName("type") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnName("user") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("user_avatars"); + }); + + modelBuilder.Entity("Timeline.Entities.UserEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Nickname") + .HasColumnName("nickname") + .HasColumnType("TEXT"); + + b.Property("Password") + .IsRequired() + .HasColumnName("password") + .HasColumnType("TEXT"); + + b.Property("Roles") + .IsRequired() + .HasColumnName("roles") + .HasColumnType("TEXT"); + + b.Property("Username") + .IsRequired() + .HasColumnName("username") + .HasColumnType("TEXT"); + + b.Property("Version") + .ValueGeneratedOnAdd() + .HasColumnName("version") + .HasColumnType("INTEGER") + .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/20200613161127_AddTimelineUniqueId.cs b/Timeline/Migrations/20200613161127_AddTimelineUniqueId.cs new file mode 100644 index 00000000..badd33ea --- /dev/null +++ b/Timeline/Migrations/20200613161127_AddTimelineUniqueId.cs @@ -0,0 +1,37 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Timeline.Migrations +{ + public partial class AddTimelineUniqueId : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.Sql( +@" +ALTER TABLE timelines RENAME TO timelines_backup; + +CREATE TABLE timelines ( + id INTEGER NOT NULL CONSTRAINT PK_timelines PRIMARY KEY AUTOINCREMENT, + unique_id BLOB NOT NULL DEFAULT (randomblob(16)), + name TEXT NULL, + description TEXT NULL, + owner INTEGER NOT NULL, + visibility INTEGER NOT NULL, + create_time TEXT NOT NULL, current_post_local_id INTEGER NOT NULL DEFAULT 0, + CONSTRAINT FK_timelines_users_owner FOREIGN KEY (owner) REFERENCES users (id) ON DELETE CASCADE +); + +INSERT INTO timelines (id, name, description, owner, visibility, create_time) + SELECT id, name, description, owner, visibility, create_time FROM timelines_backup; + +DROP TABLE timelines_backup; +" + ); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + } + } +} diff --git a/Timeline/Migrations/DatabaseContextModelSnapshot.cs b/Timeline/Migrations/DatabaseContextModelSnapshot.cs index eb22653f..111ae9c2 100644 --- a/Timeline/Migrations/DatabaseContextModelSnapshot.cs +++ b/Timeline/Migrations/DatabaseContextModelSnapshot.cs @@ -89,12 +89,11 @@ namespace Timeline.Migrations .HasColumnName("owner") .HasColumnType("INTEGER"); - b.Property("UniqueId") - .IsRequired() + b.Property("UniqueId") .ValueGeneratedOnAdd() .HasColumnName("unique_id") - .HasColumnType("TEXT") - .HasDefaultValueSql("timeline_create_guid()"); + .HasColumnType("BLOB") + .HasDefaultValueSql("randomblob(16)"); b.Property("Visibility") .HasColumnName("visibility") -- cgit v1.2.3