From 3e7e3a092858750d796ad8570aec620d7490ad09 Mon Sep 17 00:00:00 2001 From: Rui Tome Date: Wed, 6 Dec 2023 15:58:21 +0000 Subject: [PATCH] =?UTF-8?q?[AC-1682]=C2=A0Change=20JOIN=20to=20INNER=20JOI?= =?UTF-8?q?N=20in=20SQL=20scripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2023-11-10_00_AccessAllCollectionGroups.sql | 2 +- .../2023-11-10_00_AccessAllCollectionUsers.sql | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/Migrator/DbScripts_transition/2023-11-10_00_AccessAllCollectionGroups.sql b/util/Migrator/DbScripts_transition/2023-11-10_00_AccessAllCollectionGroups.sql index 013e599a94..d493224821 100644 --- a/util/Migrator/DbScripts_transition/2023-11-10_00_AccessAllCollectionGroups.sql +++ b/util/Migrator/DbScripts_transition/2023-11-10_00_AccessAllCollectionGroups.sql @@ -19,7 +19,7 @@ WHERE C.[OrganizationId] = TG.[OrganizationId]; INSERT INTO [dbo].[CollectionGroup] ([CollectionId], [GroupId], [ReadOnly], [HidePasswords], [Manage]) SELECT C.[Id], TG.[GroupId], 0, 0, 0 FROM [dbo].[Collection] C - JOIN #TempGroup TG ON C.[OrganizationId] = TG.[OrganizationId] + INNER JOIN #TempGroup TG ON C.[OrganizationId] = TG.[OrganizationId] LEFT JOIN [dbo].[CollectionGroup] CG ON CG.[CollectionId] = C.[Id] AND CG.[GroupId] = TG.[GroupId] WHERE CG.[CollectionId] IS NULL; diff --git a/util/Migrator/DbScripts_transition/2023-11-10_00_AccessAllCollectionUsers.sql b/util/Migrator/DbScripts_transition/2023-11-10_00_AccessAllCollectionUsers.sql index 70d21b1d49..c52cac3d5c 100644 --- a/util/Migrator/DbScripts_transition/2023-11-10_00_AccessAllCollectionUsers.sql +++ b/util/Migrator/DbScripts_transition/2023-11-10_00_AccessAllCollectionUsers.sql @@ -18,10 +18,10 @@ BEGIN target.[HidePasswords] = 0, target.[Manage] = 0 FROM [dbo].[CollectionUser] AS target - JOIN ( + INNER JOIN ( SELECT C.[Id] AS [CollectionId], T.[OrganizationUserId] FROM [dbo].[Collection] C - JOIN #TempOrgUser T ON C.[OrganizationId] = T.[OrganizationId] AND T.Batch = @CurrentBatch + INNER JOIN #TempOrgUser T ON C.[OrganizationId] = T.[OrganizationId] AND T.Batch = @CurrentBatch ) AS source ON target.[CollectionId] = source.[CollectionId] AND target.[OrganizationUserId] = source.[OrganizationUserId]; @@ -31,7 +31,7 @@ BEGIN FROM ( SELECT C.[Id] AS [CollectionId], T.[OrganizationUserId] FROM [dbo].[Collection] C - JOIN #TempOrgUser T ON C.[OrganizationId] = T.[OrganizationId] AND T.Batch = @CurrentBatch + INNER JOIN #TempOrgUser T ON C.[OrganizationId] = T.[OrganizationId] AND T.Batch = @CurrentBatch ) AS source LEFT JOIN [dbo].[CollectionUser] AS target ON target.[CollectionId] = source.[CollectionId] AND target.[OrganizationUserId] = source.[OrganizationUserId]