bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-21 10:43:44 +00:00
Code Issues Releases Wiki Activity

add missing migrations

Browse Source
This commit is contained in:
jaasen-livefront
2025-12-03 09:49:35 -08:00
parent 3c30168d30
commit 52d31b83b9
9 changed files with 129 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Create.sql
View File

@@ -13,6 +13,7 @@
@Reprompt TINYINT,
@Key VARCHAR(MAX) = NULL,
@ArchivedDate DATETIME2(7) = NULL
@Archives NVARCHAR(MAX) = NULL
AS
BEGIN
SET NOCOUNT ON
@@ -31,7 +32,8 @@ BEGIN
[DeletedDate],
[Reprompt],
[Key],
[ArchivedDate]
[ArchivedDate],
[Archives]
)
VALUES
(
@@ -47,7 +49,8 @@ BEGIN
@DeletedDate,
@Reprompt,
@Key,
@ArchivedDate
@ArchivedDate,
@Archives
)
IF @OrganizationId IS NOT NULL

3
src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_CreateWithCollections.sql
View File

@@ -13,7 +13,8 @@
@Reprompt TINYINT,
@Key VARCHAR(MAX) = NULL,
@CollectionIds AS [dbo].[GuidIdArray] READONLY,
@ArchivedDate DATETIME2(7) = NULL
@ArchivedDate DATETIME2(7) = NULL,
@Archives NVARCHAR(MAX) = NULL
AS
BEGIN
SET NOCOUNT ON

113
util/Migrator/DbScripts/2025-12-02_AddCipherArchives.sql
View File

@@ -262,3 +262,116 @@ BEGIN
SELECT @UtcNow
END
GO
IF OBJECT_ID('[dbo].[Cipher_Create]') IS NOT NULL
BEGIN
DROP PROCEDURE [dbo].[Cipher_Create];
END
GO
CREATE PROCEDURE [dbo].[Cipher_Create]
@Id UNIQUEIDENTIFIER OUTPUT,
@UserId UNIQUEIDENTIFIER,
@OrganizationId UNIQUEIDENTIFIER,
@Type TINYINT,
@Data NVARCHAR(MAX),
@Favorites NVARCHAR(MAX),
@Folders NVARCHAR(MAX),
@Attachments NVARCHAR(MAX), -- not used
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@DeletedDate DATETIME2(7),
@Reprompt TINYINT,
@Key VARCHAR(MAX) = NULL,
@ArchivedDate DATETIME2(7) = NULL
@Archives NVARCHAR(MAX) = NULL
AS
BEGIN
SET NOCOUNT ON
INSERT INTO [dbo].[Cipher]
(
[Id],
[UserId],
[OrganizationId],
[Type],
[Data],
[Favorites],
[Folders],
[CreationDate],
[RevisionDate],
[DeletedDate],
[Reprompt],
[Key],
[ArchivedDate],
[Archives]
)
VALUES
(
@Id,
CASE WHEN @OrganizationId IS NULL THEN @UserId ELSE NULL END,
@OrganizationId,
@Type,
@Data,
@Favorites,
@Folders,
@CreationDate,
@RevisionDate,
@DeletedDate,
@Reprompt,
@Key,
@ArchivedDate,
@Archives
)
IF @OrganizationId IS NOT NULL
BEGIN
EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
END
ELSE IF @UserId IS NOT NULL
BEGIN
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
END
END
GO
IF OBJECT_ID('[dbo].[Cipher_CreateWithCollections]') IS NOT NULL
BEGIN
DROP PROCEDURE [dbo].[Cipher_CreateWithCollections];
END
GO
CREATE PROCEDURE [dbo].[Cipher_CreateWithCollections]
@Id UNIQUEIDENTIFIER,
@UserId UNIQUEIDENTIFIER,
@OrganizationId UNIQUEIDENTIFIER,
@Type TINYINT,
@Data NVARCHAR(MAX),
@Favorites NVARCHAR(MAX),
@Folders NVARCHAR(MAX),
@Attachments NVARCHAR(MAX),
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7),
@DeletedDate DATETIME2(7),
@Reprompt TINYINT,
@Key VARCHAR(MAX) = NULL,
@CollectionIds AS [dbo].[GuidIdArray] READONLY,
@ArchivedDate DATETIME2(7) = NULL,
@Archives NVARCHAR(MAX) = NULL
AS
BEGIN
SET NOCOUNT ON
EXEC [dbo].[Cipher_Create] @Id, @UserId, @OrganizationId, @Type, @Data, @Favorites, @Folders,
@Attachments, @CreationDate, @RevisionDate, @DeletedDate, @Reprompt, @Key, @ArchivedDate
DECLARE @UpdateCollectionsSuccess INT
EXEC @UpdateCollectionsSuccess = [dbo].[Cipher_UpdateCollections] @Id, @UserId, @OrganizationId, @CollectionIds
-- Bump the account revision date AFTER collections are assigned.
IF @UpdateCollectionsSuccess = 0
BEGIN
EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
END
END
GO

2
util/MySqlMigrations/Migrations/20251203004842_AddCipherArchives.Designer.cs → util/MySqlMigrations/Migrations/20251203174921_AddCipherArchives.Designer.cs generated
View File

@@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.MySqlMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20251203004842_AddCipherArchives")]
[Migration("20251203174921_AddCipherArchives")]
partial class AddCipherArchives
{
/// <inheritdoc />

11
util/MySqlMigrations/Migrations/20251203004842_AddCipherArchives.cs → util/MySqlMigrations/Migrations/20251203174921_AddCipherArchives.cs
View File

@@ -10,19 +10,12 @@ public partial class AddCipherArchives : Migration
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "Archives",
table: "Cipher",
type: "longtext",
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Archives",
table: "Cipher");
}
}

2
util/PostgresMigrations/Migrations/20251203004812_AddCipherArchives.Designer.cs → util/PostgresMigrations/Migrations/20251203174911_AddCipherArchives.Designer.cs generated
View File

@@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace Bit.PostgresMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20251203004812_AddCipherArchives")]
[Migration("20251203174911_AddCipherArchives")]
partial class AddCipherArchives
{
/// <inheritdoc />

10
util/PostgresMigrations/Migrations/20251203004812_AddCipherArchives.cs → util/PostgresMigrations/Migrations/20251203174911_AddCipherArchives.cs
View File

@@ -10,18 +10,12 @@ public partial class AddCipherArchives : Migration
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "Archives",
table: "Cipher",
type: "text",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Archives",
table: "Cipher");
}
}

2
util/SqliteMigrations/Migrations/20251203004807_AddCipherArchives.Designer.cs → util/SqliteMigrations/Migrations/20251203174916_AddCipherArchives.Designer.cs generated
View File

@@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Bit.SqliteMigrations.Migrations
{
[DbContext(typeof(DatabaseContext))]
[Migration("20251203004807_AddCipherArchives")]
[Migration("20251203174916_AddCipherArchives")]
partial class AddCipherArchives
{
/// <inheritdoc />

10
util/SqliteMigrations/Migrations/20251203004807_AddCipherArchives.cs → util/SqliteMigrations/Migrations/20251203174916_AddCipherArchives.cs
View File

@@ -10,18 +10,12 @@ public partial class AddCipherArchives : Migration
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "Archives",
table: "Cipher",
type: "TEXT",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Archives",
table: "Cipher");
}
}