From 79c3a9c891cdcd29f1a8aecdcdd9e21058046e77 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Fri, 19 Apr 2024 20:17:21 +0200 Subject: [PATCH] [backend/database] Replace complex Index/PrimaryKey/ForeignKey references with their nameof() equivalents --- .../Core/Database/Tables/AnnouncementRead.cs | 2 +- .../Core/Database/Tables/AttestationChallenge.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/Blocking.cs | 2 +- .../Core/Database/Tables/ChannelFollowing.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/ChannelNotePin.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/ClipNote.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/Emoji.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/FollowRequest.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/Following.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/GalleryLike.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/Hashtag.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/Instance.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/Marker.cs | 4 ++-- Iceshrimp.Backend/Core/Database/Tables/Muting.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/Note.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/NoteBookmark.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/NoteLike.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/NoteReaction.cs | 2 +- .../Core/Database/Tables/NoteThreadMuting.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/NoteUnread.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/NoteWatching.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/OauthApp.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/Page.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/PageLike.cs | 2 +- .../Core/Database/Tables/PasswordResetRequest.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/PollVote.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/PromoRead.cs | 2 +- .../Core/Database/Tables/PushSubscription.cs | 2 +- .../Core/Database/Tables/RegistrationInvite.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/Relay.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/RenoteMuting.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/User.cs | 8 ++++---- .../Core/Database/Tables/UserGroupInvitation.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/UserGroupMember.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/UserListMember.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/UserNotePin.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/UserPending.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/UserProfile.cs | 2 +- Iceshrimp.Backend/Core/Database/Tables/UserPublickey.cs | 2 +- 39 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Iceshrimp.Backend/Core/Database/Tables/AnnouncementRead.cs b/Iceshrimp.Backend/Core/Database/Tables/AnnouncementRead.cs index 5cbc81c1..79a8b4f9 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/AnnouncementRead.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/AnnouncementRead.cs @@ -7,7 +7,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("announcement_read")] [Index(nameof(AnnouncementId))] [Index(nameof(UserId))] -[Index("UserId", "AnnouncementId", IsUnique = true)] +[Index(nameof(UserId), nameof(AnnouncementId), IsUnique = true)] public class AnnouncementRead { [Key] diff --git a/Iceshrimp.Backend/Core/Database/Tables/AttestationChallenge.cs b/Iceshrimp.Backend/Core/Database/Tables/AttestationChallenge.cs index 32bf75e7..e59bc09f 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/AttestationChallenge.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/AttestationChallenge.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; -[PrimaryKey("Id", "UserId")] +[PrimaryKey(nameof(Id), nameof(UserId))] [Table("attestation_challenge")] [Index(nameof(Challenge))] [Index(nameof(UserId))] diff --git a/Iceshrimp.Backend/Core/Database/Tables/Blocking.cs b/Iceshrimp.Backend/Core/Database/Tables/Blocking.cs index 51829a10..6d8c013a 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/Blocking.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/Blocking.cs @@ -7,7 +7,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("blocking")] [Index(nameof(BlockerId))] [Index(nameof(BlockeeId))] -[Index("BlockerId", "BlockeeId", IsUnique = true)] +[Index(nameof(BlockerId), nameof(BlockeeId), IsUnique = true)] [Index(nameof(CreatedAt))] public class Blocking { diff --git a/Iceshrimp.Backend/Core/Database/Tables/ChannelFollowing.cs b/Iceshrimp.Backend/Core/Database/Tables/ChannelFollowing.cs index 025c633b..51434395 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/ChannelFollowing.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/ChannelFollowing.cs @@ -7,7 +7,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("channel_following")] [Index(nameof(FolloweeId))] [Index(nameof(CreatedAt))] -[Index("FollowerId", "FolloweeId", IsUnique = true)] +[Index(nameof(FollowerId), nameof(FolloweeId), IsUnique = true)] [Index(nameof(FollowerId))] public class ChannelFollowing { diff --git a/Iceshrimp.Backend/Core/Database/Tables/ChannelNotePin.cs b/Iceshrimp.Backend/Core/Database/Tables/ChannelNotePin.cs index 12ca1fd1..ef7792b5 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/ChannelNotePin.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/ChannelNotePin.cs @@ -6,7 +6,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("channel_note_pin")] [Index(nameof(ChannelId))] -[Index("ChannelId", "NoteId", IsUnique = true)] +[Index(nameof(ChannelId), nameof(NoteId), IsUnique = true)] public class ChannelNotePin { [Key] diff --git a/Iceshrimp.Backend/Core/Database/Tables/ClipNote.cs b/Iceshrimp.Backend/Core/Database/Tables/ClipNote.cs index 0af54625..c3d2ac86 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/ClipNote.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/ClipNote.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("clip_note")] -[Index("NoteId", "ClipId", IsUnique = true)] +[Index(nameof(NoteId), nameof(ClipId), IsUnique = true)] [Index(nameof(NoteId))] [Index(nameof(ClipId))] public class ClipNote diff --git a/Iceshrimp.Backend/Core/Database/Tables/Emoji.cs b/Iceshrimp.Backend/Core/Database/Tables/Emoji.cs index 9ec53ee2..0e69accb 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/Emoji.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/Emoji.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("emoji")] -[Index("Name", "Host", IsUnique = true)] +[Index(nameof(Name), nameof(Host), IsUnique = true)] [Index(nameof(Host))] [Index(nameof(Name))] public class Emoji diff --git a/Iceshrimp.Backend/Core/Database/Tables/FollowRequest.cs b/Iceshrimp.Backend/Core/Database/Tables/FollowRequest.cs index fee14946..44cf970d 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/FollowRequest.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/FollowRequest.cs @@ -7,7 +7,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("follow_request")] [Index(nameof(FolloweeId))] [Index(nameof(FollowerId))] -[Index("FollowerId", "FolloweeId", IsUnique = true)] +[Index(nameof(FollowerId), nameof(FolloweeId), IsUnique = true)] public class FollowRequest : IEntity { /// diff --git a/Iceshrimp.Backend/Core/Database/Tables/Following.cs b/Iceshrimp.Backend/Core/Database/Tables/Following.cs index bd36c80a..9683c46c 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/Following.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/Following.cs @@ -6,7 +6,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("following")] [Index(nameof(FolloweeId))] -[Index("FollowerId", "FolloweeId", IsUnique = true)] +[Index(nameof(FollowerId), nameof(FolloweeId), IsUnique = true)] [Index(nameof(FollowerHost))] [Index(nameof(CreatedAt))] [Index(nameof(FollowerId))] diff --git a/Iceshrimp.Backend/Core/Database/Tables/GalleryLike.cs b/Iceshrimp.Backend/Core/Database/Tables/GalleryLike.cs index da9c253f..56909329 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/GalleryLike.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/GalleryLike.cs @@ -6,7 +6,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("gallery_like")] [Index(nameof(UserId))] -[Index("UserId", "PostId", IsUnique = true)] +[Index(nameof(UserId), nameof(PostId), IsUnique = true)] public class GalleryLike { [Key] diff --git a/Iceshrimp.Backend/Core/Database/Tables/Hashtag.cs b/Iceshrimp.Backend/Core/Database/Tables/Hashtag.cs index 409de988..6e14bbbd 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/Hashtag.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/Hashtag.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("hashtag")] -[Index("Name", IsUnique = true)] +[Index(nameof(Name), IsUnique = true)] public class Hashtag : IEntity { [Column("name")] [StringLength(128)] public string Name { get; set; } = null!; diff --git a/Iceshrimp.Backend/Core/Database/Tables/Instance.cs b/Iceshrimp.Backend/Core/Database/Tables/Instance.cs index c06af92c..ddb9b1b7 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/Instance.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/Instance.cs @@ -8,7 +8,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("instance")] [Index(nameof(CaughtAt))] [Index(nameof(IsSuspended))] -[Index("Host", IsUnique = true)] +[Index(nameof(Host), IsUnique = true)] public class Instance { [Key] diff --git a/Iceshrimp.Backend/Core/Database/Tables/Marker.cs b/Iceshrimp.Backend/Core/Database/Tables/Marker.cs index 8cd65c41..7d2e682b 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/Marker.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/Marker.cs @@ -7,8 +7,8 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("marker")] [Index(nameof(UserId))] -[Index("UserId", "Type", IsUnique = true)] -[PrimaryKey("UserId", "Type")] +[Index(nameof(UserId), nameof(Type), IsUnique = true)] +[PrimaryKey(nameof(UserId), nameof(Type))] public class Marker { [PgName("marker_type_enum")] diff --git a/Iceshrimp.Backend/Core/Database/Tables/Muting.cs b/Iceshrimp.Backend/Core/Database/Tables/Muting.cs index d09ceba4..eb79cafe 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/Muting.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/Muting.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("muting")] -[Index("MuterId", "MuteeId", IsUnique = true)] +[Index(nameof(MuterId), nameof(MuteeId), IsUnique = true)] [Index(nameof(MuterId))] [Index(nameof(ExpiresAt))] [Index(nameof(MuteeId))] diff --git a/Iceshrimp.Backend/Core/Database/Tables/Note.cs b/Iceshrimp.Backend/Core/Database/Tables/Note.cs index eee237f9..4c7cb6d5 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/Note.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/Note.cs @@ -11,7 +11,7 @@ using J = System.Text.Json.Serialization.JsonPropertyNameAttribute; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("note")] -[Index("Uri", IsUnique = true)] +[Index(nameof(Uri), IsUnique = true)] [Index(nameof(ReplyId))] [Index(nameof(AttachedFileTypes))] [Index(nameof(FileIds))] diff --git a/Iceshrimp.Backend/Core/Database/Tables/NoteBookmark.cs b/Iceshrimp.Backend/Core/Database/Tables/NoteBookmark.cs index 5ad35de4..02220ef3 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/NoteBookmark.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/NoteBookmark.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("note_bookmark")] -[Index("UserId", "NoteId", IsUnique = true)] +[Index(nameof(UserId), nameof(NoteId), IsUnique = true)] [Index(nameof(UserId))] public class NoteBookmark { diff --git a/Iceshrimp.Backend/Core/Database/Tables/NoteLike.cs b/Iceshrimp.Backend/Core/Database/Tables/NoteLike.cs index 9b0d6ea6..42985325 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/NoteLike.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/NoteLike.cs @@ -7,7 +7,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("note_like")] [Index(nameof(UserId))] [Index(nameof(NoteId))] -[Index("UserId", "NoteId", IsUnique = true)] +[Index(nameof(UserId), nameof(NoteId), IsUnique = true)] public class NoteLike { [Key] diff --git a/Iceshrimp.Backend/Core/Database/Tables/NoteReaction.cs b/Iceshrimp.Backend/Core/Database/Tables/NoteReaction.cs index 906b8e33..dbb243d3 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/NoteReaction.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/NoteReaction.cs @@ -8,7 +8,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Index(nameof(CreatedAt))] [Index(nameof(UserId))] [Index(nameof(NoteId))] -[Index("UserId", "NoteId", "Reaction", IsUnique = true)] +[Index(nameof(UserId), nameof(NoteId), nameof(Reaction), IsUnique = true)] public class NoteReaction { [Key] diff --git a/Iceshrimp.Backend/Core/Database/Tables/NoteThreadMuting.cs b/Iceshrimp.Backend/Core/Database/Tables/NoteThreadMuting.cs index 65021607..cf6c5dff 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/NoteThreadMuting.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/NoteThreadMuting.cs @@ -6,7 +6,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("note_thread_muting")] [Index(nameof(UserId))] -[Index("UserId", "ThreadId", IsUnique = true)] +[Index(nameof(UserId), nameof(ThreadId), IsUnique = true)] [Index(nameof(ThreadId))] public class NoteThreadMuting { diff --git a/Iceshrimp.Backend/Core/Database/Tables/NoteUnread.cs b/Iceshrimp.Backend/Core/Database/Tables/NoteUnread.cs index 662aaf12..413d99c7 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/NoteUnread.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/NoteUnread.cs @@ -10,7 +10,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Index(nameof(UserId))] [Index(nameof(NoteChannelId))] [Index(nameof(IsSpecified))] -[Index("UserId", "NoteId", IsUnique = true)] +[Index(nameof(UserId), nameof(NoteId), IsUnique = true)] [Index(nameof(NoteId))] public class NoteUnread { diff --git a/Iceshrimp.Backend/Core/Database/Tables/NoteWatching.cs b/Iceshrimp.Backend/Core/Database/Tables/NoteWatching.cs index 95c982e9..f8dd2e08 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/NoteWatching.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/NoteWatching.cs @@ -8,7 +8,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Index(nameof(NoteId))] [Index(nameof(CreatedAt))] [Index(nameof(NoteUserId))] -[Index("UserId", "NoteId", IsUnique = true)] +[Index(nameof(UserId), nameof(NoteId), IsUnique = true)] [Index(nameof(UserId))] public class NoteWatching { diff --git a/Iceshrimp.Backend/Core/Database/Tables/OauthApp.cs b/Iceshrimp.Backend/Core/Database/Tables/OauthApp.cs index 6a50b89f..c4007112 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/OauthApp.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/OauthApp.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("oauth_app")] -[Index("ClientId", IsUnique = true)] +[Index(nameof(ClientId), IsUnique = true)] public class OauthApp { [Key] diff --git a/Iceshrimp.Backend/Core/Database/Tables/Page.cs b/Iceshrimp.Backend/Core/Database/Tables/Page.cs index cc19a555..856f310a 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/Page.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/Page.cs @@ -6,7 +6,7 @@ using NpgsqlTypes; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("page")] -[Index("UserId", "Name", IsUnique = true)] +[Index(nameof(UserId), nameof(Name), IsUnique = true)] [Index(nameof(VisibleUserIds))] [Index(nameof(UserId))] [Index(nameof(UpdatedAt))] diff --git a/Iceshrimp.Backend/Core/Database/Tables/PageLike.cs b/Iceshrimp.Backend/Core/Database/Tables/PageLike.cs index e5f04bc6..69805fa3 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/PageLike.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/PageLike.cs @@ -6,7 +6,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("page_like")] [Index(nameof(UserId))] -[Index("UserId", "PageId", IsUnique = true)] +[Index(nameof(UserId), nameof(PageId), IsUnique = true)] public class PageLike { [Key] diff --git a/Iceshrimp.Backend/Core/Database/Tables/PasswordResetRequest.cs b/Iceshrimp.Backend/Core/Database/Tables/PasswordResetRequest.cs index 2004fb7e..a326fb6d 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/PasswordResetRequest.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/PasswordResetRequest.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("password_reset_request")] -[Index("Token", IsUnique = true)] +[Index(nameof(Token), IsUnique = true)] [Index(nameof(UserId))] public class PasswordResetRequest { diff --git a/Iceshrimp.Backend/Core/Database/Tables/PollVote.cs b/Iceshrimp.Backend/Core/Database/Tables/PollVote.cs index 0393565e..15255e08 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/PollVote.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/PollVote.cs @@ -6,7 +6,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("poll_vote")] [Index(nameof(CreatedAt))] -[Index("UserId", "NoteId", "Choice", IsUnique = true)] +[Index(nameof(UserId), nameof(NoteId), nameof(Choice), IsUnique = true)] [Index(nameof(UserId))] [Index(nameof(NoteId))] public class PollVote diff --git a/Iceshrimp.Backend/Core/Database/Tables/PromoRead.cs b/Iceshrimp.Backend/Core/Database/Tables/PromoRead.cs index 717f8bd9..28935f54 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/PromoRead.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/PromoRead.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("promo_read")] -[Index("UserId", "NoteId", IsUnique = true)] +[Index(nameof(UserId), nameof(NoteId), IsUnique = true)] [Index(nameof(UserId))] public class PromoRead { diff --git a/Iceshrimp.Backend/Core/Database/Tables/PushSubscription.cs b/Iceshrimp.Backend/Core/Database/Tables/PushSubscription.cs index 05045ab2..1100d39b 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/PushSubscription.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/PushSubscription.cs @@ -7,7 +7,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("push_subscription")] [Index(nameof(UserId))] -[Index("OauthTokenId", IsUnique = true)] +[Index(nameof(OauthTokenId), IsUnique = true)] public class PushSubscription { [PgName("push_subscription_policy_enum")] diff --git a/Iceshrimp.Backend/Core/Database/Tables/RegistrationInvite.cs b/Iceshrimp.Backend/Core/Database/Tables/RegistrationInvite.cs index 5916e484..80217a7b 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/RegistrationInvite.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/RegistrationInvite.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("registration_invite")] -[Index("Code", IsUnique = true)] +[Index(nameof(Code), IsUnique = true)] public class RegistrationInvite { [Key] diff --git a/Iceshrimp.Backend/Core/Database/Tables/Relay.cs b/Iceshrimp.Backend/Core/Database/Tables/Relay.cs index d090524d..f5faa226 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/Relay.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/Relay.cs @@ -6,7 +6,7 @@ using NpgsqlTypes; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("relay")] -[Index("Inbox", IsUnique = true)] +[Index(nameof(Inbox), IsUnique = true)] public class Relay { [PgName("relay_status_enum")] diff --git a/Iceshrimp.Backend/Core/Database/Tables/RenoteMuting.cs b/Iceshrimp.Backend/Core/Database/Tables/RenoteMuting.cs index f239259b..6a9b6eb4 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/RenoteMuting.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/RenoteMuting.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("renote_muting")] -[Index("MuterId", "MuteeId", IsUnique = true)] +[Index(nameof(MuterId), nameof(MuteeId), IsUnique = true)] [Index(nameof(MuterId))] [Index(nameof(MuteeId))] [Index(nameof(CreatedAt))] diff --git a/Iceshrimp.Backend/Core/Database/Tables/User.cs b/Iceshrimp.Backend/Core/Database/Tables/User.cs index a742d3db..84037f70 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/User.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/User.cs @@ -10,7 +10,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("user")] [Index(nameof(Host))] -[Index("UsernameLower", "Host", IsUnique = true)] +[Index(nameof(UsernameLower), nameof(Host), IsUnique = true)] [Index(nameof(UpdatedAt))] [Index(nameof(UsernameLower))] [Index(nameof(Uri))] @@ -20,9 +20,9 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Index(nameof(IsModerator))] [Index(nameof(CreatedAt))] [Index(nameof(Tags))] -[Index("AvatarId", IsUnique = true)] -[Index("BannerId", IsUnique = true)] -[Index("Token", IsUnique = true)] +[Index(nameof(AvatarId), IsUnique = true)] +[Index(nameof(BannerId), IsUnique = true)] +[Index(nameof(Token), IsUnique = true)] public class User : IEntity { /// diff --git a/Iceshrimp.Backend/Core/Database/Tables/UserGroupInvitation.cs b/Iceshrimp.Backend/Core/Database/Tables/UserGroupInvitation.cs index 05bb583f..3cb54270 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/UserGroupInvitation.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/UserGroupInvitation.cs @@ -7,7 +7,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("user_group_invitation")] [Index(nameof(UserGroupId))] [Index(nameof(UserId))] -[Index("UserId", "UserGroupId", IsUnique = true)] +[Index(nameof(UserId), nameof(UserGroupId), IsUnique = true)] public class UserGroupInvitation { [Key] diff --git a/Iceshrimp.Backend/Core/Database/Tables/UserGroupMember.cs b/Iceshrimp.Backend/Core/Database/Tables/UserGroupMember.cs index 14f3d440..bb4b14cb 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/UserGroupMember.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/UserGroupMember.cs @@ -6,7 +6,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("user_group_member")] [Index(nameof(UserGroupId))] -[Index("UserId", "UserGroupId", IsUnique = true)] +[Index(nameof(UserId), nameof(UserGroupId), IsUnique = true)] [Index(nameof(UserId))] public class UserGroupMember { diff --git a/Iceshrimp.Backend/Core/Database/Tables/UserListMember.cs b/Iceshrimp.Backend/Core/Database/Tables/UserListMember.cs index 9a661d42..3ace49db 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/UserListMember.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/UserListMember.cs @@ -6,7 +6,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("user_list_member")] [Index(nameof(UserListId))] -[Index("UserId", "UserListId", IsUnique = true)] +[Index(nameof(UserId), nameof(UserListId), IsUnique = true)] [Index(nameof(UserId))] public class UserListMember : IEntity { diff --git a/Iceshrimp.Backend/Core/Database/Tables/UserNotePin.cs b/Iceshrimp.Backend/Core/Database/Tables/UserNotePin.cs index ad3bfffd..4b9012e7 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/UserNotePin.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/UserNotePin.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("user_note_pin")] -[Index("UserId", "NoteId", IsUnique = true)] +[Index(nameof(UserId), nameof(NoteId), IsUnique = true)] [Index(nameof(UserId))] public class UserNotePin { diff --git a/Iceshrimp.Backend/Core/Database/Tables/UserPending.cs b/Iceshrimp.Backend/Core/Database/Tables/UserPending.cs index ead226fc..467b7ae6 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/UserPending.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/UserPending.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("user_pending")] -[Index("Code", IsUnique = true)] +[Index(nameof(Code), IsUnique = true)] public class UserPending { [Key] diff --git a/Iceshrimp.Backend/Core/Database/Tables/UserProfile.cs b/Iceshrimp.Backend/Core/Database/Tables/UserProfile.cs index c799b171..85eb2baf 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/UserProfile.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/UserProfile.cs @@ -9,7 +9,7 @@ namespace Iceshrimp.Backend.Core.Database.Tables; [Table("user_profile")] [Index(nameof(EnableWordMute))] [Index(nameof(UserHost))] -[Index("PinnedPageId", IsUnique = true)] +[Index(nameof(PinnedPageId), IsUnique = true)] public class UserProfile { [PgName("user_profile_ffvisibility_enum")] diff --git a/Iceshrimp.Backend/Core/Database/Tables/UserPublickey.cs b/Iceshrimp.Backend/Core/Database/Tables/UserPublickey.cs index 9c42d747..9ccdf8c6 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/UserPublickey.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/UserPublickey.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; namespace Iceshrimp.Backend.Core.Database.Tables; [Table("user_publickey")] -[Index("KeyId", IsUnique = true)] +[Index(nameof(KeyId), IsUnique = true)] public class UserPublickey { [Key]