nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-24 20:58:49 -05:00
Code

Merge branch 'dirt/pm-20574/database_tables_and_scripts_riskinsights' into dirt/pm-20576/report-store-query-commands

Browse Source
This commit is contained in:
voommen-livefront 2025-06-19 10:58:29 -05:00
commit ff72e768d7
14 changed files with 160 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql
View File

@ -8,18 +8,18 @@ AS
SET NOCOUNT ON;
INSERT INTO [dbo].[OrganizationApplication]
(
(
[Id],
[OrganizationId],
[Applications],
[CreationDate],
[RevisionDate]
)
)
VALUES
(
@Id,
@OrganizationId,
@Applications,
@CreationDate,
@RevisionDate
);
@Id,
@OrganizationId,
@Applications,
@CreationDate,
@RevisionDate
);

9
src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_DeleteById.sql
View File

@ -3,8 +3,7 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_DeleteById]
AS
SET NOCOUNT ON;
IF @Id IS NULL
THROW 50000, 'Id cannot be null', 1;
DELETE FROM [dbo].[OrganizationApplication]
WHERE [Id] = @Id
DELETE FROM
[dbo].[OrganizationApplication]
WHERE
[Id] = @Id;

5
src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadById.sql
View File

@ -3,14 +3,11 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_ReadById]
AS
SET NOCOUNT ON;
IF @Id IS NULL
THROW 50000, 'Id cannot be null', 1;
SELECT
[Id],
[OrganizationId],
[Applications],
[CreationDate],
[RevisionDate]
FROM [dbo].[OrganizationApplication]
FROM [dbo].[OrganizationApplicationView]
WHERE [Id] = @Id;

5
src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadByOrganizationId.sql
View File

@ -3,14 +3,11 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId]
AS
SET NOCOUNT ON;
IF @OrganizationId IS NULL
THROW 50000, 'OrganizationId cannot be null', 1;
SELECT
[Id],
[OrganizationId],
[Applications],
[CreationDate],
[RevisionDate]
FROM [dbo].[OrganizationApplication]
FROM [dbo].[OrganizationApplicationView]
WHERE [OrganizationId] = @OrganizationId;

1
src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql
View File

@ -2,6 +2,7 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_Update]
@Id UNIQUEIDENTIFIER OUTPUT,
@OrganizationId UNIQUEIDENTIFIER,
@Applications NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7)
AS
SET NOCOUNT ON;

18
src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Create.sql
View File

@ -8,5 +8,19 @@ CREATE PROCEDURE [dbo].[OrganizationReport_Create]
AS
SET NOCOUNT ON;
INSERT INTO [dbo].[OrganizationReport]( [Id],[OrganizationId],[Date],[ReportData],[CreationDate],[RevisionDate] )
VALUES ( @Id,@OrganizationId,@Date,@ReportData,@CreationDate,@RevisionDate);
INSERT INTO [dbo].[OrganizationReport](
[Id],
[OrganizationId],
[Date],
[ReportData],
[CreationDate],
[RevisionDate]
)
VALUES (
@Id,
@OrganizationId,
@Date,
@ReportData,
@CreationDate,
@RevisionDate
);

3
src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_DeleteById.sql
View File

@ -3,8 +3,5 @@ CREATE PROCEDURE [dbo].[OrganizationReport_DeleteById]
AS
SET NOCOUNT ON;
IF @Id IS NULL
THROW 50000, 'Id cannot be null', 1;
DELETE FROM [dbo].[OrganizationReport]
WHERE [Id] = @Id

21
src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadById.sql
View File

@ -3,15 +3,12 @@ CREATE PROCEDURE [dbo].[OrganizationReport_ReadById]
AS
SET NOCOUNT ON;
IF @Id IS NULL
THROW 50000, 'Id cannot be null', 1;
SELECT
[Id],
[OrganizationId],
[Date],
[ReportData],
[CreationDate],
[RevisionDate]
FROM [dbo].[OrganizationReport]
WHERE [Id] = @Id;
SELECT
[Id],
[OrganizationId],
[Date],
[ReportData],
[CreationDate],
[RevisionDate]
FROM [dbo].[OrganizationReport]
WHERE [Id] = @Id;

3
src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadByOrganizationId.sql
View File

@ -3,9 +3,6 @@ CREATE PROCEDURE [dbo].[OrganizationReport_ReadByOrganizationId]
AS
SET NOCOUNT ON;
IF @OrganizationId IS NULL
THROW 50000, 'OrganizationId cannot be null', 1;
SELECT
[Id],
[OrganizationId],

4
src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql
View File

@ -3,12 +3,14 @@ CREATE PROCEDURE [dbo].[OrganizationReport_Update]
@OrganizationId UNIQUEIDENTIFIER,
@Date DATETIME2(7),
@ReportData NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7)
AS
SET NOCOUNT ON;
UPDATE [dbo].[OrganizationReport]
SET [OrganizationId] = @OrganizationId,
[Date] = @Date,
[ReportData] = @ReportData,
[RevisionDate] = @RevisionDate
WHERE [Id] = @Id
WHERE [Id] = @Id;

