1
0
mirror of https://github.com/bitwarden/server synced 2026-01-19 08:53:57 +00:00

Sproc tweaks (#730)

* do not follow local hosts or ip addresses

* remove cron from mssql

* migration script

* Use joins instead of temp tables

* update migration script with join changes
This commit is contained in:
Kyle Spearrin
2020-05-21 11:35:00 -04:00
committed by GitHub
parent 0cd90be83a
commit 343ef92a20
7 changed files with 542 additions and 122 deletions

View File

@@ -14,33 +14,42 @@ BEGIN
[Id] = @GroupId
)
;WITH [AvailableUsersCTE] AS(
SELECT
[Id]
FROM
[dbo].[OrganizationUser]
WHERE
[OrganizationId] = @OrgId
)
MERGE
[dbo].[GroupUser] AS [Target]
USING
-- Insert
INSERT INTO
[dbo].[GroupUser]
SELECT
@GroupId,
[Source].[Id]
FROM
@OrganizationUserIds AS [Source]
ON
[Target].[GroupId] = @GroupId
AND [Target].[OrganizationUserId] = [Source].[Id]
WHEN NOT MATCHED BY TARGET
AND [Source].[Id] IN (SELECT [Id] FROM [AvailableUsersCTE]) THEN
INSERT VALUES
(
@GroupId,
[Source].[Id]
INNER JOIN
[dbo].[OrganizationUser] OU ON [Source].[Id] = OU.[Id] AND OU.[OrganizationId] = @OrgId
WHERE
NOT EXISTS (
SELECT
1
FROM
[dbo].[GroupUser]
WHERE
[GroupId] = @GroupId
AND [OrganizationUserId] = [Source].[Id]
)
-- Delete
DELETE
GU
FROM
[dbo].[GroupUser] GU
WHERE
GU.[GroupId] = @GroupId
AND NOT EXISTS (
SELECT
1
FROM
@OrganizationUserIds
WHERE
[Id] = GU.[OrganizationUserId]
)
WHEN NOT MATCHED BY SOURCE
AND [Target].[GroupId] = @GroupId
AND [Target].[OrganizationUserId] IN (SELECT [Id] FROM [AvailableUsersCTE]) THEN
DELETE
;
EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrgId
END