From b0aef9359796bb156a1ee1147798bb572f88b212 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 19 Jul 2018 16:22:30 -0400
Subject: [PATCH] move script back and move userview update up

---
 .../2018-06-11_00_WebVaultUpdates.sql         | 38 ++++++++++++-------
 .../2018-07-19_00_UserPremiumIndex.sql        |  9 -----
 util/Setup/Program.cs                         |  2 +-
 util/Setup/Setup.csproj                       |  2 -
 4 files changed, 25 insertions(+), 26 deletions(-)
 delete mode 100644 util/Setup/DbScripts/2018-07-19_00_UserPremiumIndex.sql

diff --git a/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql b/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql
index c027eb81f0..71cdb2f892 100644
--- a/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql
+++ b/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql
@@ -7,6 +7,30 @@ BEGIN
 END
 GO
 
+IF NOT EXISTS (
+    SELECT * FROM sys.indexes  WHERE [Name]='IX_User_Premium_PremiumExpirationDate_RenewalReminderDate'
+    AND object_id = OBJECT_ID('[dbo].[User]')
+)
+BEGIN
+    CREATE NONCLUSTERED INDEX [IX_User_Premium_PremiumExpirationDate_RenewalReminderDate]
+        ON [dbo].[User]([Premium] ASC, [PremiumExpirationDate] ASC, [RenewalReminderDate] ASC)
+END
+GO
+
+IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'UserView')
+BEGIN
+    DROP VIEW [dbo].[UserView]
+END
+GO
+
+CREATE VIEW [dbo].[UserView]
+AS
+SELECT
+    *
+FROM
+    [dbo].[User]
+GO
+
 IF OBJECT_ID('[dbo].[User_Create]') IS NOT NULL
 BEGIN
     DROP PROCEDURE [dbo].[User_Create]
@@ -471,17 +495,3 @@ BEGIN
     EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
 END
 GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'UserView')
-BEGIN
-    DROP VIEW [dbo].[UserView]
-END
-GO
-
-CREATE VIEW [dbo].[UserView]
-AS
-SELECT
-    *
-FROM
-    [dbo].[User]
-GO
diff --git a/util/Setup/DbScripts/2018-07-19_00_UserPremiumIndex.sql b/util/Setup/DbScripts/2018-07-19_00_UserPremiumIndex.sql
deleted file mode 100644
index c4a18f1cf6..0000000000
--- a/util/Setup/DbScripts/2018-07-19_00_UserPremiumIndex.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_User_Premium_PremiumExpirationDate_RenewalReminderDate'
-    AND object_id = OBJECT_ID('[dbo].[User]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_User_Premium_PremiumExpirationDate_RenewalReminderDate]
-        ON [dbo].[User]([Premium] ASC, [PremiumExpirationDate] ASC, [RenewalReminderDate] ASC)
-END
-GO
diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs
index 747b1a68a2..e490888bc7 100644
--- a/util/Setup/Program.cs
+++ b/util/Setup/Program.cs
@@ -252,7 +252,7 @@ namespace Bit.Setup
                     .JournalToSqlTable("dbo", "Migration")
                     .WithScriptsAndCodeEmbeddedInAssembly(Assembly.GetExecutingAssembly(),
                         s => s.Contains($".DbScripts.") && !s.Contains(".Archive."))
-                    .WithTransactionPerScript()
+                    .WithTransaction()
                     .WithExecutionTimeout(new TimeSpan(0, 5, 0))
                     .LogToConsole()
                     .Build();
diff --git a/util/Setup/Setup.csproj b/util/Setup/Setup.csproj
index 541e5cbbaf..e7fc950459 100644
--- a/util/Setup/Setup.csproj
+++ b/util/Setup/Setup.csproj
@@ -11,11 +11,9 @@
     <None Remove="DbScripts\2018-04-02_00_Org2fa.sql" />
     <None Remove="DbScripts\2018-04-24_00_CipherQueryTuning.sql" />
     <None Remove="DbScripts\2018-06-11_00_WebVaultUpdates.sql" />
-    <None Remove="DbScripts\2018-07-19_00_UserPremiumIndex.sql" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="DbScripts\2018-07-19_00_UserPremiumIndex.sql" />
     <EmbeddedResource Include="DbScripts\2018-06-11_00_WebVaultUpdates.sql" />
     <EmbeddedResource Include="DbScripts\2018-04-24_00_CipherQueryTuning.sql" />
     <EmbeddedResource Include="DbScripts\2018-04-02_00_Org2fa.sql" />