4
src/Sql/dbo/Stored Procedures/Organization_DeleteById.sql
View File

@ -142,14 +142,14 @@ BEGIN
FROM
[dbo].[OrganizationApplication]
WHERE
[Id] = @Id
[OrganizationId] = @Id
-- Delete Organization Report
DELETE
FROM
[dbo].[OrganizationReport]
WHERE
[Id] = @Id
[OrganizationId] = @Id
DELETE
FROM

121
util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql
View File

@ -1,31 +1,33 @@
IF OBJECT_ID('dbo.OrganizationReport') IS NULL
IF OBJECT_ID('dbo.OrganizationReport') IS NULL
BEGIN
CREATE TABLE [dbo].[OrganizationReport]
(
[Id] UNIQUEIDENTIFIER NOT NULL,
[OrganizationId] UNIQUEIDENTIFIER NOT NULL,
[Date] DATETIME2 (7) NOT NULL,
[ReportData] NVARCHAR(MAX) NOT NULL,
[CreationDate] DATETIME2 (7) NOT NULL,
[RevisionDate] DATETIME2 (7) NOT NULL,
CONSTRAINT [PK_OrganizationReport] PRIMARY KEY CLUSTERED ([Id] ASC),
CONSTRAINT [FK_OrganizationReport_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id])
[Id] UNIQUEIDENTIFIER NOT NULL,
[OrganizationId] UNIQUEIDENTIFIER NOT NULL,
[Date] DATETIME2 (7) NOT NULL,
[ReportData] NVARCHAR(MAX) NOT NULL,
[CreationDate] DATETIME2 (7) NOT NULL,
[RevisionDate] DATETIME2 (7) NOT NULL,
CONSTRAINT [PK_OrganizationReport] PRIMARY KEY CLUSTERED ([Id] ASC),
CONSTRAINT [FK_OrganizationReport_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id])
);
CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId]
ON [dbo].[OrganizationReport]([OrganizationId] ASC);
CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId] ON [dbo].[OrganizationReport]([OrganizationId] ASC);
CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId_Date]
ON [dbo].[OrganizationReport]([OrganizationId] ASC, [Date] DESC);
CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId_Date] ON [dbo].[OrganizationReport]([OrganizationId] ASC, [Date] DESC);
END
GO
CREATE OR ALTER VIEW [dbo].[OrganizationReportView] AS
SELECT * FROM [dbo].[OrganizationReport];
CREATE OR ALTER VIEW [dbo].[OrganizationReportView]
AS
SELECT
*
FROM
[dbo].[OrganizationReport];
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Create]
CREATE PROCEDURE [dbo].[OrganizationReport_Create]
@Id UNIQUEIDENTIFIER OUTPUT,
@OrganizationId UNIQUEIDENTIFIER,
@Date DATETIME2(7),
@ -34,8 +36,50 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Create]
@RevisionDate DATETIME2(7)
AS
SET NOCOUNT ON;
INSERT INTO [dbo].[OrganizationReport]( [Id],[OrganizationId],[Date],[ReportData],[CreationDate],[RevisionDate] )
VALUES ( @Id,@OrganizationId,@Date,@ReportData,@CreationDate,@RevisionDate);
INSERT INTO [dbo].[OrganizationReport](
[Id],
[OrganizationId],
[Date],
[ReportData],
[CreationDate],
[RevisionDate]
)
VALUES (
@Id,
@OrganizationId,
@Date,
@ReportData,
@CreationDate,
@RevisionDate
);
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_DeleteById]
@Id UNIQUEIDENTIFIER
AS
SET NOCOUNT ON;
DELETE FROM [dbo].[OrganizationReport]
WHERE [Id] = @Id;
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadById]
@Id UNIQUEIDENTIFIER
AS
SET NOCOUNT ON;
SELECT
[Id],
[OrganizationId],
[Date],
[ReportData],
[CreationDate],
[RevisionDate]
FROM [dbo].[OrganizationReport]
WHERE [Id] = @Id;
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadByOrganizationId]
@ -43,9 +87,6 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadByOrganizationId]
AS
SET NOCOUNT ON;
IF @OrganizationId IS NULL
THROW 50000, 'OrganizationId cannot be null', 1;
SELECT
[Id],
[OrganizationId],
@ -57,53 +98,21 @@ AS
WHERE [OrganizationId] = @OrganizationId;
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadById]
@Id UNIQUEIDENTIFIER
AS
SET NOCOUNT ON;
IF @Id IS NULL
THROW 50000, 'Id cannot be null', 1;
SELECT
[Id],
[OrganizationId],
[Date],
[ReportData],
[CreationDate],
[RevisionDate]
FROM [dbo].[OrganizationReport]
WHERE [Id] = @Id;
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Update]
@Id UNIQUEIDENTIFIER OUTPUT,
@OrganizationId UNIQUEIDENTIFIER,
@Date DATETIME2(7),
@ReportData NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7)
AS
SET NOCOUNT ON;
UPDATE [dbo].[OrganizationReport]
SET [OrganizationId] = @OrganizationId,
[Date] = @Date,
[ReportData] = @ReportData,
[RevisionDate] = @RevisionDate
WHERE [Id] = @Id;
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_DeleteById]
@Id UNIQUEIDENTIFIER
AS
SET NOCOUNT ON;
IF @Id IS NULL
THROW 50000, 'Id cannot be null', 1;
DELETE FROM [dbo].[OrganizationReport]
WHERE [Id] = @Id;
GO

