mirror of
https://github.com/bitwarden/server
synced 2025-12-21 18:53:41 +00:00
add missing migrations
This commit is contained in:
@@ -13,6 +13,7 @@
|
|||||||
@Reprompt TINYINT,
|
@Reprompt TINYINT,
|
||||||
@Key VARCHAR(MAX) = NULL,
|
@Key VARCHAR(MAX) = NULL,
|
||||||
@ArchivedDate DATETIME2(7) = NULL
|
@ArchivedDate DATETIME2(7) = NULL
|
||||||
|
@Archives NVARCHAR(MAX) = NULL
|
||||||
AS
|
AS
|
||||||
BEGIN
|
BEGIN
|
||||||
SET NOCOUNT ON
|
SET NOCOUNT ON
|
||||||
@@ -31,7 +32,8 @@ BEGIN
|
|||||||
[DeletedDate],
|
[DeletedDate],
|
||||||
[Reprompt],
|
[Reprompt],
|
||||||
[Key],
|
[Key],
|
||||||
[ArchivedDate]
|
[ArchivedDate],
|
||||||
|
[Archives]
|
||||||
)
|
)
|
||||||
VALUES
|
VALUES
|
||||||
(
|
(
|
||||||
@@ -47,7 +49,8 @@ BEGIN
|
|||||||
@DeletedDate,
|
@DeletedDate,
|
||||||
@Reprompt,
|
@Reprompt,
|
||||||
@Key,
|
@Key,
|
||||||
@ArchivedDate
|
@ArchivedDate,
|
||||||
|
@Archives
|
||||||
)
|
)
|
||||||
|
|
||||||
IF @OrganizationId IS NOT NULL
|
IF @OrganizationId IS NOT NULL
|
||||||
|
|||||||
@@ -13,7 +13,8 @@
|
|||||||
@Reprompt TINYINT,
|
@Reprompt TINYINT,
|
||||||
@Key VARCHAR(MAX) = NULL,
|
@Key VARCHAR(MAX) = NULL,
|
||||||
@CollectionIds AS [dbo].[GuidIdArray] READONLY,
|
@CollectionIds AS [dbo].[GuidIdArray] READONLY,
|
||||||
@ArchivedDate DATETIME2(7) = NULL
|
@ArchivedDate DATETIME2(7) = NULL,
|
||||||
|
@Archives NVARCHAR(MAX) = NULL
|
||||||
AS
|
AS
|
||||||
BEGIN
|
BEGIN
|
||||||
SET NOCOUNT ON
|
SET NOCOUNT ON
|
||||||
|
|||||||
@@ -262,3 +262,116 @@ BEGIN
|
|||||||
SELECT @UtcNow
|
SELECT @UtcNow
|
||||||
END
|
END
|
||||||
GO
|
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
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
|||||||
namespace Bit.MySqlMigrations.Migrations
|
namespace Bit.MySqlMigrations.Migrations
|
||||||
{
|
{
|
||||||
[DbContext(typeof(DatabaseContext))]
|
[DbContext(typeof(DatabaseContext))]
|
||||||
[Migration("20251203004842_AddCipherArchives")]
|
[Migration("20251203174921_AddCipherArchives")]
|
||||||
partial class AddCipherArchives
|
partial class AddCipherArchives
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
@@ -10,19 +10,12 @@ public partial class AddCipherArchives : Migration
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
{
|
{
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "Archives",
|
|
||||||
table: "Cipher",
|
|
||||||
type: "longtext",
|
|
||||||
nullable: true)
|
|
||||||
.Annotation("MySql:CharSet", "utf8mb4");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
{
|
{
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "Archives",
|
|
||||||
table: "Cipher");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
|||||||
namespace Bit.PostgresMigrations.Migrations
|
namespace Bit.PostgresMigrations.Migrations
|
||||||
{
|
{
|
||||||
[DbContext(typeof(DatabaseContext))]
|
[DbContext(typeof(DatabaseContext))]
|
||||||
[Migration("20251203004812_AddCipherArchives")]
|
[Migration("20251203174911_AddCipherArchives")]
|
||||||
partial class AddCipherArchives
|
partial class AddCipherArchives
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
@@ -10,18 +10,12 @@ public partial class AddCipherArchives : Migration
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
{
|
{
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "Archives",
|
|
||||||
table: "Cipher",
|
|
||||||
type: "text",
|
|
||||||
nullable: true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
{
|
{
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "Archives",
|
|
||||||
table: "Cipher");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
|||||||
namespace Bit.SqliteMigrations.Migrations
|
namespace Bit.SqliteMigrations.Migrations
|
||||||
{
|
{
|
||||||
[DbContext(typeof(DatabaseContext))]
|
[DbContext(typeof(DatabaseContext))]
|
||||||
[Migration("20251203004807_AddCipherArchives")]
|
[Migration("20251203174916_AddCipherArchives")]
|
||||||
partial class AddCipherArchives
|
partial class AddCipherArchives
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
@@ -10,18 +10,12 @@ public partial class AddCipherArchives : Migration
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
{
|
{
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "Archives",
|
|
||||||
table: "Cipher",
|
|
||||||
type: "TEXT",
|
|
||||||
nullable: true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
{
|
{
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "Archives",
|
|
||||||
table: "Cipher");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user