From 4c1ba235d8ec7fade8eaaf5ff77942e95329d35c Mon Sep 17 00:00:00 2001
From: hinton <hinton.oscar@gmail.com>
Date: Sat, 23 May 2020 12:06:05 +0200
Subject: [PATCH] Delete procedures before droping type

---
 .../2020-05-22_00_HiddenPassword.sql          | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/util/Migrator/DbScripts/2020-05-22_00_HiddenPassword.sql b/util/Migrator/DbScripts/2020-05-22_00_HiddenPassword.sql
index 11b025aae4..d02922b8c5 100644
--- a/util/Migrator/DbScripts/2020-05-22_00_HiddenPassword.sql
+++ b/util/Migrator/DbScripts/2020-05-22_00_HiddenPassword.sql
@@ -2,6 +2,48 @@
  * Add HiddenPassword support to collections
  */
 
+IF OBJECT_ID('[dbo].[Group_CreateWithCollections]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Group_CreateWithCollections]
+END
+GO
+
+IF OBJECT_ID('[dbo].[Group_UpdateWithCollections]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Group_UpdateWithCollections]
+END
+GO
+
+IF OBJECT_ID('[dbo].[CollectionUser_UpdateUsers]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[CollectionUser_UpdateUsers]
+END
+GO
+
+IF OBJECT_ID('[dbo].[OrganizationUser_CreateWithCollections]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[OrganizationUser_CreateWithCollections]
+END
+GO
+
+IF OBJECT_ID('[dbo].[OrganizationUser_UpdateWithCollections]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[OrganizationUser_UpdateWithCollections]
+END
+GO
+
+IF OBJECT_ID('[dbo].[Collection_CreateWithGroups]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Collection_CreateWithGroups]
+END
+GO
+
+IF OBJECT_ID('[dbo].[Collection_UpdateWithGroups]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Collection_UpdateWithGroups]
+END
+GO
+
 IF TYPE_ID('[dbo].[SelectionReadOnlyArray]') IS NOT NULL
 BEGIN
     DROP TYPE [dbo].[SelectionReadOnlyArray]
@@ -211,12 +253,6 @@ BEGIN
 END
 GO
 
-IF OBJECT_ID('[dbo].[Group_CreateWithCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Group_CreateWithCollections]
-END
-GO
-
 CREATE PROCEDURE [dbo].[Group_CreateWithCollections]
     @Id UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
@@ -286,12 +322,6 @@ BEGIN
 END
 GO
 
-IF OBJECT_ID('[dbo].[Group_UpdateWithCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Group_UpdateWithCollections]
-END
-GO
-
 CREATE PROCEDURE [dbo].[Group_UpdateWithCollections]
     @Id UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
@@ -346,12 +376,6 @@ BEGIN
 END
 GO
 
-IF OBJECT_ID('[dbo].[CollectionUser_UpdateUsers]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CollectionUser_UpdateUsers]
-END
-GO
-
 CREATE PROCEDURE [dbo].[CollectionUser_UpdateUsers]
     @CollectionId UNIQUEIDENTIFIER,
     @Users AS [dbo].[SelectionReadOnlyArray] READONLY
@@ -451,12 +475,6 @@ BEGIN
 END
 GO
 
-IF OBJECT_ID('[dbo].[OrganizationUser_CreateWithCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[OrganizationUser_CreateWithCollections]
-END
-GO
-
 CREATE PROCEDURE [dbo].[OrganizationUser_CreateWithCollections]
     @Id UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
@@ -530,12 +548,6 @@ BEGIN
 END
 GO
 
-IF OBJECT_ID('[dbo].[OrganizationUser_UpdateWithCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[OrganizationUser_UpdateWithCollections]
-END
-GO
-
 CREATE PROCEDURE [dbo].[OrganizationUser_UpdateWithCollections]
     @Id UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
@@ -640,12 +652,6 @@ BEGIN
 END
 GO
 
-IF OBJECT_ID('[dbo].[Collection_CreateWithGroups]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_CreateWithGroups]
-END
-GO
-
 CREATE PROCEDURE [dbo].[Collection_CreateWithGroups]
     @Id UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
@@ -715,12 +721,6 @@ BEGIN
 END
 GO
 
-IF OBJECT_ID('[dbo].[Collection_UpdateWithGroups]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_UpdateWithGroups]
-END
-GO
-
 CREATE PROCEDURE [dbo].[Collection_UpdateWithGroups]
     @Id UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,