1 files changed, 14 insertions, 111 deletions
diff --git a/Migrations/HBContextModelSnapshot.cs b/Migrations/HBContextModelSnapshot.cs
index 5514b9b..16e6b48 100644
--- a/Migrations/HBContextModelSnapshot.cs
+++ b/Migrations/HBContextModelSnapshot.cs
@@ -69,7 +69,7 @@ namespace HyperBooru.Migrations
                     b.HasIndex("MediaId")
                         .IsUnique();
 
-                    b.ToTable("OcrData");
+                    b.ToTable("OcrData", (string)null);
                 });
 
             modelBuilder.Entity("TagDefinitionTagDefinition", b =>
@@ -84,53 +84,7 @@ namespace HyperBooru.Migrations
 
                     b.HasIndex("TagDefinitionObjectId");
 
-                    b.ToTable("TagDefinitionTagDefinition");
-                });
-
-            modelBuilder.Entity("HyperBooru.Acl", b =>
-                {
-                    b.HasBaseType("HyperBooru.HBObject");
-
-                    b.Property<int?>("SubjectTempId1")
-                        .HasColumnType("integer");
-
-                    b.ToTable("Acls");
-                });
-
-            modelBuilder.Entity("HyperBooru.AclRule", b =>
-                {
-                    b.HasBaseType("HyperBooru.HBObject");
-
-                    b.Property<int?>("AclObjectId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Action")
-                        .HasColumnType("integer");
-
-                    b.Property<long>("Permissions")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("PrincipalObjectId")
-                        .HasColumnType("integer");
-
-                    b.HasIndex("AclObjectId");
-
-                    b.HasIndex("PrincipalObjectId");
-
-                    b.ToTable("AclRules");
-                });
-
-            modelBuilder.Entity("HyperBooru.HBPrincipal", b =>
-                {
-                    b.HasBaseType("HyperBooru.HBObject");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasIndex("Name");
-
-                    b.ToTable("Principals");
+                    b.ToTable("TagDefinitionTagDefinition", (string)null);
                 });
 
             modelBuilder.Entity("HyperBooru.Media", b =>
@@ -255,35 +209,29 @@ namespace HyperBooru.Migrations
                     b.ToTable("UploadedFiles", (string)null);
                 });
 
-            modelBuilder.Entity("HyperBooru.Group", b =>
-                {
-                    b.HasBaseType("HyperBooru.HBPrincipal");
-
-                    b.Property<int?>("HBPrincipalObjectId")
-                        .HasColumnType("integer");
-
-                    b.HasIndex("HBPrincipalObjectId");
-
-                    b.ToTable("Groups");
-                });
-
             modelBuilder.Entity("HyperBooru.User", b =>
                 {
-                    b.HasBaseType("HyperBooru.HBPrincipal");
+                    b.HasBaseType("HyperBooru.HBObject");
 
                     b.Property<string>("PasswordHash")
                         .IsRequired()
                         .HasColumnType("text");
 
-                    b.ToTable("Users");
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasIndex("Username");
+
+                    b.ToTable("Users", (string)null);
 
                     b.HasData(
                         new
                         {
                             ObjectId = -3,
-                            Guid = new Guid("8fbbc2e9-0609-460a-ab3a-c3bdd10ab793"),
-                            Name = "admin",
-                            PasswordHash = "P4geAuE2yX/PDRHuJSq74FF5vO782rWz5c0LAQPR8m45DEYAONhu1wYnAn60PSNyjocqEBdnCeKCJfK3sKyuWw=="
+                            Guid = new Guid("4fa948f4-7c45-4f81-bb6b-e417491e6c96"),
+                            PasswordHash = "P4geAuE2yX/PDRHuJSq74FF5vO782rWz5c0LAQPR8m45DEYAONhu1wYnAn60PSNyjocqEBdnCeKCJfK3sKyuWw==",
+                            Username = "admin"
                         });
                 });
 
@@ -313,32 +261,6 @@ namespace HyperBooru.Migrations
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("HyperBooru.Acl", b =>
-                {
-                    b.HasOne("HyperBooru.HBObject", "Subject")
-                        .WithOne("Acl")
-                        .HasForeignKey("HyperBooru.Acl", "ObjectId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Subject");
-                });
-
-            modelBuilder.Entity("HyperBooru.AclRule", b =>
-                {
-                    b.HasOne("HyperBooru.Acl", null)
-                        .WithMany("Rules")
-                        .HasForeignKey("AclObjectId");
-
-                    b.HasOne("HyperBooru.HBPrincipal", "Principal")
-                        .WithMany()
-                        .HasForeignKey("PrincipalObjectId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Principal");
-                });
-
             modelBuilder.Entity("HyperBooru.Media", b =>
                 {
                     b.HasOne("HyperBooru.UploadedFile", "CurrentUploadedFile")
@@ -407,16 +329,9 @@ namespace HyperBooru.Migrations
                     b.Navigation("Media");
                 });
 
-            modelBuilder.Entity("HyperBooru.Group", b =>
-                {
-                    b.HasOne("HyperBooru.HBPrincipal", null)
-                        .WithMany("MemberOf")
-                        .HasForeignKey("HBPrincipalObjectId");
-                });
-
             modelBuilder.Entity("HyperBooru.User", b =>
                 {
-                    b.HasOne("HyperBooru.HBPrincipal", null)
+                    b.HasOne("HyperBooru.HBObject", null)
                         .WithOne()
                         .HasForeignKey("HyperBooru.User", "ObjectId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -425,21 +340,9 @@ namespace HyperBooru.Migrations
 
             modelBuilder.Entity("HyperBooru.HBObject", b =>
                 {
-                    b.Navigation("Acl");
-
                     b.Navigation("Tags");
                 });
 
-            modelBuilder.Entity("HyperBooru.Acl", b =>
-                {
-                    b.Navigation("Rules");
-                });
-
-            modelBuilder.Entity("HyperBooru.HBPrincipal", b =>
-                {
-                    b.Navigation("MemberOf");
-                });
-
             modelBuilder.Entity("HyperBooru.Media", b =>
                 {
                     b.Navigation("OcrData");