103
util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql
View File

@ -1,22 +1,26 @@
IF OBJECT_ID('dbo.OrganizationApplication') IS NULL
BEGIN
CREATE TABLE [dbo].[OrganizationApplication] (
[Id] UNIQUEIDENTIFIER NOT NULL,
[OrganizationId] UNIQUEIDENTIFIER NOT NULL,
[Applications] NVARCHAR(MAX) NOT NULL,
[CreationDate] DATETIME2 (7) NOT NULL,
[RevisionDate] DATETIME2 (7) NOT NULL,
CREATE TABLE [dbo].[OrganizationApplication]
(
[Id] UNIQUEIDENTIFIER NOT NULL,
[OrganizationId] UNIQUEIDENTIFIER NOT NULL,
[Applications] NVARCHAR(MAX) NOT NULL,
[CreationDate] DATETIME2 (7) NOT NULL,
[RevisionDate] DATETIME2 (7) NOT NULL,
CONSTRAINT [PK_OrganizationApplication] PRIMARY KEY CLUSTERED ([Id] ASC),
CONSTRAINT [FK_OrganizationApplication_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id])
);
);
CREATE NONCLUSTERED INDEX [IX_OrganizationApplication_OrganizationId]
ON [dbo].[OrganizationApplication]([OrganizationId] ASC);
END
GO
CREATE OR ALTER VIEW [dbo].[OrganizationApplicationView] AS
SELECT * FROM [dbo].[OrganizationApplication];
CREATE OR ALTER VIEW [dbo].[OrganizationApplicationView]
AS
SELECT *
FROM [dbo].[OrganizationApplication];
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Create]
@ -29,39 +33,34 @@ AS
SET NOCOUNT ON;
INSERT INTO [dbo].[OrganizationApplication]
(
(
[Id],
[OrganizationId],
[Applications],
[CreationDate],
[RevisionDate]
)
)
VALUES
(
@Id,
@OrganizationId,
@Applications,
@CreationDate,
@RevisionDate
);
@Id,
@OrganizationId,
@Applications,
@CreationDate,
@RevisionDate
);
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId]
@OrganizationId UNIQUEIDENTIFIER
CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_DeleteById]
@Id UNIQUEIDENTIFIER
AS
SET NOCOUNT ON;
IF @OrganizationId IS NULL
THROW 50000, 'OrganizationId cannot be null', 1;
DELETE FROM
[dbo].[OrganizationApplication]
WHERE
[Id] = @Id;
SELECT
[Id],
[OrganizationId],
[Applications],
[CreationDate],
[RevisionDate]
FROM [dbo].[OrganizationApplication]
WHERE [OrganizationId] = @OrganizationId;
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadById]
@ -69,8 +68,21 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadById]
AS
SET NOCOUNT ON;
IF @Id IS NULL
THROW 50000, 'Id cannot be null', 1;
SELECT
[Id],
[OrganizationId],
[Applications],
[CreationDate],
[RevisionDate]
FROM [dbo].[OrganizationApplicationView]
WHERE [Id] = @Id;
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId]
@OrganizationId UNIQUEIDENTIFIER
AS
SET NOCOUNT ON;
SELECT
[Id],
@ -78,14 +90,16 @@ AS
[Applications],
[CreationDate],
[RevisionDate]
FROM [dbo].[OrganizationApplication]
WHERE [Id] = @Id;
FROM [dbo].[OrganizationApplicationView]
WHERE [OrganizationId] = @OrganizationId;
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Update]
@Id UNIQUEIDENTIFIER OUTPUT,
@OrganizationId UNIQUEIDENTIFIER,
@Applications NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7)
AS
SET NOCOUNT ON;
@ -95,26 +109,5 @@ AS
[Applications] = @Applications,
[RevisionDate] = @RevisionDate
WHERE [Id] = @Id;
GO
CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_DeleteById]
@Id UNIQUEIDENTIFIER
AS
SET NOCOUNT ON;
IF @Id IS NULL
THROW 50000, 'Id cannot be null', 1;
DELETE FROM [dbo].[OrganizationApplication]
WHERE [Id] = @Id;
GO

4
util/Migrator/DbScripts/2025-06-13_02_UpdateOrgDeleteByIdProc.sql
View File

@ -142,14 +142,14 @@ BEGIN
FROM
[dbo].[OrganizationApplication]
WHERE
[Id] = @Id
[OrganizationId] = @Id
-- Delete Organization Report
DELETE
FROM
[dbo].[OrganizationReport]
WHERE
[Id] = @Id
[OrganizationId] = @Id
DELETE
FROM