From ab015538d9c28878efcdba000a535ab340495fc9 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Mon, 25 Jul 2022 19:20:16 +0300
Subject: [PATCH] fix

---
 ...ner.cs => 20220725161614_UserDbContextMigrate.Designer.cs} | 4 ++--
 ...ntextMigrate.cs => 20220725161614_UserDbContextMigrate.cs} | 4 ++--
 ...ner.cs => 20220725161742_UserDbContextMigrate.Designer.cs} | 4 ++--
 ...ntextMigrate.cs => 20220725161742_UserDbContextMigrate.cs} | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename migrations/mysql/UserDbContext/{20220724114547_UserDbContextMigrate.Designer.cs => 20220725161614_UserDbContextMigrate.Designer.cs} (97%)
 rename migrations/mysql/UserDbContext/{20220724114547_UserDbContextMigrate.cs => 20220725161614_UserDbContextMigrate.cs} (98%)
 rename migrations/postgre/UserDbContext/{20220724114547_UserDbContextMigrate.Designer.cs => 20220725161742_UserDbContextMigrate.Designer.cs} (97%)
 rename migrations/postgre/UserDbContext/{20220724114547_UserDbContextMigrate.cs => 20220725161742_UserDbContextMigrate.cs} (98%)

diff --git a/migrations/mysql/UserDbContext/20220724114547_UserDbContextMigrate.Designer.cs b/migrations/mysql/UserDbContext/20220725161614_UserDbContextMigrate.Designer.cs
similarity index 97%
rename from migrations/mysql/UserDbContext/20220724114547_UserDbContextMigrate.Designer.cs
rename to migrations/mysql/UserDbContext/20220725161614_UserDbContextMigrate.Designer.cs
index e51ad5b2ad..46163502e3 100644
--- a/migrations/mysql/UserDbContext/20220724114547_UserDbContextMigrate.Designer.cs
+++ b/migrations/mysql/UserDbContext/20220725161614_UserDbContextMigrate.Designer.cs
@@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace ASC.Migrations.MySql.Migrations
 {
     [DbContext(typeof(UserDbContext))]
-    [Migration("20220724114547_UserDbContextMigrate")]
+    [Migration("20220725161614_UserDbContextMigrate")]
     partial class UserDbContextMigrate
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -1366,7 +1366,7 @@ namespace ASC.Migrations.MySql.Migrations
 
                     b.Property<string>("UserId")
                         .HasColumnType("varchar(38)")
-                        .HasColumnName("userid")
+                        .HasColumnName("user_id")
                         .UseCollation("utf8_general_ci")
                         .HasAnnotation("MySql:CharSet", "utf8");
 
diff --git a/migrations/mysql/UserDbContext/20220724114547_UserDbContextMigrate.cs b/migrations/mysql/UserDbContext/20220725161614_UserDbContextMigrate.cs
similarity index 98%
rename from migrations/mysql/UserDbContext/20220724114547_UserDbContextMigrate.cs
rename to migrations/mysql/UserDbContext/20220725161614_UserDbContextMigrate.cs
index 2fe9817e94..a41c0e5a79 100644
--- a/migrations/mysql/UserDbContext/20220724114547_UserDbContextMigrate.cs
+++ b/migrations/mysql/UserDbContext/20220725161614_UserDbContextMigrate.cs
@@ -151,12 +151,12 @@ namespace ASC.Migrations.MySql.Migrations
                 columns: table => new
                 {
                     tenant_id = table.Column<int>(type: "int", nullable: false),
-                    userid = table.Column<string>(type: "varchar(38)", nullable: false, collation: "utf8_general_ci")
+                    user_id = table.Column<string>(type: "varchar(38)", nullable: false, collation: "utf8_general_ci")
                         .Annotation("MySql:CharSet", "utf8")
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PRIMARY", x => new { x.tenant_id, x.userid });
+                    table.PrimaryKey("PRIMARY", x => new { x.tenant_id, x.user_id });
                 })
                 .Annotation("MySql:CharSet", "utf8mb4");
 
diff --git a/migrations/postgre/UserDbContext/20220724114547_UserDbContextMigrate.Designer.cs b/migrations/postgre/UserDbContext/20220725161742_UserDbContextMigrate.Designer.cs
similarity index 97%
rename from migrations/postgre/UserDbContext/20220724114547_UserDbContextMigrate.Designer.cs
rename to migrations/postgre/UserDbContext/20220725161742_UserDbContextMigrate.Designer.cs
index cea3ac5f78..41e4d49f10 100644
--- a/migrations/postgre/UserDbContext/20220724114547_UserDbContextMigrate.Designer.cs
+++ b/migrations/postgre/UserDbContext/20220725161742_UserDbContextMigrate.Designer.cs
@@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace ASC.Migrations.PostgreSql.Migrations
 {
     [DbContext(typeof(UserDbContext))]
-    [Migration("20220724114547_UserDbContextMigrate")]
+    [Migration("20220725161742_UserDbContextMigrate")]
     partial class UserDbContextMigrate
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -1348,7 +1348,7 @@ namespace ASC.Migrations.PostgreSql.Migrations
                     b.Property<Guid>("UserId")
                         .HasMaxLength(38)
                         .HasColumnType("uuid")
-                        .HasColumnName("userid");
+                        .HasColumnName("user_id");
 
                     b.HasKey("TenantId", "UserId")
                         .HasName("core_userdav_pkey");
diff --git a/migrations/postgre/UserDbContext/20220724114547_UserDbContextMigrate.cs b/migrations/postgre/UserDbContext/20220725161742_UserDbContextMigrate.cs
similarity index 98%
rename from migrations/postgre/UserDbContext/20220724114547_UserDbContextMigrate.cs
rename to migrations/postgre/UserDbContext/20220725161742_UserDbContextMigrate.cs
index edd166d9fd..532fa3734a 100644
--- a/migrations/postgre/UserDbContext/20220724114547_UserDbContextMigrate.cs
+++ b/migrations/postgre/UserDbContext/20220725161742_UserDbContextMigrate.cs
@@ -121,11 +121,11 @@ namespace ASC.Migrations.PostgreSql.Migrations
                 columns: table => new
                 {
                     tenant_id = table.Column<int>(type: "integer", nullable: false),
-                    userid = table.Column<Guid>(type: "uuid", maxLength: 38, nullable: false)
+                    user_id = table.Column<Guid>(type: "uuid", maxLength: 38, nullable: false)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("core_userdav_pkey", x => new { x.tenant_id, x.userid });
+                    table.PrimaryKey("core_userdav_pkey", x => new { x.tenant_id, x.user_id });
                 });
 
             migrationBuilder.CreateTable(