diff options
| -rw-r--r-- | Timeline/Entities/DatabaseContext.cs | 2 | ||||
| -rw-r--r-- | Timeline/Entities/TimelineEntity.cs | 4 | ||||
| -rw-r--r-- | Timeline/Migrations/20200614061237_AddTimelineUniqueId.Designer.cs (renamed from Timeline/Migrations/20200613161127_AddTimelineUniqueId.Designer.cs) | 9 | ||||
| -rw-r--r-- | Timeline/Migrations/20200614061237_AddTimelineUniqueId.cs (renamed from Timeline/Migrations/20200613161127_AddTimelineUniqueId.cs) | 7 | ||||
| -rw-r--r-- | Timeline/Migrations/DatabaseContextModelSnapshot.cs | 7 | ||||
| -rw-r--r-- | Timeline/Models/Timeline.cs | 2 | ||||
| -rw-r--r-- | Timeline/Startup.cs | 5 |
7 files changed, 17 insertions, 19 deletions
diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs index 136dc442..acb80742 100644 --- a/Timeline/Entities/DatabaseContext.cs +++ b/Timeline/Entities/DatabaseContext.cs @@ -14,7 +14,7 @@ namespace Timeline.Entities modelBuilder.Entity<UserEntity>().Property(e => e.Version).HasDefaultValue(0);
modelBuilder.Entity<UserEntity>().HasIndex(e => e.Username).IsUnique();
modelBuilder.Entity<DataEntity>().HasIndex(e => e.Tag).IsUnique();
- modelBuilder.Entity<TimelineEntity>().Property(e => e.UniqueId).HasDefaultValueSql("randomblob(16)");
+ modelBuilder.Entity<TimelineEntity>().Property(e => e.UniqueId).HasDefaultValueSql("lower(hex(randomblob(16)))");
}
public DbSet<UserEntity> Users { get; set; } = default!;
diff --git a/Timeline/Entities/TimelineEntity.cs b/Timeline/Entities/TimelineEntity.cs index 4a4e8502..1159cbfe 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", TypeName = "BLOB"), Required]
- public Guid UniqueId { get; set; } = default!;
+ [Column("unique_id"), Required]
+ public string UniqueId { get; set; } = default!;
/// <summary>
/// If null, then this timeline is a personal timeline.
diff --git a/Timeline/Migrations/20200613161127_AddTimelineUniqueId.Designer.cs b/Timeline/Migrations/20200614061237_AddTimelineUniqueId.Designer.cs index 4a8da5fd..adcc6308 100644 --- a/Timeline/Migrations/20200613161127_AddTimelineUniqueId.Designer.cs +++ b/Timeline/Migrations/20200614061237_AddTimelineUniqueId.Designer.cs @@ -9,7 +9,7 @@ using Timeline.Entities; namespace Timeline.Migrations
{
[DbContext(typeof(DatabaseContext))]
- [Migration("20200613161127_AddTimelineUniqueId")]
+ [Migration("20200614061237_AddTimelineUniqueId")]
partial class AddTimelineUniqueId
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -91,11 +91,12 @@ namespace Timeline.Migrations .HasColumnName("owner")
.HasColumnType("INTEGER");
- b.Property<Guid>("UniqueId")
+ b.Property<string>("UniqueId")
+ .IsRequired()
.ValueGeneratedOnAdd()
.HasColumnName("unique_id")
- .HasColumnType("BLOB")
- .HasDefaultValueSql("randomblob(16)");
+ .HasColumnType("TEXT")
+ .HasDefaultValueSql("lower(hex(randomblob(16)))");
b.Property<int>("Visibility")
.HasColumnName("visibility")
diff --git a/Timeline/Migrations/20200613161127_AddTimelineUniqueId.cs b/Timeline/Migrations/20200614061237_AddTimelineUniqueId.cs index badd33ea..80e90dbf 100644 --- a/Timeline/Migrations/20200613161127_AddTimelineUniqueId.cs +++ b/Timeline/Migrations/20200614061237_AddTimelineUniqueId.cs @@ -1,5 +1,4 @@ -using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
namespace Timeline.Migrations
{
@@ -13,7 +12,7 @@ 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)),
+ unique_id TEXT NOT NULL DEFAULT (lower(hex(randomblob(16)))),
name TEXT NULL,
description TEXT NULL,
owner INTEGER NOT NULL,
@@ -27,7 +26,7 @@ INSERT INTO timelines (id, name, description, owner, visibility, create_time) DROP TABLE timelines_backup;
"
- );
+ );
}
protected override void Down(MigrationBuilder migrationBuilder)
diff --git a/Timeline/Migrations/DatabaseContextModelSnapshot.cs b/Timeline/Migrations/DatabaseContextModelSnapshot.cs index 111ae9c2..ea0b58c6 100644 --- a/Timeline/Migrations/DatabaseContextModelSnapshot.cs +++ b/Timeline/Migrations/DatabaseContextModelSnapshot.cs @@ -89,11 +89,12 @@ namespace Timeline.Migrations .HasColumnName("owner")
.HasColumnType("INTEGER");
- b.Property<Guid>("UniqueId")
+ b.Property<string>("UniqueId")
+ .IsRequired()
.ValueGeneratedOnAdd()
.HasColumnName("unique_id")
- .HasColumnType("BLOB")
- .HasDefaultValueSql("randomblob(16)");
+ .HasColumnType("TEXT")
+ .HasDefaultValueSql("lower(hex(randomblob(16)))");
b.Property<int>("Visibility")
.HasColumnName("visibility")
diff --git a/Timeline/Models/Timeline.cs b/Timeline/Models/Timeline.cs index c47d7be3..d4b3e849 100644 --- a/Timeline/Models/Timeline.cs +++ b/Timeline/Models/Timeline.cs @@ -70,7 +70,7 @@ namespace Timeline.Models public class Timeline
#pragma warning restore CA1724 // Type names should not match namespaces
{
- public Guid UniqueID { get; set; } = default!;
+ public string UniqueID { get; set; } = default!;
public string Name { get; set; } = default!;
public string Description { get; set; } = default!;
public User Owner { get; set; } = default!;
diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs index 76d77e8e..35c47712 100644 --- a/Timeline/Startup.cs +++ b/Timeline/Startup.cs @@ -62,10 +62,7 @@ namespace Timeline services.AddScoped<IPathProvider, PathProvider>();
- services.AddAutoMapper((config) =>
- {
- config.CreateMap<Guid, string>().ConvertUsing(guid => guid.ToString());
- }, GetType().Assembly);
+ services.AddAutoMapper(GetType().Assembly);
services.AddTransient<IClock, Clock>();
|