From a2e50d03e5e503d242739a1bfb69e6e7b04b4f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <audrey@audreyality.com>
Date: Fri, 23 May 2025 10:39:41 -0400
Subject: [PATCH] address feedback

---
 .../Tools/dbo/Stored Procedures/Send_Create.sql   |  8 ++++----
 .../Tools/dbo/Stored Procedures/Send_Update.sql   |  4 ++--
 .../DbScripts/2025-05-20_00_AddSendEmails.sql     | 15 ++++++++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Sql/Tools/dbo/Stored Procedures/Send_Create.sql b/src/Sql/Tools/dbo/Stored Procedures/Send_Create.sql
index 01e406b4d9..cc0916641b 100644
--- a/src/Sql/Tools/dbo/Stored Procedures/Send_Create.sql	
+++ b/src/Sql/Tools/dbo/Stored Procedures/Send_Create.sql	
@@ -6,9 +6,6 @@
     @Data VARCHAR(MAX),
     @Key VARCHAR(MAX),
     @Password NVARCHAR(300),
---  FIXME: remove null default value once this argument has been
---         in 2 server releases
-    @Emails NVARCHAR(1024) = NULL,
     @MaxAccessCount INT,
     @AccessCount INT,
     @CreationDate DATETIME2(7),
@@ -17,7 +14,10 @@
     @DeletionDate DATETIME2(7),
     @Disabled BIT,
     @HideEmail BIT,
-    @CipherId UNIQUEIDENTIFIER = NULL
+    @CipherId UNIQUEIDENTIFIER = NULL,
+--  FIXME: remove null default value once this argument has been
+--         in 2 server releases
+    @Emails NVARCHAR(1024) = NULL,
 AS
 BEGIN
     SET NOCOUNT ON
diff --git a/src/Sql/Tools/dbo/Stored Procedures/Send_Update.sql b/src/Sql/Tools/dbo/Stored Procedures/Send_Update.sql
index a9a45723be..ff12a4eb14 100644
--- a/src/Sql/Tools/dbo/Stored Procedures/Send_Update.sql	
+++ b/src/Sql/Tools/dbo/Stored Procedures/Send_Update.sql	
@@ -6,7 +6,6 @@
     @Data VARCHAR(MAX),
     @Key VARCHAR(MAX),
     @Password NVARCHAR(300),
-    @Emails NVARCHAR(1024) = NULL,
     @MaxAccessCount INT,
     @AccessCount INT,
     @CreationDate DATETIME2(7),
@@ -15,7 +14,8 @@
     @DeletionDate DATETIME2(7),
     @Disabled BIT,
     @HideEmail BIT,
-    @CipherId UNIQUEIDENTIFIER = NULL
+    @CipherId UNIQUEIDENTIFIER = NULL,
+    @Emails NVARCHAR(1024) = NULL
 AS
 BEGIN
     SET NOCOUNT ON
diff --git a/util/Migrator/DbScripts/2025-05-20_00_AddSendEmails.sql b/util/Migrator/DbScripts/2025-05-20_00_AddSendEmails.sql
index 11f2ce54ec..373b5ee3db 100644
--- a/util/Migrator/DbScripts/2025-05-20_00_AddSendEmails.sql
+++ b/util/Migrator/DbScripts/2025-05-20_00_AddSendEmails.sql
@@ -1,10 +1,17 @@
 -- Add `Emails` field that stores a comma-separated list of email addresses for
 -- email/OTP authentication to table and write methods. The read methods
 -- don't need to be updated because they all use `*`.
-ALTER TABLE [dbo].[Organization] ADD [Emails] NVARCHAR(1024) NULL;
+
+IF (EXISTS (SELECT *
+            FROM  INFORMATION_SCHEMA.TABLES
+            WHERE TABLE_SCHEMA = 'dbo'
+            AND   TABLE_NAME = 'Send'))
+BEGIN
+    ALTER TABLE [dbo].[Send] ADD [Emails] NVARCHAR(1024) NULL;
+END
 GO
 
-CREATE OR ALTER  PROCEDURE [dbo].[Send_Update]
+CREATE OR ALTER PROCEDURE [dbo].[Send_Update]
     @Id UNIQUEIDENTIFIER,
     @UserId UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
@@ -54,8 +61,9 @@ BEGIN
     END
     -- TODO: OrganizationId bump?
 END
+GO
 
-CREATE OR ALTER  PROCEDURE [dbo].[Send_Create]
+CREATE OR ALTER PROCEDURE [dbo].[Send_Create]
     @Id UNIQUEIDENTIFIER OUTPUT,
     @UserId UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
@@ -126,3 +134,4 @@ BEGIN
     END
     -- TODO: OrganizationId bump?
 END
+GO