From bf2f3c039d38be78dfbf2c8165bf5b932754a1f8 Mon Sep 17 00:00:00 2001 From: jaasen-livefront Date: Wed, 3 Dec 2025 10:03:28 -0800 Subject: [PATCH] fixes --- .../Vault/Stored Procedures/Cipher/Cipher_Archive.sql | 2 +- .../Vault/Stored Procedures/Cipher/Cipher_Create.sql | 2 +- .../Migrations/20251203174921_AddCipherArchives.cs | 10 ++++++++-- .../Migrations/20251203174911_AddCipherArchives.cs | 10 ++++++++-- .../Migrations/20251203174916_AddCipherArchives.cs | 10 ++++++++-- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Archive.sql b/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Archive.sql index d2c41f29ba..608d39128f 100644 --- a/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Archive.sql +++ b/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Archive.sql @@ -26,7 +26,7 @@ BEGIN UPDATE [dbo].[Cipher] SET - [ArchivedDate] = JSON_MODIFY( + [Archives] = JSON_MODIFY( COALESCE([Archives], N'{}'), '$."' + CONVERT(NVARCHAR(36), @UserId) + '"', @UtcNow diff --git a/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Create.sql b/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Create.sql index be110c898a..4eef2c1e9d 100644 --- a/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Create.sql +++ b/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Create.sql @@ -12,7 +12,7 @@ @DeletedDate DATETIME2(7), @Reprompt TINYINT, @Key VARCHAR(MAX) = NULL, - @ArchivedDate DATETIME2(7) = NULL + @ArchivedDate DATETIME2(7) = NULL, @Archives NVARCHAR(MAX) = NULL AS BEGIN diff --git a/util/MySqlMigrations/Migrations/20251203174921_AddCipherArchives.cs b/util/MySqlMigrations/Migrations/20251203174921_AddCipherArchives.cs index 31b7ca2249..c7e973e003 100644 --- a/util/MySqlMigrations/Migrations/20251203174921_AddCipherArchives.cs +++ b/util/MySqlMigrations/Migrations/20251203174921_AddCipherArchives.cs @@ -10,12 +10,18 @@ public partial class AddCipherArchives : Migration /// protected override void Up(MigrationBuilder migrationBuilder) { - + migrationBuilder.AddColumn( + name: "Archives", + table: "Cipher", + type: "longtext", + nullable: true); } /// protected override void Down(MigrationBuilder migrationBuilder) { - + migrationBuilder.DropColumn( + name: "Archives", + table: "Cipher"); } } diff --git a/util/PostgresMigrations/Migrations/20251203174911_AddCipherArchives.cs b/util/PostgresMigrations/Migrations/20251203174911_AddCipherArchives.cs index 3cf4a55dda..9deab6d279 100644 --- a/util/PostgresMigrations/Migrations/20251203174911_AddCipherArchives.cs +++ b/util/PostgresMigrations/Migrations/20251203174911_AddCipherArchives.cs @@ -10,12 +10,18 @@ public partial class AddCipherArchives : Migration /// protected override void Up(MigrationBuilder migrationBuilder) { - + migrationBuilder.AddColumn( + name: "Archives", + table: "Cipher", + type: "text", + nullable: true); } /// protected override void Down(MigrationBuilder migrationBuilder) { - + migrationBuilder.DropColumn( + name: "Archives", + table: "Cipher"); } } diff --git a/util/SqliteMigrations/Migrations/20251203174916_AddCipherArchives.cs b/util/SqliteMigrations/Migrations/20251203174916_AddCipherArchives.cs index 0616caa2fd..287926db02 100644 --- a/util/SqliteMigrations/Migrations/20251203174916_AddCipherArchives.cs +++ b/util/SqliteMigrations/Migrations/20251203174916_AddCipherArchives.cs @@ -10,12 +10,18 @@ public partial class AddCipherArchives : Migration /// protected override void Up(MigrationBuilder migrationBuilder) { - + migrationBuilder.AddColumn( + name: "Archives", + table: "Cipher", + type: "TEXT", + nullable: true); } /// protected override void Down(MigrationBuilder migrationBuilder) { - + migrationBuilder.DropColumn( + name: "Archives", + table: "Cipher"); } }