From 09da593dff7e13cf9a484a67cf716e8617565a1e Mon Sep 17 00:00:00 2001 From: Ike Kottlowski Date: Fri, 17 Apr 2026 22:32:52 -0400 Subject: [PATCH 1/2] update sql migrations --- ..._ReadBySsoUserOrganizationIdExternalId.sql | 2 +- ...teReadBySsoUserOrganizationIdExternalI.sql | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 util/Migrator/DbScripts/2026-04-17_00_UpdateReadBySsoUserOrganizationIdExternalI.sql diff --git a/src/Sql/dbo/Stored Procedures/User_ReadBySsoUserOrganizationIdExternalId.sql b/src/Sql/dbo/Stored Procedures/User_ReadBySsoUserOrganizationIdExternalId.sql index cb1644c9df45..027b8c54be44 100644 --- a/src/Sql/dbo/Stored Procedures/User_ReadBySsoUserOrganizationIdExternalId.sql +++ b/src/Sql/dbo/Stored Procedures/User_ReadBySsoUserOrganizationIdExternalId.sql @@ -1,6 +1,6 @@ CREATE PROCEDURE [dbo].[User_ReadBySsoUserOrganizationIdExternalId] @OrganizationId UNIQUEIDENTIFIER, - @ExternalId NVARCHAR(50) + @ExternalId NVARCHAR(300) AS BEGIN SET NOCOUNT ON diff --git a/util/Migrator/DbScripts/2026-04-17_00_UpdateReadBySsoUserOrganizationIdExternalI.sql b/util/Migrator/DbScripts/2026-04-17_00_UpdateReadBySsoUserOrganizationIdExternalI.sql new file mode 100644 index 000000000000..cb4d0d979406 --- /dev/null +++ b/util/Migrator/DbScripts/2026-04-17_00_UpdateReadBySsoUserOrganizationIdExternalI.sql @@ -0,0 +1,20 @@ +CREATE OR ALTER PROCEDURE [dbo].[User_ReadBySsoUserOrganizationIdExternalId] + @OrganizationId UNIQUEIDENTIFIER, + @ExternalId NVARCHAR(300) +AS +BEGIN + SET NOCOUNT ON + + SELECT + U.* + FROM + [dbo].[UserView] U + INNER JOIN + [dbo].[SsoUser] SU ON SU.[UserId] = U.[Id] + WHERE + ( + (@OrganizationId IS NULL AND SU.[OrganizationId] IS NULL) + OR (@OrganizationId IS NOT NULL AND SU.[OrganizationId] = @OrganizationId) + ) + AND SU.[ExternalId] = @ExternalId +END \ No newline at end of file From 146e1ebbfded51eb17e250076d247f406cd3af99 Mon Sep 17 00:00:00 2001 From: Ike Kottlowski Date: Thu, 23 Apr 2026 17:52:38 -0400 Subject: [PATCH 2/2] chore: formatting --- ...4-23_00_UpdateReadBySsoUserOrganizationIdExternalI.sql} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename util/Migrator/DbScripts/{2026-04-17_00_UpdateReadBySsoUserOrganizationIdExternalI.sql => 2026-04-23_00_UpdateReadBySsoUserOrganizationIdExternalI.sql} (79%) diff --git a/util/Migrator/DbScripts/2026-04-17_00_UpdateReadBySsoUserOrganizationIdExternalI.sql b/util/Migrator/DbScripts/2026-04-23_00_UpdateReadBySsoUserOrganizationIdExternalI.sql similarity index 79% rename from util/Migrator/DbScripts/2026-04-17_00_UpdateReadBySsoUserOrganizationIdExternalI.sql rename to util/Migrator/DbScripts/2026-04-23_00_UpdateReadBySsoUserOrganizationIdExternalI.sql index cb4d0d979406..75b8c51c99e0 100644 --- a/util/Migrator/DbScripts/2026-04-17_00_UpdateReadBySsoUserOrganizationIdExternalI.sql +++ b/util/Migrator/DbScripts/2026-04-23_00_UpdateReadBySsoUserOrganizationIdExternalI.sql @@ -9,12 +9,13 @@ BEGIN U.* FROM [dbo].[UserView] U - INNER JOIN + INNER JOIN [dbo].[SsoUser] SU ON SU.[UserId] = U.[Id] WHERE ( (@OrganizationId IS NULL AND SU.[OrganizationId] IS NULL) - OR (@OrganizationId IS NOT NULL AND SU.[OrganizationId] = @OrganizationId) + OR (@OrganizationId IS NOT NULL AND SU.[OrganizationId] = @OrganizationId) ) AND SU.[ExternalId] = @ExternalId -END \ No newline at end of file +END +GO