mirror of
https://github.com/bitwarden/server
synced 2025-12-21 18:53:41 +00:00
fix errors
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#nullable disable
|
||||
using Bit.Core.Entities;
|
||||
|
||||
namespace Bit.Core.Vault.Entities;
|
||||
|
||||
@@ -8,5 +8,6 @@ public class CipherArchive
|
||||
public Guid UserId { get; set; }
|
||||
public DateTime ArchivedDate { get; set; }
|
||||
|
||||
public Cipher Cipher { get; set; }
|
||||
public Cipher? Cipher { get; set; }
|
||||
public User? User { get; set; }
|
||||
}
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
#nullable disable
|
||||
|
||||
using Bit.Infrastructure.EntityFramework.Models;
|
||||
using Bit.Infrastructure.EntityFramework.Models;
|
||||
|
||||
namespace Bit.Infrastructure.EntityFramework.Vault.Models;
|
||||
|
||||
@@ -9,6 +7,6 @@ public class CipherArchive
|
||||
public Guid CipherId { get; set; }
|
||||
public Guid UserId { get; set; }
|
||||
public DateTime ArchivedDate { get; set; }
|
||||
public Cipher Cipher { get; set; }
|
||||
public User User { get; set; }
|
||||
public Cipher? Cipher { get; set; }
|
||||
public User? User { get; set; }
|
||||
}
|
||||
|
||||
@@ -1,55 +1,27 @@
|
||||
IF OBJECT_ID(N'[dbo].[CipherArchive]', N'U') IS NULL
|
||||
BEGIN
|
||||
CREATE TABLE [dbo].[CipherArchive]
|
||||
(
|
||||
[CipherId] UNIQUEIDENTIFIER NOT NULL,
|
||||
[UserId] UNIQUEIDENTIFIER NOT NULL,
|
||||
[ArchivedDate] DATETIME2(7) NOT NULL,
|
||||
|
||||
CONSTRAINT [PK_CipherArchive]
|
||||
PRIMARY KEY CLUSTERED ([CipherId], [UserId])
|
||||
);
|
||||
END;
|
||||
CREATE TABLE [dbo].[CipherArchive]
|
||||
(
|
||||
[CipherId] UNIQUEIDENTIFIER NOT NULL,
|
||||
[UserId] UNIQUEIDENTIFIER NOT NULL,
|
||||
[ArchivedDate] DATETIME2(7) NOT NULL,
|
||||
CONSTRAINT [PK_CipherArchive]
|
||||
PRIMARY KEY CLUSTERED ([CipherId], [UserId])
|
||||
);
|
||||
GO
|
||||
|
||||
IF NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM sys.foreign_keys
|
||||
WHERE name = N'FK_CipherArchive_Cipher'
|
||||
AND parent_object_id = OBJECT_ID(N'[dbo].[CipherArchive]', N'U')
|
||||
)
|
||||
BEGIN
|
||||
ALTER TABLE [dbo].[CipherArchive]
|
||||
ADD CONSTRAINT [FK_CipherArchive_Cipher]
|
||||
FOREIGN KEY ([CipherId])
|
||||
REFERENCES [dbo].[Cipher]([Id])
|
||||
ON DELETE CASCADE;
|
||||
END;
|
||||
ALTER TABLE [dbo].[CipherArchive]
|
||||
ADD CONSTRAINT [FK_CipherArchive_Cipher]
|
||||
FOREIGN KEY ([CipherId])
|
||||
REFERENCES [dbo].[Cipher]([Id])
|
||||
ON DELETE CASCADE;
|
||||
GO
|
||||
|
||||
IF NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM sys.foreign_keys
|
||||
WHERE name = N'FK_CipherArchive_User'
|
||||
AND parent_object_id = OBJECT_ID(N'[dbo].[CipherArchive]', N'U')
|
||||
)
|
||||
BEGIN
|
||||
ALTER TABLE [dbo].[CipherArchive]
|
||||
ADD CONSTRAINT [FK_CipherArchive_User]
|
||||
FOREIGN KEY ([UserId])
|
||||
REFERENCES [dbo].[User]([Id])
|
||||
ON DELETE CASCADE;
|
||||
END;
|
||||
ALTER TABLE [dbo].[CipherArchive]
|
||||
ADD CONSTRAINT [FK_CipherArchive_User]
|
||||
FOREIGN KEY ([UserId])
|
||||
REFERENCES [dbo].[User]([Id])
|
||||
ON DELETE CASCADE;
|
||||
GO
|
||||
|
||||
IF NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM sys.indexes
|
||||
WHERE name = N'IX_CipherArchive_UserId'
|
||||
AND object_id = OBJECT_ID(N'[dbo].[CipherArchive]', N'U')
|
||||
)
|
||||
BEGIN
|
||||
CREATE NONCLUSTERED INDEX [IX_CipherArchive_UserId]
|
||||
ON [dbo].[CipherArchive]([UserId]);
|
||||
END;
|
||||
CREATE NONCLUSTERED INDEX [IX_CipherArchive_UserId]
|
||||
ON [dbo].[CipherArchive]([UserId]);
|
||||
GO
|
||||
|
||||
@@ -42,7 +42,6 @@ BEGIN
|
||||
END;
|
||||
GO
|
||||
|
||||
-- Optional index for queries by user
|
||||
IF NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM sys.indexes
|
||||
|
||||
Reference in New Issue
Block a user