nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-28 23:04:50 -05:00
Code

move script back and move userview update up

Browse Source
This commit is contained in:
Kyle Spearrin 2018-07-19 16:22:30 -04:00
parent 266fc579f2
commit b0aef93597
4 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql
View File

@ -7,6 +7,30 @@ BEGIN
END END
GO 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 IF OBJECT_ID('[dbo].[User_Create]') IS NOT NULL
BEGIN BEGIN
DROP PROCEDURE [dbo].[User_Create] DROP PROCEDURE [dbo].[User_Create]
@ -471,17 +495,3 @@ BEGIN
EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
END END
GO 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

9
util/Setup/DbScripts/2018-07-19_00_UserPremiumIndex.sql
View File

@ -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

2
util/Setup/Program.cs
View File

@ -252,7 +252,7 @@ namespace Bit.Setup
.JournalToSqlTable("dbo", "Migration") .JournalToSqlTable("dbo", "Migration")
.WithScriptsAndCodeEmbeddedInAssembly(Assembly.GetExecutingAssembly(), .WithScriptsAndCodeEmbeddedInAssembly(Assembly.GetExecutingAssembly(),
s => s.Contains($".DbScripts.") && !s.Contains(".Archive.")) s => s.Contains($".DbScripts.") && !s.Contains(".Archive."))
.WithTransactionPerScript() .WithTransaction()
.WithExecutionTimeout(new TimeSpan(0, 5, 0)) .WithExecutionTimeout(new TimeSpan(0, 5, 0))
.LogToConsole() .LogToConsole()
.Build(); .Build();

2
util/Setup/Setup.csproj
View File

@ -11,11 +11,9 @@
<None Remove="DbScripts\2018-04-02_00_Org2fa.sql" /> <None Remove="DbScripts\2018-04-02_00_Org2fa.sql" />
<None Remove="DbScripts\2018-04-24_00_CipherQueryTuning.sql" /> <None Remove="DbScripts\2018-04-24_00_CipherQueryTuning.sql" />
<None Remove="DbScripts\2018-06-11_00_WebVaultUpdates.sql" /> <None Remove="DbScripts\2018-06-11_00_WebVaultUpdates.sql" />
<None Remove="DbScripts\2018-07-19_00_UserPremiumIndex.sql" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="DbScripts\2018-07-19_00_UserPremiumIndex.sql" />
<EmbeddedResource Include="DbScripts\2018-06-11_00_WebVaultUpdates.sql" /> <EmbeddedResource Include="DbScripts\2018-06-11_00_WebVaultUpdates.sql" />
<EmbeddedResource Include="DbScripts\2018-04-24_00_CipherQueryTuning.sql" /> <EmbeddedResource Include="DbScripts\2018-04-24_00_CipherQueryTuning.sql" />
<EmbeddedResource Include="DbScripts\2018-04-02_00_Org2fa.sql" /> <EmbeddedResource Include="DbScripts\2018-04-02_00_Org2fa.sql" />