Merge branch 'develop' into features/migrate-urlShortener

# Conflicts:
#	migrations/mysql/UrlShortenerDbContext/20230414201716_UrlShortenerDbContext_Upgrade1.Designer.cs
#	migrations/postgre/UrlShortenerDbContext/20230414201716_UrlShortenerDbContext_Upgrade1.Designer.cs
#	web/ASC.Web.Core/UrlShortRewriter.cs
This commit is contained in:
pavelbannov 2023-07-26 18:10:27 +03:00
commit 2888955632
2 changed files with 0 additions and 117 deletions

View File

@ -1,57 +0,0 @@
// <auto-generated />
using ASC.Core.Common.EF.Context;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace ASC.Migrations.MySql.Migrations.UrlShortenerDb
{
[DbContext(typeof(UrlShortenerDbContext))]
[Migration("20230414201716_UrlShortenerDbContext_Upgrade1")]
partial class UrlShortenerDbContextUpgrade1
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "7.0.2")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("ASC.Core.Common.EF.Model.ShortLink", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint(19)")
.HasColumnName("id");
b.Property<string>("Link")
.HasColumnType("text")
.HasColumnName("link")
.UseCollation("utf8_bin");
b.Property<string>("Short")
.HasColumnType("varchar(12)")
.HasColumnName("short")
.UseCollation("utf8_general_ci")
.HasAnnotation("MySql:CharSet", "utf8");
b.HasKey("Id")
.HasName("PRIMARY");
b.HasIndex("Short")
.IsUnique();
b.ToTable("short_links", (string)null);
b
.HasAnnotation("MySql:CharSet", "utf8")
.HasAnnotation("Relational:Collation", "utf8_general_ci");
});
#pragma warning restore 612, 618
}
}
}

View File

@ -1,60 +0,0 @@
// <auto-generated />
using ASC.Core.Common.EF.Context;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace ASC.Migrations.PostgreSql.Migrations.UrlShortenerDb
{
[DbContext(typeof(UrlShortenerDbContext))]
[Migration("20230414201716_UrlShortenerDbContext_Upgrade1")]
partial class UrlShortenerDbContextUpgrade1
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn)
.HasAnnotation("ProductVersion", "7.0.2")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
modelBuilder.Entity("ASC.Core.Common.EF.Model.ShortLink", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint(19)")
.HasColumnName("id")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<string>("Link")
.HasColumnType("text")
.HasColumnName("link")
.UseCollation("utf8_bin");
b.Property<string>("Short")
.HasColumnType("varchar(12)")
.HasColumnName("short")
.UseCollation("utf8_general_ci")
.HasAnnotation("MySql:CharSet", "utf8");
b.HasKey("Id")
.HasName("PRIMARY");
b.HasIndex("Short")
.IsUnique();
b.ToTable("short_links", (string)null);
b
.HasAnnotation("MySql:CharSet", "utf8")
.HasAnnotation("Relational:Collation", "utf8_general_ci");
});
#pragma warning restore 612, 618
}
}
}